merge

7 files changed, 12 insertions, 124 deletions

diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index dc0892a32..000000000
--- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index e1f55f641..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

-  <wb-module deploy-name="moa-id-proxy">

-        <dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module archiveName="moa-common-2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module archiveName="moa-id-lib-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-        <dependent-module archiveName="moa-id-commons-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">

-            <dependency-type>uses</dependency-type>

-        </dependent-module>

-    <property name="context-root" value="moa-id-proxy"/>

-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>

-    <property name="java-output-path" value="/target/classes"/>

-  </wb-module>

-</project-modules>

diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 564572b10..000000000
--- a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<faceted-project>

-  <fixed facet="jst.java"/>

-  <fixed facet="jst.web"/>

-  <installed facet="jst.web" version="2.4"/>

-  <installed facet="jst.java" version="5.0"/>

-</faceted-project>
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 7f28ca3cd..000000000
--- a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-activeProfiles=

-eclipse.preferences.version=1

-fullBuildGoals=process-test-resources

-includeModules=false

-resolveWorkspaceProjects=true

-resourceFilterGoals=process-resources resources\:testResources

-skipCompilerPlugin=true

-version=1

diff --git a/id/server/proxy/moa-id-proxy.iml b/id/server/proxy/moa-id-proxy.iml
index dd5809d75..4cc27a4d6 100644
--- a/id/server/proxy/moa-id-proxy.iml
+++ b/id/server/proxy/moa-id-proxy.iml
@@ -20,10 +20,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.opensaml:openws:1.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
     <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
-    <orderEntry type="module" module-name="moa-spss-lib" />
+    <orderEntry type="library" name="Maven: MOA.spss.server:moa-spss-lib:1.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
     <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
@@ -47,7 +46,7 @@
     <orderEntry type="library" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
-    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: MOA:moa-common:2.0" level="project" />
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
     <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
@@ -58,80 +57,7 @@
     <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
     <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
-    <orderEntry type="library" name="Maven: MOA.id.server:moa-id-lib:1.9.97-SNAPSHOT" level="project" />
-    <orderEntry type="module" module-name="stork-saml-engine" />
-    <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.opensaml:openws:1.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.opensaml:xmltooling:1.3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.46" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.2" level="project" />
-    <orderEntry type="library" name="Maven: ca.juliusdavies:not-yet-commons-ssl:0.3.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:1.4.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: xalan:xalan:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: velocity:velocity:1.5" level="project" />
-    <orderEntry type="library" name="Maven: org.owasp.esapi:esapi:2.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
-    <orderEntry type="module" module-name="mw-messages-api" />
-    <orderEntry type="library" name="Maven: eu.stork:Commons:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk16:1.46" level="project" />
-    <orderEntry type="library" name="Maven: eu.stork:SamlEngine:1.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
-    <orderEntry type="library" name="Maven: MOA.id.server:moa-id-commons:1.9.97-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.15.0-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-c3p0:4.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: c3p0:c3p0:0.9.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.2.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet.hyperjaxb3:hyperjaxb3-ejb-runtime:0.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet.jaxb2_commons:jaxb2-basics-runtime:0.6.2" level="project" />
-    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.25" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: dav4j:dav4j:0.1" level="project" />
-    <orderEntry type="library" name="Maven: httpsclient:httpsclient:JSSE-1.0" level="project" />
-    <orderEntry type="library" name="Maven: iaik.prod:iaik_X509TrustManager:0.3" level="project" />
-    <orderEntry type="library" name="Maven: edu.internet2.middleware:shibboleth-common:1.4.0" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.jgrapht:jgrapht:0.8.3" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:1.7.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.vt.middleware:vt-ldap:3.3.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:2.5.6.SEC03" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.6.SEC03" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.6.SEC03" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.6.SEC03" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:2.5.6.SEC03" level="project" />
-    <orderEntry type="library" name="Maven: org.tmatesoft.svnkit:svnkit:1.3.8" level="project" />
-    <orderEntry type="library" name="Maven: de.regnis.q.sequence:sequence-library:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.trilead:trilead-ssh2:1.0.0-build215" level="project" />
-    <orderEntry type="library" name="Maven: org.tmatesoft.sqljet:sqljet:1.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
-    <orderEntry type="library" name="Maven: jargs:jargs:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:janino:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.janino:commons-compiler:2.6.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.ant:ant-nodeps:1.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.ant:ant:1.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.ant:ant-launcher:1.7.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: ant-contrib:ant-contrib:1.0b2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xerces:xml-apis:2.10.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xerces:xercesImpl:2.10.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.xerces:serializer:2.10.0" level="project" />
-    <orderEntry type="library" name="Maven: regexp:regexp:1.3" level="project" />
+    <orderEntry type="library" name="Maven: MOA.id.server:moa-id-lib:1.9.96-SNAPSHOT" level="project" />
   </component>
 </module>
 
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index c7cb9a7c8..e5c78ff60 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,13 +2,21 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>1.9.96-SNAPSHOT</version>

+		<version>1.9.98-SNAPSHOT</version>

 	</parent>

 	

 	<properties>

 		<repositoryPath>${basedir}/../../../repository</repositoryPath>

 	</properties>

 	

+	<repositories>

+		<repository>

+			<id>shibboleth.internet2.edu</id>

+			<name>Internet2</name>

+			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>

+		</repository>

+	</repositories>

+	

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.id.server</groupId>

 	<artifactId>moa-id-proxy</artifactId>

diff --git a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
index 5e9495128..58630c02e 100644
--- a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
+++ b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,3 +1,2 @@
 Manifest-Version: 1.0

-Class-Path: