Changed Apache Axis to version 1.4

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

11 files changed, 12 insertions, 5 deletions

diff --git a/id.server/.classpath b/id.server/.classpath
index 591b05555..2f743e459 100644
--- a/id.server/.classpath
+++ b/id.server/.classpath
@@ -10,10 +10,10 @@
 	<classpathentry kind="lib" path="lib/jaxp-1.2_01/jaxp-api.jar"/>
 	<classpathentry kind="lib" path="lib/jaxp-1.2_01/sax.jar"/>
 	<classpathentry kind="lib" path="/common/lib/junit-3.8.1/junit.jar"/>
-	<classpathentry kind="lib" path="lib/axis-1.1rc2/axis.jar"/>
-	<classpathentry kind="lib" path="lib/axis-1.1rc2/commons-discovery.jar"/>
-	<classpathentry kind="lib" path="lib/axis-1.1rc2/jaxrpc.jar"/>
-	<classpathentry kind="lib" path="lib/axis-1.1rc2/saaj.jar"/>
+	<classpathentry kind="lib" path="lib/axis-1.4/axis.jar"/>
+	<classpathentry kind="lib" path="lib/axis-1.4/jaxrpc.jar"/>
+	<classpathentry kind="lib" path="lib/axis-1.4/saaj.jar"/>
+	<classpathentry kind="lib" path="lib/commons-discovery-0.2/commons-discovery.jar"/>
 	<classpathentry kind="lib" path="lib/jsse-1.0.3_03/jcert.jar"/>
 	<classpathentry kind="lib" path="lib/jsse-1.0.3_03/jnet.jar"/>
 	<classpathentry kind="lib" path="lib/jsse-1.0.3_03/jsse.jar"/>
diff --git a/id.server/build.xml b/id.server/build.xml
index b2914d27a..a773ab737 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -35,7 +35,8 @@
 	<property name="prj.common" value="../common"/>
 	<property name="prj.oa" value="../id.oa"/>
 	<property name="lib" value="lib"/>
-	<property name="lib.axis" value="${lib}/axis-1.1rc2"/>
+	<property name="lib.axis" value="${lib}/axis-1.4"/>
+	<property name="lib.commons-discovery" value="${lib}/commons-discovery-0.2"/>
 	<property name="lib.commons-logging" value="${lib}/commons-logging-1.0.4"/>
 	<property name="lib.commons-fileupload" value="${lib}/commons-fileupload-1.1.1"/>
 	<property name="lib.commons-io" value="${lib}/commons-io-1.1"/>
@@ -191,6 +192,7 @@
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
+			<lib dir="${lib.commons-discovery}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-full}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar,signed/,linux/libpkcs11wrapper.so,linux_x64/libpkcs11wrapper.so,solaris_sparc/libpkcs11wrapper.so,solaris_sparcv9/libpkcs11wrapper.so,wince30arm/pkcs11wrapper.dll"/>
 			<lib dir="${lib.moa-spss}"/>
@@ -215,6 +217,7 @@
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
+			<lib dir="${lib.commons-discovery}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-eval}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar,signed/,linux/libpkcs11wrapper.so,linux_x64/libpkcs11wrapper.so,solaris_sparc/libpkcs11wrapper.so,solaris_sparcv9/libpkcs11wrapper.so,wince30arm/pkcs11wrapper.dll"/>
 			<lib dir="${lib.moa-spss}"/>
@@ -239,6 +242,7 @@
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
+			<lib dir="${lib.commons-discovery}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.moa-spss}"/>
 			<lib dir="${lib.postgres-jdbc}"/>
@@ -275,6 +279,7 @@
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
+			<lib dir="${lib.commons-discovery}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-full}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar,signed/,linux/libpkcs11wrapper.so,linux_x64/libpkcs11wrapper.so,solaris_sparc/libpkcs11wrapper.so,solaris_sparcv9/libpkcs11wrapper.so,wince30arm/pkcs11wrapper.dll"/>
 			<lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
@@ -297,6 +302,7 @@
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
+			<lib dir="${lib.commons-discovery}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-eval}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar,signed/,linux/libpkcs11wrapper.so,linux_x64/libpkcs11wrapper.so,solaris_sparc/libpkcs11wrapper.so,solaris_sparcv9/libpkcs11wrapper.so,wince30arm/pkcs11wrapper.dll"/>
 			<lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
@@ -319,6 +325,7 @@
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
 			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
+			<lib dir="${lib.commons-discovery}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
 			<lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
diff --git a/id.server/lib/axis-1.1rc2/axis.jar b/id.server/lib/axis-1.1rc2/axis.jar
deleted file mode 100644
index 445ff8134..000000000
--- a/id.server/lib/axis-1.1rc2/axis.jar
+++ /dev/null
diff --git a/id.server/lib/axis-1.1rc2/jaxrpc.jar b/id.server/lib/axis-1.1rc2/jaxrpc.jar
deleted file mode 100644
index dcf9c3ac1..000000000
--- a/id.server/lib/axis-1.1rc2/jaxrpc.jar
+++ /dev/null
diff --git a/id.server/lib/axis-1.1rc2/saaj.jar b/id.server/lib/axis-1.1rc2/saaj.jar
deleted file mode 100644
index 839f81879..000000000
--- a/id.server/lib/axis-1.1rc2/saaj.jar
+++ /dev/null
diff --git a/id.server/lib/axis-1.1rc2/wsdl4j.jar b/id.server/lib/axis-1.1rc2/wsdl4j.jar
deleted file mode 100644
index de45fea68..000000000
--- a/id.server/lib/axis-1.1rc2/wsdl4j.jar
+++ /dev/null
diff --git a/id.server/lib/axis-1.4/axis.jar b/id.server/lib/axis-1.4/axis.jar
new file mode 100644
index 000000000..20b09a595
--- /dev/null
+++ b/id.server/lib/axis-1.4/axis.jar
diff --git a/id.server/lib/axis-1.4/jaxrpc.jar b/id.server/lib/axis-1.4/jaxrpc.jar
new file mode 100644
index 000000000..a2c13d9a2
--- /dev/null
+++ b/id.server/lib/axis-1.4/jaxrpc.jar
diff --git a/id.server/lib/axis-1.4/saaj.jar b/id.server/lib/axis-1.4/saaj.jar
new file mode 100644
index 000000000..4ea696e74
--- /dev/null
+++ b/id.server/lib/axis-1.4/saaj.jar
diff --git a/id.server/lib/axis-1.4/wsdl4j-1.5.1.jar b/id.server/lib/axis-1.4/wsdl4j-1.5.1.jar
new file mode 100644
index 000000000..c6254ee69
--- /dev/null
+++ b/id.server/lib/axis-1.4/wsdl4j-1.5.1.jar
diff --git a/id.server/lib/axis-1.1rc2/commons-discovery.jar b/id.server/lib/commons-discovery-0.2/commons-discovery.jar
index 9dcd95038..b88554847 100644
--- a/id.server/lib/axis-1.1rc2/commons-discovery.jar
+++ b/id.server/lib/commons-discovery-0.2/commons-discovery.jar