From 9ada098b75629a8ee6148b2b9b5775ee829b0fca Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Thu, 15 Dec 2011 16:31:25 -0500
Subject: [PATCH] cleaned up project, added in some model components, added in
 shells for repositories

---
 .classpath                                        |  1 +
 .settings/org.eclipse.wst.common.component        |  1 +
 pom.xml                                           | 15 ---------------
 .../openid/connect/model/OAuth2AccessToken.java   |  8 --------
 .../mitre/openid/connect/model/OAuth2Client.java  |  8 --------
 .../org/mitre/openid/connect/model/UserInfo.java  |  2 ++
 .../org/mitre/openid/connect/repository/empty.txt |  0
 .../openid/connect/web/AuthorizationEndpoint.java | 11 +++++++++++
 .../mitre/openid/connect/web/TokenEndpoint.java   |  4 ++++
 .../WEB-INF/spring/appServlet/servlet-context.xml |  3 ---
 10 files changed, 19 insertions(+), 34 deletions(-)
 delete mode 100644 src/main/java/org/mitre/openid/connect/model/OAuth2AccessToken.java
 delete mode 100644 src/main/java/org/mitre/openid/connect/model/OAuth2Client.java
 delete mode 100644 src/main/java/org/mitre/openid/connect/repository/empty.txt

diff --git a/.classpath b/.classpath
index 4cea5050d..08dd16939 100644
--- a/.classpath
+++ b/.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>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 4f15f0bfa..b5bffc576 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.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>
diff --git a/pom.xml b/pom.xml
index 4ae8fa1da..1a0d6dc47 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/main/java/org/mitre/openid/connect/model/OAuth2AccessToken.java b/src/main/java/org/mitre/openid/connect/model/OAuth2AccessToken.java
deleted file mode 100644
index 4bf89f595..000000000
--- a/src/main/java/org/mitre/openid/connect/model/OAuth2AccessToken.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.mitre.openid.connect.model;
-
-import javax.persistence.Entity;
-
-@Entity
-public class OAuth2AccessToken {
-
-}
diff --git a/src/main/java/org/mitre/openid/connect/model/OAuth2Client.java b/src/main/java/org/mitre/openid/connect/model/OAuth2Client.java
deleted file mode 100644
index 53232df48..000000000
--- a/src/main/java/org/mitre/openid/connect/model/OAuth2Client.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.mitre.openid.connect.model;
-
-import javax.persistence.Entity;
-
-@Entity
-public class OAuth2Client {
-
-}
diff --git a/src/main/java/org/mitre/openid/connect/model/UserInfo.java b/src/main/java/org/mitre/openid/connect/model/UserInfo.java
index e230d4758..67c8a2687 100644
--- a/src/main/java/org/mitre/openid/connect/model/UserInfo.java
+++ b/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;
diff --git a/src/main/java/org/mitre/openid/connect/repository/empty.txt b/src/main/java/org/mitre/openid/connect/repository/empty.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java b/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java
index a663fb2c6..10ccb36b0 100644
--- a/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java
+++ b/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
+	 * 
+	 */
+	
 }
diff --git a/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java b/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java
index 6da95a73f..ac1cbc2c0 100644
--- a/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java
+++ b/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?
+	
 }
diff --git a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
index 78a3800b9..ca62af15a 100644
--- a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ b/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"/>