Browse Source

cleaned up project, added in some model components, added in shells for repositories

pull/59/head
Justin Richer 13 years ago
parent
commit
9ada098b75
  1. 1
      .classpath
  2. 1
      .settings/org.eclipse.wst.common.component
  3. 15
      pom.xml
  4. 8
      src/main/java/org/mitre/openid/connect/model/OAuth2AccessToken.java
  5. 8
      src/main/java/org/mitre/openid/connect/model/OAuth2Client.java
  6. 2
      src/main/java/org/mitre/openid/connect/model/UserInfo.java
  7. 0
      src/main/java/org/mitre/openid/connect/repository/empty.txt
  8. 11
      src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java
  9. 4
      src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java
  10. 3
      src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

1
.classpath

@ -9,6 +9,7 @@
<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/test/java"/>
<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth2/src/test/resources"/>
<classpathentry kind="src" path="spring-security-oauth/spring-security-oauth/src/main/java"/>
<classpathentry kind="src" path="mitre-local/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
<attributes>

1
.settings/org.eclipse.wst.common.component

@ -9,6 +9,7 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/test/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth2/src/test/resources"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/spring-security-oauth/spring-security-oauth/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/mitre-local/src/main/java"/>
<property name="java-output-path" value="target/classes"/>
<property name="context-root" value="openid"/>
</wb-module>

15
pom.xml

@ -226,21 +226,6 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.16</version>
</dependency>
<dependency>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<version>1.3.8</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>

8
src/main/java/org/mitre/openid/connect/model/OAuth2AccessToken.java

@ -1,8 +0,0 @@
package org.mitre.openid.connect.model;
import javax.persistence.Entity;
@Entity
public class OAuth2AccessToken {
}

8
src/main/java/org/mitre/openid/connect/model/OAuth2Client.java

@ -1,8 +0,0 @@
package org.mitre.openid.connect.model;
import javax.persistence.Entity;
@Entity
public class OAuth2Client {
}

2
src/main/java/org/mitre/openid/connect/model/UserInfo.java

@ -5,6 +5,8 @@ import javax.persistence.Entity;
@Entity
public class UserInfo {
// TODO: underbars are awkward in java, should we switch all this to camel case and put in underbars in the serialization view?
private String user_id;
private String name;
private String given_name;

0
src/main/java/org/mitre/openid/connect/repository/empty.txt

11
src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java

@ -7,4 +7,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
@RequestMapping("/authorize")
public class AuthorizationEndpoint {
/*
* handle "code" flow
*
*/
/*
* handle "idtoken token" flow
*
*/
}

4
src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java

@ -9,4 +9,8 @@ public class TokenEndpoint {
//Corresponds to spring security Authentication Filter class
// handle sending back a token and an id token for a code
// fall through to SSOA code if no id token?
}

3
src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

@ -29,9 +29,6 @@
<beans:property name="order" value="1"/>
</beans:bean>
<!-- json view, capable of converting any POJO to json format -->
<beans:bean id="jsonView" class="org.springframework.web.servlet.view.json.MappingJacksonJsonView"/>
<!-- JSON views for each type of model object -->
<beans:bean id="jsonUserInfoView" class="org.mitre.openid.connect.model.serializer.JSONUserInfoView"/>
<beans:bean id="jsonIdTokenView" class="org.mitre.openid.connect.model.serializer.JSONIdTokenView"/>

Loading…
Cancel
Save