Build-Prozess geändert, da iaik-Bibliotheken nicht mehr mitausgeliefert werden.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@367 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 43 insertions, 13 deletions

diff --git a/spss.server/build.xml b/spss.server/build.xml
index 2bbf67622..7511ee2a4 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -11,11 +11,12 @@
 <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.0"/>
+  <property name="version" value="1.2.1"/>
   <property name="src" value="src"/>
   <property name="lib" value="lib"/>
   <property name="res" value="res"/>
   <property name="data" value="data"/>
+  <property name="licenses" value="licenses"/>
   <property name="handbook" value="../spss.handbook"/>
   <property name="deploy.conf" value="${handbook}/conf"/>
   <property name="doc" value="doc"/>
@@ -27,6 +28,7 @@
   <property name="api-doc.internal" value="${tmp}/api-doc-internal"/>
   <property name="prj.build" value="../build"/>
   <property name="prj.common" value="../common"/>
+  <property name="prj.handbook" value="../spss.handbook"/>
   <property name="dist" value="${tmp}/dist"/>
   <property name="dist.ws" value="${dist}/ws"/>
   <property name="dist.ws.conf" value="${dist.ws}/conf"/>
@@ -42,7 +44,7 @@
   <property name="lib.xalan" value="${lib}/xalan-j-2.5.1"/>
   <property name="lib.jsse" value="${lib}/jsse-1.0.3_01"/>
   <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
-  <property name="lib.iaik-moa" value="${lib}/iaik-moa-20030703"/>
+  <property name="lib.iaik-moa" value="${lib}/iaik-moa-20050623"/>
   <property name="lib.junit" value="${lib}/junit-3.8.1"/>
   <property name="lib.servlet" value="${lib}/servlet-2.3"/>
   <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.4"/>
@@ -109,8 +111,10 @@
       <lib dir="${lib.postgres-jdbc}"/>
       <lib dir="${lib.axis}"/>
       <lib dir="${lib.jaxen}"/>
+      <!--
       <lib dir="${lib.iaik-moa}" 
            excludes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar, win32/**, linux/**, solaris/**, signed/**"/>
+      -->     
       <lib file="${lib.commons-logging}/commons-logging.jar"/>
       <lib file="${lib.commons-discovery}/commons-discovery.jar"/>
       <lib file="${env.MOA_COMMON_JAR}"/>
@@ -253,28 +257,40 @@
       <fileset dir="${handbook}/conf"/>
     </copy>
     <copy toDir="${dist.ws}/ext13">
+      <!--
       <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
+      -->
       <fileset dir="${lib.jsse}"/>
     </copy>
+    <!--
     <copy toDir="${dist.ws}/ext14">
       <fileset dir="${lib.iaik-moa}/signed"/>
     </copy>
+    -->
     <copy toDir="${dist.ws}/endorsed14">
       <fileset dir="${lib.xalan}"/>
     </copy>
     <copy toDir="${dist.ws}/tools">
       <fileset dir="${tools}"/>
+      <!--
       <fileset dir="${lib.iaik-moa}">
         <include name="iaik_jce_full.jar"/>
         <include name="iaik_moa_full.jar"/>
         <include name="iaik_ecc.jar"/>
       </fileset>
+      -->
       <fileset dir="${lib.log4j}"/>
       <fileset dir="${data}/deploy/tools"/>
     </copy>
     <copy toDir="${dist.ws}/pkcs11">
       <fileset dir="${lib.iaik-moa}" includes="win32/**, linux/**, solaris/**"/>
     </copy>
+  	<copy toDir="${dist.ws}/licenses">
+  	  <fileset dir="${licenses}"/>
+  	</copy>	
+  	<copy toDir="${dist.ws}">
+  	  <fileset dir="." includes="readme.inst.txt, history.txt"/>	
+  	</copy>
     <fixcrlf srcdir="${dist.ws}" includes="**/*.sh" eol="lf" eof="remove"/>
   </target>
   
