changing some stork parameters; adjusting spss maven config

15 files changed, 267 insertions, 38 deletions

diff --git a/id/ConfigWebTool/ConfigurationInterface.iml b/id/ConfigWebTool/ConfigurationInterface.iml
index 9c351185e..bb7e047b2 100644
--- a/id/ConfigWebTool/ConfigurationInterface.iml
+++ b/id/ConfigWebTool/ConfigurationInterface.iml
@@ -74,7 +74,7 @@
     <orderEntry type="library" name="Maven: xmlunit:xmlunit:1.0" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
     <orderEntry type="library" name="Maven: org.jvnet.hyperjaxb3:hyperjaxb3-ejb-schemas-persistence:0.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.jvnet.hyperjaxb3:hyperjaxb3-ejb-schemas-customizations:0.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring:2.0.7" level="project" />
@@ -116,7 +116,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xerces:xercesImpl:2.10.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xerces:serializer:2.10.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
     <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0.1" level="project" />
@@ -183,6 +183,9 @@
     <orderEntry type="library" name="Maven: com.google.collections:google-collections:1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
     <orderEntry type="library" name="Maven: at.gv.util:egovutils:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.6" level="project" />
+    <orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk16:140" level="project" />
     <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.3.14.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.3.14.3" level="project" />
     <orderEntry type="library" name="Maven: ognl:ognl:3.0.6" level="project" />
diff --git a/id/server/idserverlib/moa-id-lib.iml b/id/server/idserverlib/moa-id-lib.iml
index e79bae817..1c04295d7 100644
--- a/id/server/idserverlib/moa-id-lib.iml
+++ b/id/server/idserverlib/moa-id-lib.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9896690f5..c4d5310bf 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -277,8 +277,8 @@
 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-compiler-plugin</artifactId>

 				<configuration>

-					<source>1.6</source>

-					<target>1.6</target>

+					<source>1.5</source>

+					<target>1.5</target>

 				</configuration>

 			</plugin>

 			<plugin>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index 06d5b01bd..4b3995105 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1862,7 +1862,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
 		CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc());
 
-		Logger.debug("Preparing to assemble STORK AuthnRequest witt the following values:");
+		Logger.debug("Preparing to assemble STORK AuthnRequest with the following values:");
     	String destination = cpeps.getPepsURL().toExternalForm();
     	Logger.debug("C-PEPS URL: " + destination);
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index 297c5f366..7e80273ca 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -5,16 +5,11 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.logging.Logger;
-import eu.stork.mw.messages.saml.STORKAuthnRequest;
-import eu.stork.vidp.api.messages.StartAuthResponse;
-import eu.stork.vidp.messages.stork.SpInstitution;
-import eu.stork.vidp.messages.util.SAMLUtil;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.opensaml.xml.util.Base64;
 import org.opensaml.xml.util.XMLHelper;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -49,6 +44,7 @@ public class AuthenticationRequest implements IAction {
         httpResp.reset();
         //httpResp.addHeader("Location", "http:/www.google.com");
         if (req instanceof STORKAuthnRequestDEL) {
+          /*
             Logger.debug("STORK QAA 2 :" + ((STORKAuthnRequestDEL) req).getStorkAuthnRequest().getQAALevel());
             StartAuthResponse startAuthResponse = getStartAuthResponse(((STORKAuthnRequestDEL) req).getStorkAuthnRequest());
 
@@ -78,6 +74,8 @@ public class AuthenticationRequest implements IAction {
                 throw new MOAIDException("error response sending", new Object[]{});
             }
             //httpSession.setAttribute("CCC", ccc);
+
+          */
         }
 
 
@@ -93,6 +91,8 @@ public class AuthenticationRequest implements IAction {
     }
 
 
+    /*
+
     public StartAuthResponse getStartAuthResponse(STORKAuthnRequest authnRequest) {
 
         StartAuthResponse authResponse = new StartAuthResponse(500, null, new HashMap<String, String>());
@@ -141,6 +141,8 @@ public class AuthenticationRequest implements IAction {
         return authResponse;
     }
 
+    */
+
     public String getDefaultActionName() {
         return STORKProtocol.AUTHENTICATIONREQUEST;
     }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java
index 57dfad73f..c8a5ac84d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java
@@ -1,8 +1,7 @@
 package at.gv.egovernment.moa.id.protocols.stork2;
 
 import at.gv.egovernment.moa.id.moduls.IRequest;
-import eu.stork.mw.messages.saml.STORKAuthnRequest;
-import eu.stork.vidp.messages.saml.impl.STORKAuthnRequestImpl;
+import eu.stork.peps.auth.commons.STORKAuthnRequest;
 import org.opensaml.common.xml.SAMLConstants;
 
 /**
@@ -16,13 +15,13 @@ public class STORKAuthnRequestDEL implements IRequest {
     private String target = null;
     String module = null;
     String action = null;
-    private eu.stork.mw.messages.saml.STORKAuthnRequest storkAuthnRequest;
+    private STORKAuthnRequest storkAuthnRequest;
 
-    public void setSTORKAuthnRequest(STORKAuthnRequestImpl request) {
+    public void setSTORKAuthnRequest(STORKAuthnRequest request) {
         this.storkAuthnRequest = request;
     }
 
-    public eu.stork.mw.messages.saml.STORKAuthnRequest getStorkAuthnRequest() {
+    public STORKAuthnRequest getStorkAuthnRequest() {
         return this.storkAuthnRequest;
     }
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
index e99079191..2c47620e1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -8,14 +8,16 @@ import at.gv.egovernment.moa.id.moduls.IModulInfo;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.MOAURICompare;
 import at.gv.egovernment.moa.logging.Logger;
-import eu.stork.mw.messages.saml.STORKAuthnRequest;
-import eu.stork.vidp.messages.saml.impl.STORKAuthnRequestImpl;
+import eu.stork.peps.auth.commons.PEPSUtil;
+import eu.stork.peps.auth.commons.STORKAuthnResponse;
+import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import org.opensaml.common.binding.BasicSAMLMessageContext;
 import org.opensaml.saml2.binding.decoding.HTTPPostDecoder;
 import org.opensaml.ws.transport.http.HTTPInTransport;
 import org.opensaml.ws.transport.http.HTTPOutTransport;
 import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
 import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
+import eu.stork.peps.auth.commons.STORKAuthnRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -97,6 +99,7 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         } catch (Exception e) {
             Logger.error("Error decoding STORKAuthnRequest", e);
         }
+        /*
 
         STORKAuthnRequestImpl ST2Req = (STORKAuthnRequestImpl)samlMessageContext.getInboundSAMLMessage();
         //STORKAuthnRequestDEL STORK2Request = (STORKAuthnRequestDEL)samlMessageContext.getInboundSAMLMessage();
@@ -107,10 +110,32 @@ public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
         Logger.debug("STORK2 QAA: " + ST2Req.getQAALevel());
         Logger.debug("STORK2 ISSUER: " + ST2Req.getIssuer().toString());
 
-
+        */
         STORKAuthnReq storkAuthnReq = new STORKAuthnReq();
 
 
+        STORKAuthnRequestDEL STORK2Request = new STORKAuthnRequestDEL();
+
+
+        //extract STORK Response from HTTP Request
+        //Decodes SAML Response
+
+        /*
+        byte[] decSamlToken;
+        try {
+            decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLResponse"));
+        } catch(NullPointerException e) {
+            Logger.error("Unable to retrieve STORK Response", e);
+            throw new MOAIDException("stork.04", null);
+        }
+
+        //Get SAMLEngine instance
+        STORKSAMLEngine engine = STORKSAMLEngine.getInstance("outgoing");
+
+        STORKAuthnResponse authnResponse = null;
+        PEPSUtil.decode
+        engine.validateSTORKAuthnRequest()
+        */
 
         return STORK2Request;
     }
