Added IAIK libraries again to build

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

1 files changed, 28 insertions, 21 deletions

diff --git a/spss.server/build.xml b/spss.server/build.xml
index 14e9adabc..327503cdd 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -110,10 +110,13 @@
       <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 dir="${lib.iaik-moa}" 
+           excludes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar, signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/-->
+  
+          
       <lib file="${lib.commons-logging}/commons-logging.jar"/>
       <lib file="${lib.commons-discovery}/commons-discovery.jar"/>
       <lib file="${env.MOA_COMMON_JAR}"/>
@@ -257,28 +260,28 @@
       <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}">
+      
+      <!--fileset dir="${lib.iaik-moa}">
         <include name="iaik_jce_full.jar"/>
         <include name="iaik_moa_full.jar"/>
         <include name="iaik_ecc.jar"/>
-      </fileset>
-      -->
+      </fileset-->
+      
       <fileset dir="${lib.log4j}"/>
       <fileset dir="${lib.xalan}"/>    	
       <fileset dir="${data}/deploy/tools"/>
@@ -326,9 +329,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}"/>
@@ -337,25 +340,25 @@
       <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.lib}/tools">
       <fileset dir="${tools}"/>
-      <!--
-      <fileset dir="${lib.iaik-moa}">
+      
+      <!--fileset dir="${lib.iaik-moa}">
         <include name="iaik_jce_full.jar"/>
         <include name="iaik_moa_full.jar"/>
         <include name="iaik_ecc.jar"/>
-      </fileset>
-      -->
+      </fileset-->
+      
       <fileset dir="${lib.log4j}"/>
       <fileset dir="${lib.xalan}"/>
       <fileset dir="${data}/deploy/tools"/>
@@ -400,7 +403,7 @@
       <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/**"/>
+        <fileset dir="${prj.handbook}"/>
     </copy>
     <copy toDir="${dist.src}/spss.server">
       <fileset dir="." excludes="tmp/**, bin/**, lib/iaik-moa-20050623/**"/>
@@ -408,6 +411,10 @@
   	<copy toDir="${dist.src}">
   	  <fileset dir="." includes="readme.src.txt"/>	
   	</copy>
+  	<!--mkdir "${dist.src}/spss.server/lib/iaik-moa/iaik-moa-20051107"/-->
+  	<copy toDir="${dist.src}/spss.server/lib/iaik-moa-20051107">
+  		<fileset dir="${lib.iaik-moa}"/>
+  	</copy>
     <fixcrlf srcdir="${dist.src}" includes="**/*.sh" eol="lf" eof="remove"/>
   </target>