diff options
| author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-09-04 09:37:31 +0200 |
|---|---|---|
| committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2013-09-04 09:37:31 +0200 |
| commit | eadd6dd97f1b30608b31ffcd90382874fbcdaddc (patch) | |
| tree | 1e02de018bcb417bf897f06fb79bf64eda9b4b06 /id/server/auth | |
| parent | 61362f940ca679fe215de34b1683e1110fea8d3e (diff) | |
| parent | 69f2dfdf3e0b5d976df3cdece6a8ead4848d746a (diff) | |
| download | moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.gz moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.bz2 moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.zip | |
Merge SPSS
Diffstat (limited to 'id/server/auth')
| -rw-r--r-- | id/server/auth/.settings/.jsdtscope | 2 | ||||
| -rw-r--r-- | id/server/auth/.settings/org.eclipse.jdt.core.prefs | 15 | ||||
| -rw-r--r-- | id/server/auth/pom.xml | 3 | ||||
| -rw-r--r-- | id/server/auth/src/main/wsdl/MOA-ID-1.x.wsdl | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/id/server/auth/.settings/.jsdtscope b/id/server/auth/.settings/.jsdtscope index f40dd98e2..beb42ee1c 100644 --- a/id/server/auth/.settings/.jsdtscope +++ b/id/server/auth/.settings/.jsdtscope @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" path="target/m2e-wtp/web-resources"/>
+ <classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
<attributes>
diff --git a/id/server/auth/.settings/org.eclipse.jdt.core.prefs b/id/server/auth/.settings/org.eclipse.jdt.core.prefs index f9077e609..dc0892a32 100644 --- a/id/server/auth/.settings/org.eclipse.jdt.core.prefs +++ b/id/server/auth/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,8 @@ -#Thu Dec 27 15:45:26 CET 2012
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.source=1.5
+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/auth/pom.xml b/id/server/auth/pom.xml index f4e72fea4..c68236e0e 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>
|