Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

1 files changed, 83 insertions, 0 deletions

diff --git a/id/server/legacy-backup/stork2-saml-engine/Releases b/id/server/legacy-backup/stork2-saml-engine/Releases
new file mode 100644
index 000000000..0031906e6
--- /dev/null
+++ b/id/server/legacy-backup/stork2-saml-engine/Releases
@@ -0,0 +1,83 @@
+Created 06-04-2011
+
+Branch : STORKPEPS_0_5_UPDATE_06042011
+Date   : 06-04-2011
+Changes: Updated SAML Engine version to 0.5.1.
+
+Branch : STORKPEPS_0_5_UPDATE_07072011
+Date   : 07-07-2011
+Changes: Inserted HttpOnly HTTP Header to present XSS Attacks.
+         Removed logs.
+
+Branch : STORKPEPS_0_6_1
+Date   : 07-11-2011
+Changes: Improved error exception handling (few changes on the exception Interceptors classes)
+         Improved Errors (three new categories classes: SysAdmin specific errors, CPEPS translation errors, Citizen errors)
+         Fix some minor bugs found.
+         New Copyright License added.
+
+Branch : STORKPEPS_0_6_1
+Date   : 28-11-2011
+Changes: Complex value are displayed to citizen on the Citizen Consent Value form!
+         Fix minor bug found on check attribute value error code and message (saml token message, log messages, citizen messages).
+        
+Branch : STORKPEPS_1_0
+Date   : 02-12-2011
+Changes: Version Update to 1.0 
+
+Branch : STORKPEPS_1_1_0
+Date   : 01-11-2013
+Changes: Version Update to 1.1.0 
+		 Dependencies updated
+         Business Logic Part I changes
+         SAML Engine Changes merged (from SamlEngine/1.1.0/PEPS branch to be easier to merge this branch with trunk)
+         Fixed some errors on Test Case
+         Added SAML Engine Attributes to configuration files
+		 Jersey dependency fix
+		 
+Branch : PEPS (Trunk)
+Date   : 02-12-2013
+Version: 1.1.1
+Changes: Version Update to 1.1.1 
+		 Added AUB IdP URL to peps.xml 
+         Business Logic Part I changes:
+         	1 ) APResponseAction changed:
+         		*) created private variables with filtered attribute lists (optional/mandatory and 
+         	simple/complex attributes) to send to consent value page
+         	2) CitizenConsentAction changed:
+         		*) Removed callbackURL (this is in the AuthenticationOnBehalfOfAction and CitizenAuthenticationAction classes)
+         	3) 	ColleagueRequestAction changed:
+         		created private variables with filtered attribute lists (optional/mandatory) to send to consent type page
+         		
+         	4) AUSPEPSSAML - Fixed bug when missing SP URL on configurations... wrong validateParameter method used.
+         	5) citizenConsent.jsp - some changes on page:
+         		*) complex attributes and simple attributes were split
+         		*) optional and mandatory attributes shown using bootstrap
+         		*) fixed some issues on some labels
+         	6) presentConsent.jsp - some changes on page:
+         	   	*) optional and mandatory attributes shown using bootstrap
+         	   	*) fixed some issues on some labels 
+         	   	
+         	7) applicationContext.xml - few changes:
+         		*) removed callbackURL from CitizenConsentAction 
+         		*) callbackURL added to AuthenticationOnBehalfOfAction and CitizenAuthenticationAction
+         		*) changed from file to classpath the origin of configuration files (peps.xml, pepsUtil.properties and specific.properties)
+
+		Integrated Anonimity funcionality
+         			
+Branch : PEPS (Trunk)
+Date   : 15-01-2014
+Version: 1.2.0
+Release: 2
+Changes: Updated Version to 1.2.0
+         Added 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
+         Fixed some bugs in Test Case
+		 Changed some packages names on S-PEPS
+         Power Validation is complete now
+		 Business Logic I and II integration (Request Complete!)
+         BL I doesn't redirect to BL II if all attributes already have value
+		 Bug fix on normalization
+         
\ No newline at end of file