Bug 271: Tool zur Migration des Konfigurationsfiles von 1.0 auf 1.3 erstellt.

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

1 files changed, 8 insertions, 6 deletions

diff --git a/spss.server/build.xml b/spss.server/build.xml
index 7511ee2a4..4121e2a5c 100644
--- a/spss.server/build.xml
+++ b/spss.server/build.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <!--
 
   Ant Buildfile for MOA SP/SS Server
@@ -11,7 +10,7 @@
 <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.1"/>
+  <property name="version" value="1.3.0"/>
   <property name="src" value="src"/>
   <property name="lib" value="lib"/>
   <property name="res" value="res"/>
@@ -42,7 +41,7 @@
   <property name="lib.jaxen" value="${lib}/jaxen-1.0"/>
   <property name="lib.xerces" value="${lib}/xerces-j-2.4.0"/>
   <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.jsse" value="${lib}/jsse-1.0.3_03"/>
   <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
   <property name="lib.iaik-moa" value="${lib}/iaik-moa-20050623"/>
   <property name="lib.junit" value="${lib}/junit-3.8.1"/>
@@ -69,7 +68,7 @@
     <pathelement location="${lib.commons-logging}/commons-logging-api.jar"/>
     <pathelement location="${lib.commons-discovery}/commons-discovery.jar"/>
     <pathelement location="${lib.servlet}/servlet-2_3-fcs-classfiles.zip"/>
-    <pathelement location="${lib.iaik-moa}/iaik_moa_full.jar"/>
+    <pathelement location="${lib.iaik-moa}/iaik_moa_full.exbug232.jar"/>
     <pathelement location="${lib.iaik-moa}/iaik_ixsil.jar"/>
     <pathelement location="${lib.iaik-moa}/iaik_jce_full.jar"/>
     <pathelement location="${lib.iaik-moa}/iaik_ecc.jar"/>
@@ -119,7 +118,7 @@
       <lib file="${lib.commons-discovery}/commons-discovery.jar"/>
       <lib file="${env.MOA_COMMON_JAR}"/>
       <classes dir="${compile}" excludes="test/**"/>
-      <classes dir="${res}"/>
+      <classes dir="${res}" excludes="resources/tools/**"/>
       <classes file="${handbook}/conf/moa-spss/log4j.properties"/>
       <webinf file="server-config.wsdd"/>
       <webinf dir="${handbook}" includes="conf/**"/>
@@ -131,7 +130,7 @@
     <description>package the library jar file</description>
     <jar destfile="${dist.lib}/moa-spss.jar">
       <fileset dir="${compile}" excludes="test/**"/>
-      <fileset dir="${res}"/>
+      <fileset dir="${res}" excludes="resources/tools/**"/>
       <fileset dir="${handbook}/conf/moa-spss" includes="log4j.properties"/>
     </jar>
   </target>
@@ -140,6 +139,7 @@
     <description>package the configuration tools</description>
     <jar destfile="${tools}/tools.jar">
       <fileset dir="${compile}" includes="at/**/tools/**"/>
+      <fileset dir="${res}" includes="resources/tools/**"/>	
     </jar>
   </target>
   
@@ -280,6 +280,7 @@
       </fileset>
       -->
       <fileset dir="${lib.log4j}"/>
+      <fileset dir="${lib.xalan}"/>    	
       <fileset dir="${data}/deploy/tools"/>
     </copy>
     <copy toDir="${dist.ws}/pkcs11">
@@ -356,6 +357,7 @@
       </fileset>
       -->
       <fileset dir="${lib.log4j}"/>
+      <fileset dir="${lib.xalan}"/>
       <fileset dir="${data}/deploy/tools"/>
     </copy>
   	<copy toDir="${dist.lib}/licenses">