diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 08:06:55 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 08:06:55 +0100 |
commit | 04ba04826a5f88e0459b7a47a55118933d929cc6 (patch) | |
tree | 7f5083300ac4026bbf06b51ac8c3ba01423bbd29 /id/server/stork2-saml-engine/src/main/config/jBoss | |
parent | 080e499cc22a0065ea7f47e04b6c0f336533e21e (diff) | |
parent | 3c1884ee275350e7b2a78256342d9610b1766898 (diff) | |
download | moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.tar.gz moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.tar.bz2 moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.zip |
Merge remote-tracking branch 'remotes/origin/outgoingstork' into moa2_0_tlenz
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
Diffstat (limited to 'id/server/stork2-saml-engine/src/main/config/jBoss')
-rw-r--r-- | id/server/stork2-saml-engine/src/main/config/jBoss/context.xml | 1 | ||||
-rw-r--r-- | id/server/stork2-saml-engine/src/main/config/jBoss/jboss-classloading.xml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/id/server/stork2-saml-engine/src/main/config/jBoss/context.xml b/id/server/stork2-saml-engine/src/main/config/jBoss/context.xml new file mode 100644 index 000000000..9520f2161 --- /dev/null +++ b/id/server/stork2-saml-engine/src/main/config/jBoss/context.xml @@ -0,0 +1 @@ +<Context cookies="true" />
\ No newline at end of file diff --git a/id/server/stork2-saml-engine/src/main/config/jBoss/jboss-classloading.xml b/id/server/stork2-saml-engine/src/main/config/jBoss/jboss-classloading.xml new file mode 100644 index 000000000..20c6509de --- /dev/null +++ b/id/server/stork2-saml-engine/src/main/config/jBoss/jboss-classloading.xml @@ -0,0 +1,4 @@ +<classloading xmlns="urn:jboss:classloading:1.0" name="PEPS.war" + domain="PEPS_Domain" export-all="NON_EMPTY" import-all="true" + parent-first="true"> +</classloading> |