diff --git a/.classpath b/.classpath index 9b2c5f43a..4cea5050d 100644 --- a/.classpath +++ b/.classpath @@ -1,15 +1,24 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 7c5d2d0e8..5ce74ab6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ - -/local-values.conf \ No newline at end of file +/local-values.conf +/target diff --git a/.project b/.project index 57efee624..9e70fd3c0 100644 --- a/.project +++ b/.project @@ -1,51 +1,56 @@ - - - OpenIDConnect - - - Servers - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.ajdt.core.ajbuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.ajdt.ui.ajnature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.jsdt.core.jsNature - org.springframework.ide.eclipse.core.springnature - com.springsource.sts.roo.core.nature - org.eclipse.m2e.core.maven2Nature - - + + + OpenIDConnect + + + Servers + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.springframework.ide.eclipse.core.springbuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.maven.ide.eclipse.maven2Nature + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.jsdt.core.jsNature + org.springframework.ide.eclipse.core.springnature + com.springsource.sts.roo.core.nature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 9ec44e3e6..a96f78e59 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,13 @@ -#Tue Mar 17 10:00:21 EDT 2009 +#Mon Dec 12 16:22:28 EST 2011 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.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.jst.common.project.facet.core.prefs b/.settings/org.eclipse.jst.common.project.facet.core.prefs deleted file mode 100644 index 763a1503d..000000000 --- a/.settings/org.eclipse.jst.common.project.facet.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Mar 17 09:59:19 EDT 2009 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.5.0\ (MacOS\ X\ Default)/owners=jst.java\:5.0 -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2f06ea1ff..4f15f0bfa 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,15 @@ - + + + + + + - + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index d24a733bd..43b1e0cbd 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ - + diff --git a/pom.xml b/pom.xml index ca452fe61..4ae8fa1da 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,9 @@ 0.1 1.6 - 3.0.5.RELEASE + 3.0.6.RELEASE 1.5.10 + 3.1.0.RELEASE @@ -153,58 +154,48 @@ org.springframework.security spring-security-core - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-acl - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-aspects - ${org.springframework-version} - - - org.springframework.security - spring-security-cas-client - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-config - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-ldap - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-openid - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-taglibs - ${org.springframework-version} + ${spring.security.version} org.springframework.security spring-security-web - ${org.springframework-version} + ${spring.security.version} com.google.code.gson gson 1.7.1 - - org.springframework.security.oauth - spring-security-oauth - 1.0.0.M3 - org.eclipse.persistence javax.persistence @@ -250,29 +241,34 @@ jackson-mapper-asl 1.6.4 + + commons-codec + commons-codec + 1.3 + - - org.springframework.maven.snapshot - Spring Maven Snapshot Repository - http://maven.springframework.org/snapshot - - false - - - true - - - - - org.springframework.maven.milestone - Spring Maven Milestone Repository - http://maven.springframework.org/milestone - - false - - + + + + + + + + + + + + + + + + + + + + com.google.code.gson GSON repository @@ -372,24 +368,6 @@ - - com.google.code.maven-replacer-plugin - maven-replacer-plugin - 1.3.8 - - - prepare-package - - replace - - - - - - target/${project.artifactId}-${project.version}/WEB-INF/spring/data-context.xml,target/${project.artifactId}-${project.version}/WEB-INF/spring/security-context.xml - local-values.conf - - diff --git a/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java index 43d76f0d1..6154757ba 100644 --- a/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java +++ b/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java @@ -1,5 +1,6 @@ package org.mitre.openid.connect.web; +import org.mitre.openid.connect.model.UserInfo; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/webapp/WEB-INF/spring/application-context.xml b/src/main/webapp/WEB-INF/spring/application-context.xml index 2c1fffd46..dbe8cd518 100644 --- a/src/main/webapp/WEB-INF/spring/application-context.xml +++ b/src/main/webapp/WEB-INF/spring/application-context.xml @@ -6,7 +6,7 @@ xmlns:security="http://www.springframework.org/schema/security" xmlns:task="http://www.springframework.org/schema/task" xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.4.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> diff --git a/src/main/webapp/WEB-INF/spring/security-context.xml b/src/main/webapp/WEB-INF/spring/security-context.xml index 3beed913f..a3b661d46 100644 --- a/src/main/webapp/WEB-INF/spring/security-context.xml +++ b/src/main/webapp/WEB-INF/spring/security-context.xml @@ -5,7 +5,7 @@ xmlns="http://www.springframework.org/schema/beans" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.4.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">