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

7 files changed, 21 insertions, 16 deletions

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>