diff --git a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
index 9fb2e9fda..26b212283 100644
--- a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
+++ b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
@@ -1,15 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../../target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+    <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:7.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
+    <orderEntry type="library" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ixsil:1.2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
+    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
     <orderEntry type="module" module-name="moa-spss-lib" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jce_eval_signed:3.181" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_pki_module:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_javax_crypto:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jsse:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ssl:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:w3c_http:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
   </component>
 </module>
 
diff --git a/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml b/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml
index 9fb2e9fda..26b212283 100644
--- a/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml
+++ b/spss/handbook/clients/webservice/moa-spss-handbook-webserviceClient.iml
@@ -1,15 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../../target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+    <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:7.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
+    <orderEntry type="library" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ixsil:1.2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
+    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
     <orderEntry type="module" module-name="moa-spss-lib" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jce_eval_signed:3.181" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_pki_module:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_javax_crypto:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jsse:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ssl:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:w3c_http:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
   </component>
 </module>
 
diff --git a/spss/server/serverlib/moa-spss-lib.iml b/spss/server/serverlib/moa-spss-lib.iml
index d36dae117..11dc743a9 100644
--- a/spss/server/serverlib/moa-spss-lib.iml
+++ b/spss/server/serverlib/moa-spss-lib.iml
@@ -44,9 +44,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -55,6 +55,54 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+    <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:7.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
+    <orderEntry type="library" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ixsil:1.2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
+    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
+    <orderEntry type="module" module-name="moa-common" scope="TEST" production-on-test="" />
+    <orderEntry type="module" module-name="moa-spss-tools" scope="TEST" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jce_eval_signed:3.181" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_pki_module:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_javax_crypto:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jsse:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ssl:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:w3c_http:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
   </component>
 </module>
 
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 1c756d4d4..5afc4b70c 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -260,7 +260,7 @@
 						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>

 						<link>http://logging.apache.org/log4j/docs/api/</link>

 					</links>

-					<target>1.4</target>

+					<target>1.5</target>

 				</configuration>

 				<executions>

 					<execution>

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
index 30eed7001..6cf46c50a 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/MOAException.java
@@ -36,6 +36,7 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.util.Constants;
 
+
 import at.gv.egovernment.moa.spss.util.MessageProvider;
 
 /**
diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index 80378b441..45ebf8969 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -14,14 +14,60 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="moa-spss-lib" />
+    <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+    <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:7.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xercesImpl:2.9.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ixsil:1.2.2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
+    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jce_eval_signed:3.181" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_pki_module:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_javax_crypto:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jsse:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ssl:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:w3c_http:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
   </component>
 </module>
 
diff --git a/spss/server/tools/moa-spss-tools.iml b/spss/server/tools/moa-spss-tools.iml
index 40f81fa9a..a0c44cf2c 100644
--- a/spss/server/tools/moa-spss-tools.iml
+++ b/spss/server/tools/moa-spss-tools.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
@@ -10,6 +10,13 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
   </component>
 </module>
 
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index 61e7ffa6f..503c49545 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -71,10 +71,16 @@
           </archive>
         </configuration>
       </plugin>
+
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                  <source>1.5</source>
+                  <target>1.5</target>
+              </configuration>
+          </plugin>
     </plugins>
   </build>
 
-
-
-
 </project>