From 6bb458eb21a4d153cdc5e0dda9cc4818821d693e Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@iaik.tugraz.at>
Date: Mon, 8 Jul 2013 13:54:31 +0200
Subject: Assertionbuilder fix

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
---
 id/server/moa-id-commons/.classpath | 7 +------
 id/server/moa-id-commons/.project   | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'id/server/moa-id-commons')

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>
-- 
cgit v1.2.3