diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 07:17:34 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 07:17:34 +0100 |
| commit | 080e499cc22a0065ea7f47e04b6c0f336533e21e (patch) | |
| tree | de74aec5924a052d34bf59f42764c85be80af7ee /id/server | |
| parent | befaa7a7ac9d24210623598b04ad90d3837e57ee (diff) | |
| download | moa-id-spss-080e499cc22a0065ea7f47e04b6c0f336533e21e.tar.gz moa-id-spss-080e499cc22a0065ea7f47e04b6c0f336533e21e.tar.bz2 moa-id-spss-080e499cc22a0065ea7f47e04b6c0f336533e21e.zip | |
*update Assembly script
*move demoOA to moa.id.demoOA
*change name of moa-id configuration-tool
Diffstat (limited to 'id/server')
| -rw-r--r-- | id/server/auth/pom.xml | 1 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 76 | ||||
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java | 2 |
3 files changed, 45 insertions, 34 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 93009173d..987ae1951 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -79,6 +79,7 @@ <groupId>MOA.id.server</groupId> <artifactId>moa-id-lib</artifactId> </dependency> + <!-- transitive dependencies we don't want to include into the war --> <dependency> <groupId>iaik.prod</groupId> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 9b2711249..b137fa7ca 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -60,15 +60,12 @@ <artifactId>webservices-tools</artifactId>
<version>2.0.1</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>com.sun</groupId>
<artifactId>webservices-rt</artifactId>
<version>2.0.1</version>
</dependency>
- <!--<dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId>
- </dependency> -->
-
-
+
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
@@ -78,22 +75,45 @@ <artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>xalan-bin-dist</groupId>
- <artifactId>serializer</artifactId>
- </dependency>
+
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>xalan</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>xml-apis</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>serializer</artifactId>
+ <!-- should be provided by the container or jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_jce_full</artifactId>
+ <!-- should be in the ext directory of the jre -->
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_ecc</artifactId>
+ <!-- should be in the ext directory of the jre -->
+ <scope>provided</scope>
+ </dependency>
+
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -129,15 +149,6 @@ </dependency>
<dependency>
<groupId>iaik.prod</groupId>
- <artifactId>iaik_ecc</artifactId>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
- <artifactId>iaik_jce_full</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>iaik.prod</groupId>
<artifactId>iaik_ixsil</artifactId>
</dependency>
<dependency>
@@ -161,10 +172,7 @@ <groupId>regexp</groupId>
<artifactId>regexp</artifactId>
</dependency>
- <!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId>
- </dependency> -->
- <!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId>
- <version>1.1</version> </dependency> -->
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 93f17dd70..9a13129d8 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.xml.bind.JAXBContext;
import org.opensaml.saml2.core.Assertion;
import org.opensaml.saml2.core.StatusCode;
@@ -52,6 +53,7 @@ import at.gv.egovernment.moa.id.util.HTTPUtils; import at.gv.egovernment.moa.logging.Logger;
import at.gv.egovernment.moa.util.DOMUtils;
import at.gv.egovernment.moa.util.StringUtils;
+import at.gv.util.xsd.xmldsig.SignatureType;
import eu.stork.mw.messages.saml.STORKAuthnRequest;
import eu.stork.mw.messages.saml.STORKResponse;
import eu.stork.vidp.messages.util.XMLUtil;
|