aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-07-08 13:54:31 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-07-08 14:20:27 +0200
commit6bb458eb21a4d153cdc5e0dda9cc4818821d693e (patch)
treef7740ed7188404826f4d03ca35d35878729fa68f /id
parent8e0d3b1e777cf4bd4213e56f4c5130036932f462 (diff)
downloadmoa-id-spss-6bb458eb21a4d153cdc5e0dda9cc4818821d693e.tar.gz
moa-id-spss-6bb458eb21a4d153cdc5e0dda9cc4818821d693e.tar.bz2
moa-id-spss-6bb458eb21a4d153cdc5e0dda9cc4818821d693e.zip
Assertionbuilder fix
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
Diffstat (limited to 'id')
-rw-r--r--id/server/auth/.settings/org.eclipse.wst.common.component45
-rw-r--r--id/server/moa-id-commons/.classpath7
-rw-r--r--id/server/moa-id-commons/.project1
3 files changed, 26 insertions, 27 deletions
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 7b7368902..d9c09d9ad 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="moa-id-auth">
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
- <dependency-type>uses</dependency-type>
- </dependent-module>
- <property name="context-root" value="moa-id-auth"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
- <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
- <property name="java-output-path" value="/target/classes"/>
- </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="moa-id-auth">
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="moa-id-commons.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <property name="context-root" value="moa-id-auth"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+ <property name="java-output-path" value="/target/classes"/>
+ </wb-module>
+</project-modules>
diff --git a/id/server/moa-id-commons/.classpath b/id/server/moa-id-commons/.classpath
index 3cb77b9e0..a3f1bdc53 100644
--- a/id/server/moa-id-commons/.classpath
+++ b/id/server/moa-id-commons/.classpath
@@ -17,11 +17,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <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">
<attributes>
<attribute name="maven.pomderived" value="true"/>
@@ -30,8 +25,8 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
- <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/id/server/moa-id-commons/.project b/id/server/moa-id-commons/.project
index d109c42c5..75c3e013e 100644
--- a/id/server/moa-id-commons/.project
+++ b/id/server/moa-id-commons/.project
@@ -3,6 +3,7 @@
<name>moa-id-commons</name>
<comment></comment>
<projects>
+ <project>moa-common</project>
</projects>
<buildSpec>
<buildCommand>