Update MOA-ID Specification (appendix)

Bug fix: OA URL escape
Verify Country-Code in Foreign Identities Mode (AT login not possible)

2 files changed, 118 insertions, 41 deletions

diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index 2c2ea723a..5e27a2fda 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-  <name>moa-spss-ws</name>

-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>

-  <projects>

-    <project>moa-spss-lib</project>

-    <project>moa-common</project>

-  </projects>

-  <buildSpec>

-    <buildCommand>

-      <name>org.eclipse.jdt.core.javabuilder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.wst.common.project.facet.core.builder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.wst.validation.validationbuilder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.maven.ide.eclipse.maven2Builder</name>

-    </buildCommand>

-    <buildCommand>

-      <name>org.eclipse.m2e.core.maven2Builder</name>

-    </buildCommand>

-  </buildSpec>

-  <natures>

-    <nature>org.eclipse.m2e.core.maven2Nature</nature>

-    <nature>org.eclipse.jdt.core.javanature</nature>

-    <nature>org.maven.ide.eclipse.maven2Nature</nature>

-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>

-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

-    <nature>org.eclipse.wst.jsdt.core.jsNature</nature>

-  </natures>

-</projectDescription>
\ No newline at end of file
+	<name>moa-spss-ws</name>

+	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>

+	<projects>

+		<project>moa-spss-lib</project>

+		<project>moa-common</project>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.wst.common.project.facet.core.builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.wst.validation.validationbuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.maven.ide.eclipse.maven2Builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.maven.ide.eclipse.maven2Nature</nature>

+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>

+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>

+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>

+	</natures>

+</projectDescription>

diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component
index bf4e9bca3..24b595218 100644
--- a/spss/server/serverws/.settings/org.eclipse.wst.common.component
+++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component
@@ -1,15 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

+<?xml version="1.0" encoding="UTF-8"?>

+<project-modules id="moduleCoreId" project-version="2.0">

   <wb-module deploy-name="moa-spss-ws">

-        <dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

     <property name="context-root" value="moa-spss-ws"/>

     <wb-resource deploy-path="/" source-path="src/main/webapp"/>

     <wb-resource deploy-path="/" source-path="resources/wsdl"/>

     <wb-resource deploy-path="/" source-path="C:/eclipse_workspaces/MOA_Git02/moa-idspss/spss/handbook"/>

     <property name="java-output-path" value="/target/classes"/>

+    <dependent-module archiveName="moa-spss-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-1.0_IAIK.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis/1.0_IAIK/axis-1.0_IAIK.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-jaxrpc-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-saaj-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="axis-wsdl4j-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-discovery-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="commons-logging-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="activation-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="mail-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="postgresql-7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="servlet-api-2.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_moa-1.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_ixsil-1.2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_cms-4.1_MOA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="moa-common.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="jaxen-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="saxpath-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="joda-time-1.6.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_tsl-0.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_util-0.23.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_xsect-1.1709142.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="jaxb-api-2.2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="jaxb-impl-2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="sqlite-jdbc-3.7.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

+    <dependent-module archiveName="iaik_jsse-4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar">

+      <dependency-type>uses</dependency-type>

+    </dependent-module>

   </wb-module>

-</project-modules>

+</project-modules>
\ No newline at end of file