Merge branch 'samlengine_update' into moa-2.1-Snapshot

5 files changed, 0 insertions, 401 deletions

diff --git a/id/server/legacy-backup/stork2-commons/.svn/all-wcprops b/id/server/legacy-backup/stork2-commons/.svn/all-wcprops
deleted file mode 100644
index 256ae0266..000000000
--- a/id/server/legacy-backup/stork2-commons/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 45
-/CITnet/svn/STORK2/!svn/ver/493/trunk/Commons
-END
-Releases
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/CITnet/svn/STORK2/!svn/ver/493/trunk/Commons/Releases
-END
-pom.xml
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/CITnet/svn/STORK2/!svn/ver/493/trunk/Commons/pom.xml
-END
diff --git a/id/server/legacy-backup/stork2-commons/.svn/dir-prop-base b/id/server/legacy-backup/stork2-commons/.svn/dir-prop-base
deleted file mode 100644
index 9dc541cfd..000000000
--- a/id/server/legacy-backup/stork2-commons/.svn/dir-prop-base
+++ /dev/null
@@ -1,10 +0,0 @@
-K 10
-svn:ignore
-V 44
-.classpath
-.project
-.settings
-report
-target
-
-END
diff --git a/id/server/legacy-backup/stork2-commons/.svn/entries b/id/server/legacy-backup/stork2-commons/.svn/entries
deleted file mode 100644
index 148e40ca3..000000000
--- a/id/server/legacy-backup/stork2-commons/.svn/entries
+++ /dev/null
@@ -1,99 +0,0 @@
-10
-
-dir
-665
-https://webgate.ec.europa.eu/CITnet/svn/STORK2/trunk/Commons
-https://webgate.ec.europa.eu/CITnet/svn/STORK2
-
-
-
-2014-01-15T19:49:15.801345Z
-493
-emferreri
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-aa842e49-f825-43fc-93ba-11ee9fd5a035
-
-Releases
-file
-
-
-
-
-2014-01-21T08:38:55.424702Z
-5baf63f5379c354181f211dc4da29a64
-2014-01-15T19:49:15.801345Z
-493
-emferreri
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2402
-
-src
-dir
-
-pom.xml
-file
-
-
-
-
-2014-01-21T08:38:55.428702Z
-dc8551a0a1e6a9a3a63052bd0dd3de55
-2014-01-15T19:49:15.801345Z
-493
-emferreri
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5777
-
diff --git a/id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base b/id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base
deleted file mode 100644
index 54aeb9313..000000000
--- a/id/server/legacy-backup/stork2-commons/.svn/text-base/Releases.svn-base
+++ /dev/null
@@ -1,62 +0,0 @@
-Created 06-04-2011
-
-Branch : STORKCommons_0_5_UPDATE_06042011
-Date   : 06-04-2011
-Changes: No changes.
-
-Branch : STORKCommons_0_5_UPDATE_07072011
-Date   : 07-07-2011
-Changes: Inserted constants to HttpOnly HTTP Header.
-
-Branch : STORKCommons_0_6
-Date   : 07-11-2011
-Changes: Improved error exception handling (few changes on the exception classes).
-         Improved Constansts (unused removed, others added).
-         Unit Tests include (almost all the code is cover).
-         Fix some minor bugs found on unit tests.
-         New Copyright License added.
-         PEPUtils refactored.
-         Improved error code message (three kind of messages: to citizen, admin and saml token).
-
-Branch : STORKCommons_0_6_1
-Date   : 28-11-2011
-Changes: Removed unnecessary javadoc package file.
-         Updated pepsUtils.properties file (check attribute value had old error message)
-
-Branch : STORKCommons_0_9
-Date   : 02-12-2011
-Changes: Updated Version to 0.9
-
-Branch : STORKCommons_1_0
-Date   : 02-12-2011
-Changes: Updated Version to 1.0
-
-Branch : STORKCommons_1_1_0
-Date   : 01-11-2013
-Changes: Updated Version to 1.1.0
-		 Dependencies updated
-	     Business Logic Part I changes
-	     SAML Engine Changes merged (from SamlEngine/1.1.0/Commons branch to be easier to merge this branch with trunk)
-         Fixed some errors on Test Case	    
-         
-Branch : STORKCommons_1_1_1
-Date   : 02-12-2013
-Changes: Updated Version to 1.1.1
-		 Added mandate error code
-	     PMD quality code changes (some final identifier missing)
-	     Added new methods to personal attribute list to get Mandatory/Optional and/or Simple/Complex attributes
-	     Added new unit tests
-
-Branch : Commons (Trunk)
-Date   : 15-01-2014
-Version: 1.2.0
-Release: 2
-Changes: Updated Version to 1.2.0
-	     dded request flow of PV (incomplete)
-         Added AP mandatory attribute to get data for business attributes
-          *) based on configuration file it adds the missing attributes (eIdentifier, givenName, surname and dateOfBirth) or change isRequired to true.
-             changes original isRequired state in response
-         Added new Interface (IAttributeListProcessor) to make some operations on attribute lists
-         Power Validation is complete now
-		 Business Logic I and II integration (Request Complete!)
-         Added new method to Personal attribute List to check if there is at least one attribute with no value.
diff --git a/id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base b/id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base
deleted file mode 100644
index a71ee1628..000000000
--- a/id/server/legacy-backup/stork2-commons/.svn/text-base/pom.xml.svn-base
+++ /dev/null
@@ -1,213 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>eu.stork</groupId>
-	<artifactId>Commons</artifactId>
-	<packaging>jar</packaging>
-	<name>Stork Commons</name>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<stork.version>1.2.0</stork.version>
-		<opensaml.version>2.6.0</opensaml.version>
-	</properties>
-	<version>${stork.version}</version>
-  <description>
-        The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine.
-  </description>
-   
-	<dependencies>
-
-		<!-- Joda -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.3</version>
-		</dependency>
-
-		<!-- Log4J -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>mail</artifactId>
-					<groupId>javax.mail</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.opensaml</groupId>
-			<artifactId>opensaml</artifactId>
-			<version>${opensaml.version}</version>
-			<exclusions>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>slf4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-				 	<groupId>org.slf4j</groupId>
-				    <artifactId>slf4j-simple</artifactId>
-				</exclusion>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>jcl-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>jul-to-slf4j</artifactId>
-				</exclusion>
-			</exclusions>			
-		</dependency>
-
-		<!-- Bouncy Castle -->
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>1.46</version>
-		</dependency>
-
-		<!-- Servlet API -->
-		<!-- provided by Application Server -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<finalName>commons</finalName>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<configuration>
-            			<runOrder>reversealphabetical</runOrder>
-						<skip>false</skip>
-          				<includes>
-                            <runOrder>reversealphabetical</runOrder>
-				            <include>**/PEPSUtilTest.java</include>
-				            <include>**/PersonalAttributeTestCase.java</include>
-				            <include>**/PersonalAttributeListTestCase.java</include>
-            				<include>**/DateUtilTestCase.java</include>
-				            <include>**/AttributeUtilTest.java</include>
-          				</includes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
-				<configuration>
-					<links>
-						<link>http://commons.apache.org/lang/api/</link>
-						<link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
-						<link>http://www.bouncycastle.org/docs/docs1.6/</link>
-						<link>http://docs.oracle.com/javase/6/docs/api/</link>
-					</links>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-				<includes>
-					<include>log4j.xml</include>
-				</includes>
-			</testResource>
-		</testResources>
-	</build>
-	<profiles>
-		<profile>
-			<id>embedded</id>
-			<build>
-				<resources>
-					<resource>
-						<directory> ${project.basedir}/src/main/resources</directory>
-					</resource>
-					<resource>
-						<directory> ${project.basedir}/src/main/config/embedded</directory>
-					</resource>
-				</resources>
-			</build>
-		</profile>
-		<profile>
-			<id>metrics</id>
-			<build>
-			<plugins>
-				<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.5.1</version>
-					<configuration>
-						<formats>
-							<format>html</format>
-							<format>xml</format>
-							</formats>
-					</configuration>
-				</plugin>
-			</plugins>
-			</build>
-		</profile>
-		</profiles>
-</project>