@@ -282,15 +298,12 @@
     <description>
       create the webservice-distributable, including all documentation
     </description>
-    <copy todir="${dist.ws}/doc">
-      <fileset dir="${doc}" excludes="api-doc-internal/**"/>
-    </copy>
     <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" />
+      <fileset dir="${handbook}" excludes="bin/** conf/** handbook/common/LogoMoa4c.3148x3545.jpg .project .classpath" />
     </copy>
   </target>
   
@@ -312,7 +325,9 @@
       <fileset dir="${lib.xerces}"/>
       <fileset dir="${lib.xalan}"/>
       <fileset dir="${lib.postgres-jdbc}"/>
+      <!--
       <fileset dir="${lib.iaik-moa}" excludes="signed/**, iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
+      -->
       <fileset dir="${lib.commons-logging}"/>
       <fileset dir="${lib.log4j}"/>
       <fileset dir="${lib.commons-discovery}"/>
@@ -321,22 +336,34 @@
       <fileset dir="${handbook}/conf"/>
     </copy>
     <copy toDir="${dist.lib}/ext13">
+      <!--
       <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/>
+      -->
       <fileset dir="${lib.jsse}"/>
     </copy>
+    <!--
     <copy toDir="${dist.lib}/ext14">
       <fileset dir="${lib.iaik-moa}/signed"/>
     </copy>
-    <copy toDir="${dist.ws}/tools">
+    -->
+    <copy toDir="${dist.lib}/tools">
       <fileset dir="${tools}"/>
+      <!--
       <fileset dir="${lib.iaik-moa}">
         <include name="iaik_jce_full.jar"/>
         <include name="iaik_moa_full.jar"/>
         <include name="iaik_ecc.jar"/>
       </fileset>
+      -->
       <fileset dir="${lib.log4j}"/>
       <fileset dir="${data}/deploy/tools"/>
     </copy>
+  	<copy toDir="${dist.lib}/licenses">
+  	  <fileset dir="${licenses}"/>
+  	</copy>	
+  	<copy toDir="${dist.lib}">
+  	  <fileset dir="." includes="readme.inst.txt, history.txt"/>	
+  	</copy>
     <fixcrlf srcdir="${dist.lib}" includes="**/*.sh" eol="lf" eof="remove"/>
   </target>
   
@@ -344,15 +371,12 @@
     <description>
       create the library distributable, including all documentation
     </description>
-    <copy todir="${dist.lib}/doc">
-      <fileset dir="${doc}" excludes="api-doc-internal/**"/>
-    </copy>
     <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"/>
+      <fileset dir="${handbook}" excludes="bin/** conf/** handbook/common/LogoMoa4c.3148x3545.jpg .project .classpath"/>
     </copy>
   </target>
   
@@ -371,11 +395,17 @@
       <fileset dir="${prj.build}"/>
     </copy>
     <copy toDir="${dist.src}/common">
-      <fileset dir="${prj.common}" excludes="tmp/**, bin/**"/>
+      <fileset dir="${prj.common}" excludes="tmp/**, bin/**, lib/iaik-jce-3.0.6/**"/>
+    </copy>
+    <copy toDir="${dist.src}/spss.handbook">
+        <fileset dir="${prj.handbook}" excludes="clients/api/lib/iaik-moa-20050623/**"/>
     </copy>
     <copy toDir="${dist.src}/spss.server">
-      <fileset dir="." excludes="tmp/**, bin/**"/>
+      <fileset dir="." excludes="tmp/**, bin/**, lib/iaik-moa-20050623/**"/>
     </copy>
+  	<copy toDir="${dist.src}">
+  	  <fileset dir="." includes="readme.src.txt"/>	
+  	</copy>
     <fixcrlf srcdir="${dist.src}" includes="**/*.sh" eol="lf" eof="remove"/>
   </target>