diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-17 11:33:52 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-07-17 11:33:52 +0200 |
| commit | 2a5dc4175eeb29331b1af83b0e03fa965d447533 (patch) | |
| tree | 09231f884800b8513c44844aab605582e2aa100f /spss/server/serverws/WebContent/WEB-INF | |
| parent | 9e62eee118784c8f42c60254944f23427751223e (diff) | |
| parent | ebb9207bb7895ce59feb34d4d911ba9f0f0add9f (diff) | |
| download | moa-id-spss-2a5dc4175eeb29331b1af83b0e03fa965d447533.tar.gz moa-id-spss-2a5dc4175eeb29331b1af83b0e03fa965d447533.tar.bz2 moa-id-spss-2a5dc4175eeb29331b1af83b0e03fa965d447533.zip | |
Merge branch 'new_key-value_solution' into moa-id-3.0.0-snapshot
Conflicts:
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/modules/internal/tasks/GetMISSessionIDTask.java
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/auth/servlet/VerifyAuthenticationBlockServlet.java
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/auth/servlet/VerifyIdentityLinkServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java
id/server/moa-id-commons/pom.xml
id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
pom.xml
Diffstat (limited to 'spss/server/serverws/WebContent/WEB-INF')
0 files changed, 0 insertions, 0 deletions