Merge branch 'datentechnik_modularization' into moa-id-2.2-merge

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
	id/server/stork2-commons/pom.xml
	id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
	id/server/stork2-commons/src/main/resources/.svn/entries
	id/server/stork2-saml-engine/pom.xml
	pom.xml

1 files changed, 0 insertions, 88 deletions

diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base
deleted file mode 100644
index e0f685ade..000000000
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/.svn/text-base/AttributeSourceTestCase.java.svn-base
+++ /dev/null
@@ -1,88 +0,0 @@
-package eu.stork.peps.tests;

-

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-

-import org.junit.Test;

-

-import eu.stork.peps.auth.commons.AttributeProvider;

-import eu.stork.peps.auth.commons.AttributeSource;

-import eu.stork.peps.auth.commons.Country;

-

-/**

- * The AttributeSource's Test Case.

- * 

- * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)

- * 

- * @version $Revision: $, $Date: $

- */

-public final class AttributeSourceTestCase {

-	private final AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");

-	private final AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2", null), "URL2");

-	private final AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL2");

-	private final AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL1");

-	private final AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");

-

-	private final AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");

-	private final AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2");

-	private final AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2");

-	private final AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1");

-	private final AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");

-

-	@Test

-	public void testNotEquals1() {

-		assertFalse(ap1.equals(ap2));

-	}

-

-	@Test

-	public void testNotEquals2() {

-		assertFalse(ap1.equals(c1));

-	}

-

-	@Test

-	public void testNotEquals3() {

-		assertFalse(c1.equals(c2));

-	}

-

-	@Test

-	public void testEquals1() {

-		assertTrue(ap1.equals(ap3));

-	}

-

-	@Test

-	public void testEquals2() {

-		assertTrue(ap1.equals(ap4));

-	}

-

-	@Test

-	public void testEquals3() {

-		assertTrue(ap1.equals(ap5));

-	}

-

-	@Test

-	public void testEquals4() {

-		assertTrue(c1.equals(c3));

-	}

-

-	@Test

-	public void testEquals5() {

-		assertTrue(c1.equals(c4));

-	}

-

-	@Test

-	public void testEquals6() {

-		assertTrue(c1.equals(c5));

-	}

-

-	@Test

-	public void testEquals7() {

-		final Object obj = ap5;

-		assertTrue(ap1.equals(obj));

-	}

-

-	@Test

-	public void testEquals8() {

-		final Object obj = c5;

-		assertTrue(c1.equals(obj));

-	}

-}