aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-01-27 17:42:51 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-01-27 17:42:51 +0100
commitaba2defe8f95cf960395158f6eb2ad7b1fb6e150 (patch)
tree298a0165a30b8538b89abb93a399c615f91702d3 /id/server/auth
parented9ad9b0c13ee0de3231bab038f35b01beeb0d0b (diff)
parentcea2f395ec773b386ec628d60120752cf320f6b6 (diff)
downloadmoa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.tar.gz
moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.tar.bz2
moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.zip
merging
Diffstat (limited to 'id/server/auth')
-rw-r--r--id/server/auth/.settings/org.eclipse.wst.common.component4
-rw-r--r--id/server/auth/moa-id-auth.iml12
-rw-r--r--id/server/auth/pom.xml2
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml12
4 files changed, 17 insertions, 13 deletions
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 10109d2c2..40733a1ce 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -6,13 +6,13 @@
<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.97-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+ <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.97-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
+ <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-auth"/>
diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml
index f581b8feb..36c07341c 100644
--- a/id/server/auth/moa-id-auth.iml
+++ b/id/server/auth/moa-id-auth.iml
@@ -14,8 +14,8 @@
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
@@ -24,10 +24,6 @@
<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: eu.stork:saml-engine:1.1.0" level="project" />
- <orderEntry type="library" name="Maven: eu.stork:stork-commons:1.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
<orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
<orderEntry type="library" name="Maven: org.tuckey:urlrewritefilter:4.0.3" level="project" />
<orderEntry type="module" module-name="moa-spss-lib" />
@@ -65,7 +61,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="module" module-name="moa-id-lib" />
+ <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" />
@@ -92,7 +88,7 @@
<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="module" module-name="moa-id-commons" />
+ <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" />
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 350087e40..3423deb79 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>1.9.97-SNAPSHOT</version>
+ <version>1.9.96-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
index cc9cc8236..f8fdcaffc 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -62,9 +62,17 @@
</rule>
+ <rule match-type="regex">
+ <from>^/oauth2/auth\\?(.*)$</from>
+ <to type="forward">/dispatcher?mod=id_oauth20&amp;action=AUTH&amp;%{query-string}</to>
+ </rule>
+ <rule match-type="regex">
+ <from>^/oauth2/token\\?(.*)$</from>
+ <to type="forward">/dispatcher?mod=id_oauth20&amp;action=TOKEN&amp;%{query-string}</to>
+ </rule>
+
-
- <outbound-rule>
+ <outbound-rule>
<note>
The outbound-rule specifies that when response.encodeURL is called (if
you are using JSTL c:url)