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

18 files changed, 44 insertions, 36 deletions

diff --git a/build.bat b/build.bat
new file mode 100644
index 000000000..7e5bafcdc
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,4 @@
+@echo off

+

+mvn %1 source:jar source:test-jar install javadoc:jar package assembly:assembly

+

diff --git a/common/pom.xml b/common/pom.xml
index 850613e97..ed8d0e95f 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <groupId>MOA</groupId>
     <artifactId>MOA</artifactId>
-    <version>1.4.2beta2</version>
+    <version>1.4.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA</groupId>
   <artifactId>moa-common</artifactId>
-  <version>1.4.2beta2</version>
+  <version>1.4.2</version>
   <packaging>jar</packaging>
   <name>MOA common library</name>
 
diff --git a/id/pom.xml b/id/pom.xml
index 1d93d087c..bef0efa09 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>1.4.2beta2</version>
+        <version>1.4.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA</groupId>
     <artifactId>id</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.2beta2</version>
+    <version>1.4.2</version>
     <name>MOA ID</name>
 
     <modules>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 2c123a8ec..a6395634c 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,14 +2,14 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2beta2</version>
+		<version>1.4.2</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-auth</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2beta2</version>
+	<version>1.4.2</version>
 	<name>MOA ID-Auth WebService</name>
 	
 	<properties>
@@ -53,7 +53,7 @@
 	</build>
 	
 	<dependencies>
-		<!-- we need Axis 1.4 here because 1.0 is in SPSS included -->
+		<!-- we need Axis 1.4 here because 1.0 is included in SPSS -->
 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
diff --git a/id/server/data/deploy/tomcat/win32/startTomcat.bat b/id/server/data/deploy/tomcat/win32/startTomcat.bat
index f6ebc3613..676e52f21 100644
--- a/id/server/data/deploy/tomcat/win32/startTomcat.bat
+++ b/id/server/data/deploy/tomcat/win32/startTomcat.bat
@@ -4,8 +4,8 @@ rem Modify these entries according to your needs
 rem JDK home directory (no trailing path separator)

 set JAVA_HOME=<jdk home directory>

 

-rem Tomcat 4.1.x home directory (no trailing path separator)

-set CATALINA_HOME=<Tomcat 4.1.x home directory>

+rem Tomcat home directory (no trailing path separator)

+set CATALINA_HOME=<Tomcat home directory>

 

 rem ----------------------------------------------------------------------------------------------

 

@@ -23,4 +23,4 @@ rem set PARAMS_SSL=%PARAM_TRUST_STORE% %PARAM_TRUST_STORE_PASS% %PARAM_TRUST_STO
 set CATALINA_OPTS=%PARAMS_MOA% %PARAMS_SSL% 

 

 cd %CATALINA_HOME%

-bin\catalina.bat start
\ No newline at end of file
+bin\catalina.bat start

diff --git a/id/server/data/deploy/tomcat/win32/stopTomcat.bat b/id/server/data/deploy/tomcat/win32/stopTomcat.bat
index 09dd83f2d..46c1ba570 100644
--- a/id/server/data/deploy/tomcat/win32/stopTomcat.bat
+++ b/id/server/data/deploy/tomcat/win32/stopTomcat.bat
@@ -4,10 +4,10 @@ rem Modify these entries according to your needs
 rem JDK home directory (no trailing path separator)

 set JAVA_HOME=<jdk home directory>

 

-rem Tomcat 4.1.x home directory (no trailing path separator)

-set CATALINA_HOME=<Tomcat 4.1.x home directory>

+rem Tomcat home directory (no trailing path separator)

+set CATALINA_HOME=<Tomcat home directory>

 

 rem ----------------------------------------------------------------------------------------------

 

 cd %CATALINA_HOME%

-bin\catalina.bat stop
\ No newline at end of file
+bin\catalina.bat stop

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 93d61588c..42031279d 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -2,14 +2,14 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>1.4.2beta2</version>

+		<version>1.4.2</version>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.id.server</groupId>

 	<artifactId>moa-id-lib</artifactId>

 	<packaging>jar</packaging>

-	<version>1.4.2beta2</version>

+	<version>1.4.2</version>

 	<name>MOA ID API</name>

 

 	<properties>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
