aboutsummaryrefslogtreecommitdiff
path: root/id/oa/src/main/java
AgeCommit message (Collapse)AuthorFilesLines
2014-02-03Solve some merge problemsThomas Lenz1-0/+2
2014-02-03Merge remote-tracking branch 'remotes/origin/outgoingstork' into moa2_0_tlenzThomas Lenz2-22/+19
Conflicts: id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/StorkAttributes.java id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.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/auth/stork/STORKAuthnRequestProcessor.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
2014-01-29add EUPL headersThomas Lenz11-22/+272
2014-01-29fixed issues after mergeFlorian Reimair2-22/+19
2014-01-27add PVP2 Demo ApplicationThomas Lenz11-0/+1558
change SZRGWClient to JAXWs