aboutsummaryrefslogtreecommitdiff
path: root/spss.server/build.xml
diff options
context:
space:
mode:
Diffstat (limited to 'spss.server/build.xml')
-rw-r--r--spss.server/build.xml26
1 files changed, 16 insertions, 10 deletions
diff --git a/spss.server/build.xml b/spss.server/build.xml
index 8bfc05e73..0b2e704db 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -11,12 +11,13 @@
<project name="moa-spss-server" default="deploy-catalina" basedir=".">
<property environment="env"/>
<property name="script-suffix" value="${env.SCRIPT_SUFFIX}"/>
- <property name="version" value="1.2.0D04"/>
+ <property name="version" value="1.2.0"/>
<property name="src" value="src"/>
<property name="lib" value="lib"/>
<property name="res" value="res"/>
<property name="data" value="data"/>
- <property name="deploy.conf" value="${data}/test/conf"/>
+ <property name="handbook" value="../spss.handbook"/>
+ <property name="deploy.conf" value="${handbook}/conf"/>
<property name="doc" value="doc"/>
<property name="tmp" value="tmp"/>
<property name="compile" value="${tmp}/compile"/>
@@ -115,9 +116,9 @@
<lib file="${env.MOA_COMMON_JAR}"/>
<classes dir="${compile}" excludes="test/**"/>
<classes dir="${res}"/>
- <classes file="${data}/deploy/conf/moa-spss/log4j.properties"/>
+ <classes file="${handbook}/conf/moa-spss/log4j.properties"/>
<webinf file="server-config.wsdd"/>
- <webinf dir="${data}/deploy" includes="conf/**"/>
+ <webinf dir="${handbook}" includes="conf/**"/>
<zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.2.xsd" prefix="resources/schemas"/>
</war>
</target>
@@ -127,7 +128,7 @@
<jar destfile="${dist.lib}/moa-spss.jar">
<fileset dir="${compile}" excludes="test/**"/>
<fileset dir="${res}"/>
- <fileset dir="${data}/deploy/conf/moa-spss" includes="log4j.properties"/>
+ <fileset dir="${handbook}/conf/moa-spss" includes="log4j.properties"/>
</jar>
</target>
@@ -249,7 +250,7 @@
<fileset dir="${data}/deploy/tomcat"/>
</copy>
<copy toDir="${dist.ws}/conf">
- <fileset dir="${data}/deploy/conf"/>
+ <fileset dir="${handbook}/conf"/>
</copy>
<copy toDir="${dist.ws}/ext13">
<fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar"/>
@@ -287,6 +288,10 @@
<copy toDir="${dist.ws}/doc/api-doc">
<fileset dir="${api-doc}"/>
</copy>
+ <!-- Handbuch aus dem Projekt spss.handbook -->
+ <copy toDir="${dist.ws}/doc">
+ <fileset dir="${handbook}" excludes="bin/** conf/** handbook/common/LogoMoa4c.3148x3545.jpg" />
+ </copy>
</target>
<target name="dist-ws-zip" depends="dist-ws-doc">
@@ -300,9 +305,6 @@
<target name="dist-lib" depends="package-lib">
<description>create the library distributable</description>
- <copy todir="${dist.lib}/doc">
- <fileset dir="${doc}"/>
- </copy>
<copy todir="${dist.lib}" file="${env.MOA_COMMON_JAR}"/>
<copy todir="${dist.lib}/lib">
<fileset dir="${lib.jaxp}"/>
@@ -316,7 +318,7 @@
<fileset dir="${lib.commons-discovery}"/>
</copy>
<copy toDir="${dist.lib}/conf">
- <fileset dir="${data}/deploy/conf"/>
+ <fileset dir="${handbook}/conf"/>
</copy>
<copy toDir="${dist.lib}/ext13">
<fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar"/>
@@ -348,6 +350,10 @@
<copy toDir="${dist.lib}/doc/api-doc">
<fileset dir="${api-doc}"/>
</copy>
+ <!-- Handbuch aus dem Projekt spss.handbook -->
+ <copy toDir="${dist.lib}/doc">
+ <fileset dir="${handbook}" excludes="bin/** conf/** handbook/common/LogoMoa4c.3148x3545.jpg"/>
+ </copy>
</target>
<target name="dist-lib-zip" depends="dist-lib-doc">