index aed635502..e2a28163f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
@@ -76,7 +76,12 @@ public class ParepUtils {
       nameSpaceNode.setAttribute("xmlns:md", SZRGWConstants.MANDATE_NS);

       Node resultNode = XPathAPI.selectSingleNode(mandate, "//md:Mandate/attribute::MandateID", nameSpaceNode);

       if (resultNode != null) {

-        return resultNode.getTextContent();

+        // because following line is not ready for JDK 1.4.x we need to get the childnode; 

+        // return resultNode.getTextContent();

+        Node textNode = resultNode.getFirstChild();

+        if (textNode != null) {

+          return textNode.getNodeValue();

+        }

       }

       return null;

     } catch (Exception e) {

diff --git a/id/server/pom.xml b/id/server/pom.xml
index c7c938666..2173b97c4 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -4,14 +4,14 @@
     <parent>

         <groupId>MOA</groupId>

         <artifactId>id</artifactId>

-        <version>1.4.2beta2</version>

+        <version>1.4.2</version>

     </parent>

 

     <modelVersion>4.0.0</modelVersion>

     <groupId>MOA.id</groupId>

     <artifactId>moa-id</artifactId>

     <packaging>pom</packaging>

-    <version>1.4.2beta2</version>

+    <version>1.4.2</version>

     <name>MOA ID Server</name>

 

     <modules>

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 172bb99b5..0a75d8bdb 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>1.4.2beta2</version>

+		<version>1.4.2</version>

 	</parent>

 	

 	<properties>

@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>

 	<artifactId>moa-id-proxy</artifactId>

 	<packaging>war</packaging>

-	<version>1.4.2beta2</version>

+	<version>1.4.2</version>

 	<name>MOA ID-Proxy WebService</name>

 	

 	<build>

diff --git a/id/templates/pom.xml b/id/templates/pom.xml
index ea6ac7c4f..440bf9448 100644
--- a/id/templates/pom.xml
+++ b/id/templates/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>1.4.2beta2</version>
+        <version>1.4.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id</groupId>
     <artifactId>moa-id-templates</artifactId>
     <packaging>war</packaging>
-    <version>1.4.2beta2</version>
+    <version>1.4.2</version>
     <name>MOA ID Sample Templates</name>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 2f9a090f3..c38847c32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>MOA</groupId>

     <artifactId>MOA</artifactId>

     <packaging>pom</packaging>

-    <version>1.4.2beta2</version>

+    <version>1.4.2</version>

     <name>MOA</name>

 

     <properties>

@@ -118,7 +118,6 @@
                <version>1.5.1</version>

                <scope>compile</scope>

             </dependency>

-

             <dependency>

                 <groupId>jaxen</groupId>

                 <artifactId>jaxen</artifactId>

@@ -181,25 +180,25 @@
             <dependency>

                 <groupId>MOA</groupId>

                 <artifactId>moa-common</artifactId>

-                <version>1.4.2beta2</version>

+                <version>1.4.2</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

                 <groupId>MOA.id.server</groupId>

                 <artifactId>moa-id-lib</artifactId>

-                <version>1.4.2beta2</version>

+                <version>1.4.2</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

                 <groupId>MOA.spss.server</groupId>

                 <artifactId>moa-spss-lib</artifactId>

-                <version>1.4.2beta2</version>

+                <version>1.4.2</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

                 <groupId>MOA</groupId>

                 <artifactId>moa-common</artifactId>

-                <version>1.4.2beta2</version>

+                <version>1.4.2</version>

                 <type>test-jar</type>

                 <scope>test</scope>

             </dependency>

diff --git a/spss/handbook/clients/webservice/.classpath b/spss/handbook/clients/webservice/.classpath
index 0e7468e05..f820e0c3b 100644
--- a/spss/handbook/clients/webservice/.classpath
+++ b/spss/handbook/clients/webservice/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src/main/java"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0"/>

 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs
index 1e3e5d4c9..dee421f20 100644
--- a/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs
+++ b/spss/handbook/clients/webservice/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
-#Tue Sep 04 14:06:58 CEST 2007

+#Wed Nov 07 07:57:10 GMT 2007

 eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4

 org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.source=1.3

+org.eclipse.jdt.core.compiler.source=1.4

diff --git a/spss/pom.xml b/spss/pom.xml
index 97ccf975e..7e99360ad 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>1.4.2beta2</version>
+        <version>1.4.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/spss/server/serverlib/.classpath b/spss/server/serverlib/.classpath
index 01edb156d..eac66f93e 100644
--- a/spss/server/serverlib/.classpath
+++ b/spss/server/serverlib/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>

 	<classpathentry kind="src" path="src/test/java"/>

 	<classpathentry excluding="**" kind="src" output="src/main/resources" path="src/main/resources"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0"/>

 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

 	<classpathentry kind="output" path="target/classes"/>

 </classpath>

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index b5c9c1ec2..65b005fec 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -9,7 +9,7 @@
 	<groupId>MOA.spss.server</groupId>

 	<artifactId>moa-spss-lib</artifactId>

 	<packaging>jar</packaging>

-	<version>1.4.2beta2</version>

+	<version>1.4.2</version>

 	<name>MOA SP/SS API</name>

 

 	<properties>

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index b96ddf39f..aed4e8cc1 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -10,7 +10,7 @@
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>1.4.2beta2</version>
+    <version>1.4.2</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>