| Age | Commit message (Collapse) | Author | Files | Lines | 
|---|
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | 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 | 
|  | -> joda-time 2.7
 -> slf4j 2.7.10
 -> struts2 2.3.20
 -> commons-codec 1.10
 -> hibernate 4.3.8.Final
 -> mySQL-connector 5.1.34
 -> opensaml 2.6.4
 -> xmltooling 2.6.4 | 
|  | - Disable erroneous IAIK PKI logger initialization (should be addressed by.
- Remove redundant maven-dependency version declarations.
- Fix maven/eclipse lifecyle warning problem. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | > org.apache.struts:struts2-core 2.3.16.3
  > org.apache.struts:struts2-json-plugin 2.3.16.3
  > joda-time:joda-time 2.4
  > org.slf4j:jcl-over-slf4j 1.7.7
  > org.slf4j:jul-to-slf4j 1.7.7
  > org.slf4j:slf4j-api 1.7.7
  > org.slf4j:slf4j-log4j12 1.7.7
  > mysql:mysql-connector-java 5.1.32
  > org.hibernate:hibernate-core 4.3.6.Final
  > org.hibernate:hibernate-entitymanager 4.3.6.Final
  > org.hibernate:hibernate-c3p0 4.3.6.Final
  > com.google.http-client:google-http-client-jackson2 1.19.0
  > com.google.oauth-client:google-oauth-client-jetty 1.19.0
  > org.apache.commons:commons-lang3 3.3.2
  > commons-codec:commons-codec 1.9
  > commons-logging:commons-logging 1.2
  > xerces:xercesImpl 2.11.0
  > postgresql:postgresql 9.3-1102-jdbc41
  > junit:junit 3.8.2 | 
|  | (this functionality is required for federation with USP) | 
|  | * change Version to 2.0.2 | 
|  |  | 
|  |  | 
|  | This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.
Conflicts:
	id/ConfigWebTool/pom.xml | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | - solve problems with possible XML External Entity (XXE) attacks
  - DocType Declarations are not allowed in axis-1.0_IAIK_1.1.jar | 
|  |  | 
|  |  | 
|  |  | 
|  | 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 | 
|  |  | 
|  |  | 
|  | Handbook usage updated (TSL example added)
Update TSL handling | 
|  |  | 
|  | maven-assembly-plugin version set to 2.2-beta-1 (for MOA-SPSS)
Update TSL parts | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | -- update SZRGWClient
-- insert MOA-ID-lib version in PVP2 metadata | 
|  | moa2_0_tlenz
Conflicts:
	common/pom.xml
	id/server/auth/.settings/org.eclipse.wst.common.component
	id/server/auth/src/main/webapp/index.html
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
	pom.xml
	spss/handbook/clients/api/pom.xml
	spss/handbook/clients/pom.xml
	spss/handbook/clients/referencedData/pom.xml
	spss/handbook/clients/webservice/pom.xml
	spss/handbook/pom.xml
	spss/pom.xml
	spss/server/pom.xml
	spss/server/serverlib/pom.xml
	spss/server/serverws/.settings/org.eclipse.wst.common.component
	spss/server/serverws/pom.xml
	spss/server/tools/pom.xml | 
|  |  | 
|  |  | 
|  |  | 
|  |  |