From a544afcf4ad581ab7b76e85dc597ccf5643cd55a Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Mon, 6 May 2013 21:43:00 +0200
Subject: - Update MOA-SS Interface (CreateCMSignatureRequest) - Whitelisting
 in MOA-SPSS

---
 id/oa/.settings/org.eclipse.jdt.core.prefs                   |  6 +++---
 .../.settings/org.eclipse.wst.common.project.facet.core.xml  |  2 +-
 id/server/auth/.settings/org.eclipse.wst.common.component    |  5 ++---
 .../.settings/org.eclipse.wst.common.project.facet.core.xml  |  4 ++--
 id/server/auth/pom.xml                                       |  3 ++-
 id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl                 |  2 +-
 id/server/doc/MOA ID 1.x.wsdl                                |  2 +-
 id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs   | 11 +++--------
 .../.settings/org.eclipse.wst.common.project.facet.core.xml  |  4 ++--
 .../src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl        |  2 +-
 id/server/proxy/.settings/org.eclipse.jdt.core.prefs         |  3 +++
 id/server/proxy/.settings/org.eclipse.wst.common.component   |  3 ++-
 .../.settings/org.eclipse.wst.common.project.facet.core.xml  |  4 ++--
 id/server/proxy/pom.xml                                      |  3 ++-
 id/templates/.classpath                                      |  8 ++++----
 id/templates/.settings/org.eclipse.jdt.core.prefs            | 12 +++++++-----
 .../.settings/org.eclipse.wst.common.project.facet.core.xml  |  2 +-
 17 files changed, 39 insertions(+), 37 deletions(-)

(limited to 'id')

diff --git a/id/oa/.settings/org.eclipse.jdt.core.prefs b/id/oa/.settings/org.eclipse.jdt.core.prefs
index dc0892a32..c788ee346 100644
--- a/id/oa/.settings/org.eclipse.jdt.core.prefs
+++ b/id/oa/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
index fec12087a..c4dff31bf 100644
--- a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="1.5"/>
   <installed facet="jst.web" version="2.3"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 70a85d980..a4365e482 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -13,13 +13,12 @@
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="context-root" value="moa-id-auth"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-    <wb-resource deploy-path="/" source-path="src/main/wsdl"/>
     <property name="java-output-path" value="/target/classes"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
   </wb-module>
 </project-modules>
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
index 564572b10..ac59587b0 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.4"/>
   <installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file
+  <installed facet="jst.web" version="2.3"/>
+</faceted-project>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 816e41df0..d03fcdad4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -23,7 +23,8 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.0.2</version>
+				<version>2.1.1</version>
+				<!-- <version>2.0.2</version>-->
 				<configuration>
 					<archive>
 						<manifest>
diff --git a/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl b/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl
index 5466a0b6f..1e922e081 100644
--- a/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl
+++ b/id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-1.2.xsd"/>
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-1.5.2.xsd"/>
 	<message name="GetAuthenticationDataInput">
 		<part name="body" element="samlp:Request"/>
 	</message>
diff --git a/id/server/doc/MOA ID 1.x.wsdl b/id/server/doc/MOA ID 1.x.wsdl
index 86c08226a..e54075f24 100644
--- a/id/server/doc/MOA ID 1.x.wsdl	
+++ b/id/server/doc/MOA ID 1.x.wsdl	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by patrick peck (anecon) -->
 <definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-1.2.xsd"/>
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="MOA-SPSS-1.5.2.xsd"/>
 	<message name="GetAuthenticationDataInput">
 		<part name="body" element="samlp:Request"/>
 	</message>
diff --git a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
index 735c5ab7c..c788ee346 100644
--- a/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
+++ b/id/server/idserverlib/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,8 @@
-#Thu Dec 27 16:30:52 CET 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
index 656f15b87..6c09452f2 100644
--- a/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/idserverlib/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file
+  <installed facet="jst.java" version="1.7"/>
+</faceted-project>
diff --git a/id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl b/id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
index 45152cb38..7368691b6 100644
--- a/id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
+++ b/id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <definitions name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/1999/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.xmlsoap.org/wsdl/ http://schemas.xmlsoap.org/wsdl/">
-	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.2.xsd"/>
+	<import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" location="../resources/schemas/MOA-SPSS-1.5.2.xsd"/>
 	<message name="GetAuthenticationDataInput">
 		<part name="body" element="samlp:Request"/>
 	</message>
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
index 862602624..dc0892a32 100644
--- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
+++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index cc61830e7..e68415025 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -13,7 +13,8 @@
             <dependency-type>uses</dependency-type>
         </dependent-module>
     <property name="context-root" value="moa-id-proxy"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
+        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <property name="java-output-path" value="/target/classes"/>
   </wb-module>
 </project-modules>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
index 564572b10..ac59587b0 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.4"/>
   <installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file
+  <installed facet="jst.web" version="2.3"/>
+</faceted-project>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 4e7ca3d3a..ca91c6139 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -21,7 +21,8 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>2.0.2</version>
+				<version>2.1.1</version>
+				<!-- <version>2.0.2</version>-->
 				<configuration>
 					<archive>
 						<manifest>
diff --git a/id/templates/.classpath b/id/templates/.classpath
index 767a2a2de..3f17a7f21 100644
--- a/id/templates/.classpath
+++ b/id/templates/.classpath
@@ -12,15 +12,15 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/id/templates/.settings/org.eclipse.jdt.core.prefs b/id/templates/.settings/org.eclipse.jdt.core.prefs
index ac2f76dec..c788ee346 100644
--- a/id/templates/.settings/org.eclipse.jdt.core.prefs
+++ b/id/templates/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,8 @@
-#Thu Dec 27 15:45:24 CET 2012
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml
index ac59587b0..c4dff31bf 100644
--- a/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/id/templates/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
   <installed facet="jst.web" version="2.3"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>
-- 
cgit v1.2.3