From 988fcb4c9361d631e1bf336f890eceffa2ff1d14 Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Wed, 4 Jan 2012 12:19:23 -0500
Subject: [PATCH] moved to multi-layer maven project

---
 .gitignore                                    |   2 +
 pom.xml                                       | 352 +---------------
 server/.gitignore                             |   3 +
 server/pom.xml                                | 378 ++++++++++++++++++
 .../java/org/mitre/jwt/model/ClaimSet.java    |   0
 .../main/java/org/mitre/jwt/model/Jwt.java    |   0
 .../java/org/mitre/jwt/model/JwtClaims.java   |   0
 .../java/org/mitre/jwt/model/JwtHeader.java   |   0
 .../mitre/jwt/signer/AbstractJwtSigner.java   |   0
 .../java/org/mitre/jwt/signer/JwtSigner.java  |   0
 .../mitre/jwt/signer/impl/Es256Signer.java    |   0
 .../mitre/jwt/signer/impl/Hmac256Signer.java  |   0
 .../jwt/signer/impl/PlaintextSigner.java      |   0
 .../mitre/jwt/signer/impl/Rs256Signer.java    |   0
 .../mitre/openid/connect/exception/empty.txt  |   0
 .../mitre/openid/connect/model/Address.java   |   0
 .../openid/connect/model/ApprovedSite.java    |   0
 .../org/mitre/openid/connect/model/Event.java |   0
 .../mitre/openid/connect/model/IdToken.java   |   0
 .../mitre/openid/connect/model/UserInfo.java  |   0
 .../openid/connect/model/WhitelistedSite.java |   0
 .../model/serializer/JSONIdTokenView.java     |   0
 .../model/serializer/JSONUserInfoView.java    |   0
 .../repository/ApprovedSiteRepository.java    |   0
 .../connect/repository/IdTokenRepository.java |   0
 .../repository/UserInfoRepository.java        |   0
 .../repository/WhitelistedSiteRepository.java |   0
 .../openid/connect/repository/impl/empty.txt  |   0
 .../mitre/openid/connect/service/empty.txt    |   0
 .../openid/connect/service/impl/empty.txt     |   0
 .../connect/web/AuthorizationEndpoint.java    |   0
 .../openid/connect/web/CheckIDEndpoint.java   |   0
 .../openid/connect/web/TokenEndpoint.java     |   0
 .../openid/connect/web/UserInfoEndpoint.java  |   0
 .../main/resources/META-INF/persistence.xml   |   0
 {src => server/src}/main/resources/log4j.xml  |   0
 .../WEB-INF/spring/appServlet/controllers.xml |   0
 .../spring/appServlet/servlet-context.xml     |   0
 .../WEB-INF/spring/application-context.xml    |   0
 .../webapp/WEB-INF/spring/data-context.xml    |   0
 .../WEB-INF/spring/security-context.xml       |   0
 .../src}/main/webapp/WEB-INF/views/home.jsp   |   0
 .../src}/main/webapp/WEB-INF/web.xml          |   0
 .../src}/test/java/org/mitre/jwt/JwtTest.java |   0
 .../java/org/mitre/openid/connect/empty.txt   |   0
 {src => server/src}/test/resources/log4j.xml  |   0
 46 files changed, 385 insertions(+), 350 deletions(-)
 create mode 100644 server/.gitignore
 create mode 100644 server/pom.xml
 rename {src => server/src}/main/java/org/mitre/jwt/model/ClaimSet.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/model/Jwt.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/model/JwtClaims.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/model/JwtHeader.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/signer/JwtSigner.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/Es256Signer.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java (100%)
 rename {src => server/src}/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/exception/empty.txt (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/Address.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/ApprovedSite.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/Event.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/IdToken.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/UserInfo.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/WhitelistedSite.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/repository/impl/empty.txt (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/service/empty.txt (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/service/impl/empty.txt (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/web/TokenEndpoint.java (100%)
 rename {src => server/src}/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java (100%)
 rename {src => server/src}/main/resources/META-INF/persistence.xml (100%)
 rename {src => server/src}/main/resources/log4j.xml (100%)
 rename {src => server/src}/main/webapp/WEB-INF/spring/appServlet/controllers.xml (100%)
 rename {src => server/src}/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml (100%)
 rename {src => server/src}/main/webapp/WEB-INF/spring/application-context.xml (100%)
 rename {src => server/src}/main/webapp/WEB-INF/spring/data-context.xml (100%)
 rename {src => server/src}/main/webapp/WEB-INF/spring/security-context.xml (100%)
 rename {src => server/src}/main/webapp/WEB-INF/views/home.jsp (100%)
 rename {src => server/src}/main/webapp/WEB-INF/web.xml (100%)
 rename {src => server/src}/test/java/org/mitre/jwt/JwtTest.java (100%)
 rename {src => server/src}/test/java/org/mitre/openid/connect/empty.txt (100%)
 rename {src => server/src}/test/resources/log4j.xml (100%)

diff --git a/.gitignore b/.gitignore
index 5ce74ab6f..6fef6c8a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /local-values.conf
 /target
+*~
+
diff --git a/pom.xml b/pom.xml
index 9b0d9b3ee..da6be30cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,12 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mitre</groupId>
-    <artifactId>openid</artifactId>
+    <artifactId>openid-parent</artifactId>
     <name>OpenIdConnect</name>
     <packaging>pom</packaging>
     <version>0.1</version>
     <modules>
     	<module>spring-security-oauth/spring-security-oauth2</module>
+	<module>server</module>
     </modules>
     <properties>
         <java-version>1.6</java-version>
@@ -16,356 +17,7 @@
         <org.slf4j-version>1.5.10</org.slf4j-version>
         <spring.security.version>3.1.0.RELEASE</spring.security.version>
     </properties>
-    <dependencies>
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-orm</artifactId>
-            <version>${org.springframework-version}</version>
-            <exclusions>
-                <!-- Exclude Commons Logging in favor of SLF4j -->
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${org.springframework-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${org.springframework-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${org.springframework-version}</version>
-        </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${org.slf4j-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${org.slf4j-version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>${org.slf4j-version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.mail</groupId>
-                    <artifactId>mail</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.jms</groupId>
-                    <artifactId>jms</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jdmk</groupId>
-                    <artifactId>jmxtools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jmx</groupId>
-                    <artifactId>jmxri</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- @Inject -->
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-        </dependency>
-
-        <!-- Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-        <!-- Test -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${org.springframework-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.3.154</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>2.2</version>
-        </dependency>
-
-        <!-- Build -->
-        <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.4</version>
-            <scope>build</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-acl</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-aspects</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-ldap</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-openid</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring.security.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>javax.persistence</artifactId>
-            <version>2.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>10.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-        	<groupId>mysql</groupId>
-        	<artifactId>mysql-connector-java</artifactId>
-        	<version>5.1.16</version>
-        </dependency>
-        <dependency>
-        	<groupId>commons-codec</groupId>
-        	<artifactId>commons-codec</artifactId>
-        	<version>1.6</version>
-        </dependency>
-        <dependency>
-        	<groupId>org.bouncycastle</groupId>
-        	<artifactId>bcprov-jdk16</artifactId>
-        	<version>1.46</version>
-        </dependency>
-        <dependency>
-        	<groupId>org.codehaus.jackson</groupId>
-        	<artifactId>jackson-mapper-asl</artifactId>
-        	<version>1.9.2</version>
-        </dependency>
-    </dependencies>
-    <repositories>
-        <!-- For testing against latest Spring snapshots -->
-<!--         <repository> -->
-<!--             <id>org.springframework.maven.snapshot</id> -->
-<!--             <name>Spring Maven Snapshot Repository</name> -->
-<!--             <url>http://maven.springframework.org/snapshot</url> -->
-<!--             <releases> -->
-<!--                 <enabled>false</enabled> -->
-<!--             </releases> -->
-<!--             <snapshots> -->
-<!--                 <enabled>true</enabled> -->
-<!--             </snapshots> -->
-<!--         </repository> -->
-<!--         For developing against latest Spring milestones -->
-<!--         <repository> -->
-<!--             <id>org.springframework.maven.milestone</id> -->
-<!--             <name>Spring Maven Milestone Repository</name> -->
-<!--             <url>http://maven.springframework.org/milestone</url> -->
-<!--             <snapshots> -->
-<!--                 <enabled>false</enabled> -->
-<!--             </snapshots> -->
-<!--         </repository> -->
-        <repository>
-            <id>com.google.code.gson</id>
-            <name>GSON repository</name>
-            <url>http://google-gson.googlecode.com/svn/mavenrepo/</url>
-        </repository>
-        <repository>
-            <id>org.eclipse.persistence</id>
-            <name>EclipseLink repository</name>
-            <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
     <description>Reference implementation of OpenID Connect spec (http://openid.net/connect/).
     </description>
     <url></url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java-version}</source>
-                    <target>${java-version}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <executions>
-					<execution>
-						<id>prepare-war</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>exploded</goal>
-						</goals>
-					</execution>
-				</executions>
-                <configuration>
-                    <warName>openid-connect-server</warName>
-                    <useCache>true</useCache>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>install</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>sources</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <junitArtifactName>junit:junit</junitArtifactName>
-                    <excludes>
-                        <exclude>**/*_Roo_*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tomcat-maven-plugin</artifactId>
-                <version>1.0-beta-1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <formats>
-                        <format>xml</format>
-                    </formats>
-                    <instrumentation>
-                        <ignores>
-                            <ignore>org.apache.log4j.*</ignore>
-                        </ignores>
-                        <excludes>
-                            <!-- <exclude>org/mitre/openid/**/model/**/*.class</exclude> -->
-                        </excludes>
-                    </instrumentation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>cobertura</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>cobertura</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/server/.gitignore b/server/.gitignore
new file mode 100644
index 000000000..caf95e257
--- /dev/null
+++ b/server/.gitignore
@@ -0,0 +1,3 @@
+/local-values.conf
+/target
+*~
diff --git a/server/pom.xml b/server/pom.xml
new file mode 100644
index 000000000..e81c7e994
--- /dev/null
+++ b/server/pom.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mitre</groupId>
+    <artifactId>openid</artifactId>
+    <name>OpenIdConnect</name>
+    <packaging>war</packaging>
+    <version>0.1</version>
+    <properties>
+        <java-version>1.6</java-version>
+        <org.springframework-version>3.0.6.RELEASE</org.springframework-version>
+        <org.slf4j-version>1.5.10</org.slf4j-version>
+        <spring.security.version>3.1.0.RELEASE</spring.security.version>
+    </properties>
+    <parent>
+    	<groupId>org.mitre</groupId>
+    	<artifactId>openid-parent</artifactId>
+    	<version>0.1</version>	
+    </parent>
+    <dependencies>
+	<dependency>
+		<groupId>org.springframework.security.oauth</groupId>
+		<version>1.0.0.BUILD-SNAPSHOT</version>
+		<artifactId>spring-security-oauth2</artifactId>
+	</dependency>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework-version}</version>
+            <exclusions>
+                <!-- Exclude Commons Logging in favor of SLF4j -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${org.springframework-version}</version>
+        </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j-version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>${org.slf4j-version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.15</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.mail</groupId>
+                    <artifactId>mail</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jdmk</groupId>
+                    <artifactId>jmxtools</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jmx</groupId>
+                    <artifactId>jmxri</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- @Inject -->
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
+        </dependency>
+
+        <!-- Servlet -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${org.springframework-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.3.154</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib</artifactId>
+            <version>2.2</version>
+        </dependency>
+
+        <!-- Build -->
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>2.4</version>
+            <scope>build</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-acl</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-aspects</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-ldap</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-openid</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>javax.persistence</artifactId>
+            <version>2.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>org.eclipse.persistence.jpa</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>10.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.1.1</version>
+        </dependency>
+        <dependency>
+        	<groupId>mysql</groupId>
+        	<artifactId>mysql-connector-java</artifactId>
+        	<version>5.1.16</version>
+        </dependency>
+        <dependency>
+        	<groupId>commons-codec</groupId>
+        	<artifactId>commons-codec</artifactId>
+        	<version>1.6</version>
+        </dependency>
+        <dependency>
+        	<groupId>org.bouncycastle</groupId>
+        	<artifactId>bcprov-jdk16</artifactId>
+        	<version>1.46</version>
+        </dependency>
+        <dependency>
+        	<groupId>org.codehaus.jackson</groupId>
+        	<artifactId>jackson-mapper-asl</artifactId>
+        	<version>1.9.2</version>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <!-- For testing against latest Spring snapshots -->
+<!--         <repository> -->
+<!--             <id>org.springframework.maven.snapshot</id> -->
+<!--             <name>Spring Maven Snapshot Repository</name> -->
+<!--             <url>http://maven.springframework.org/snapshot</url> -->
+<!--             <releases> -->
+<!--                 <enabled>false</enabled> -->
+<!--             </releases> -->
+<!--             <snapshots> -->
+<!--                 <enabled>true</enabled> -->
+<!--             </snapshots> -->
+<!--         </repository> -->
+<!--         For developing against latest Spring milestones -->
+<!--         <repository> -->
+<!--             <id>org.springframework.maven.milestone</id> -->
+<!--             <name>Spring Maven Milestone Repository</name> -->
+<!--             <url>http://maven.springframework.org/milestone</url> -->
+<!--             <snapshots> -->
+<!--                 <enabled>false</enabled> -->
+<!--             </snapshots> -->
+<!--         </repository> -->
+        <repository>
+            <id>com.google.code.gson</id>
+            <name>GSON repository</name>
+            <url>http://google-gson.googlecode.com/svn/mavenrepo/</url>
+        </repository>
+        <repository>
+            <id>org.eclipse.persistence</id>
+            <name>EclipseLink repository</name>
+            <url>http://download.eclipse.org/rt/eclipselink/maven.repo</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <description>Reference implementation of OpenID Connect spec (http://openid.net/connect/).
+    </description>
+    <url></url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java-version}</source>
+                    <target>${java-version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <executions>
+					<execution>
+						<id>prepare-war</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>exploded</goal>
+						</goals>
+					</execution>
+				</executions>
+                <configuration>
+                    <warName>openid-connect-server</warName>
+                    <useCache>true</useCache>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>sources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <junitArtifactName>junit:junit</junitArtifactName>
+                    <excludes>
+                        <exclude>**/*_Roo_*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>tomcat-maven-plugin</artifactId>
+                <version>1.0-beta-1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <formats>
+                        <format>xml</format>
+                    </formats>
+                    <instrumentation>
+                        <ignores>
+                            <ignore>org.apache.log4j.*</ignore>
+                        </ignores>
+                        <excludes>
+                            <!-- <exclude>org/mitre/openid/**/model/**/*.class</exclude> -->
+                        </excludes>
+                    </instrumentation>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>cobertura</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>cobertura</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/org/mitre/jwt/model/ClaimSet.java b/server/src/main/java/org/mitre/jwt/model/ClaimSet.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/model/ClaimSet.java
rename to server/src/main/java/org/mitre/jwt/model/ClaimSet.java
diff --git a/src/main/java/org/mitre/jwt/model/Jwt.java b/server/src/main/java/org/mitre/jwt/model/Jwt.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/model/Jwt.java
rename to server/src/main/java/org/mitre/jwt/model/Jwt.java
diff --git a/src/main/java/org/mitre/jwt/model/JwtClaims.java b/server/src/main/java/org/mitre/jwt/model/JwtClaims.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/model/JwtClaims.java
rename to server/src/main/java/org/mitre/jwt/model/JwtClaims.java
diff --git a/src/main/java/org/mitre/jwt/model/JwtHeader.java b/server/src/main/java/org/mitre/jwt/model/JwtHeader.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/model/JwtHeader.java
rename to server/src/main/java/org/mitre/jwt/model/JwtHeader.java
diff --git a/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java b/server/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java
rename to server/src/main/java/org/mitre/jwt/signer/AbstractJwtSigner.java
diff --git a/src/main/java/org/mitre/jwt/signer/JwtSigner.java b/server/src/main/java/org/mitre/jwt/signer/JwtSigner.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/signer/JwtSigner.java
rename to server/src/main/java/org/mitre/jwt/signer/JwtSigner.java
diff --git a/src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java b/server/src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java
rename to server/src/main/java/org/mitre/jwt/signer/impl/Es256Signer.java
diff --git a/src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java b/server/src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java
rename to server/src/main/java/org/mitre/jwt/signer/impl/Hmac256Signer.java
diff --git a/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java b/server/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java
rename to server/src/main/java/org/mitre/jwt/signer/impl/PlaintextSigner.java
diff --git a/src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java b/server/src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java
similarity index 100%
rename from src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java
rename to server/src/main/java/org/mitre/jwt/signer/impl/Rs256Signer.java
diff --git a/src/main/java/org/mitre/openid/connect/exception/empty.txt b/server/src/main/java/org/mitre/openid/connect/exception/empty.txt
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/exception/empty.txt
rename to server/src/main/java/org/mitre/openid/connect/exception/empty.txt
diff --git a/src/main/java/org/mitre/openid/connect/model/Address.java b/server/src/main/java/org/mitre/openid/connect/model/Address.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/Address.java
rename to server/src/main/java/org/mitre/openid/connect/model/Address.java
diff --git a/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java b/server/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
rename to server/src/main/java/org/mitre/openid/connect/model/ApprovedSite.java
diff --git a/src/main/java/org/mitre/openid/connect/model/Event.java b/server/src/main/java/org/mitre/openid/connect/model/Event.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/Event.java
rename to server/src/main/java/org/mitre/openid/connect/model/Event.java
diff --git a/src/main/java/org/mitre/openid/connect/model/IdToken.java b/server/src/main/java/org/mitre/openid/connect/model/IdToken.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/IdToken.java
rename to server/src/main/java/org/mitre/openid/connect/model/IdToken.java
diff --git a/src/main/java/org/mitre/openid/connect/model/UserInfo.java b/server/src/main/java/org/mitre/openid/connect/model/UserInfo.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/UserInfo.java
rename to server/src/main/java/org/mitre/openid/connect/model/UserInfo.java
diff --git a/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java b/server/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
rename to server/src/main/java/org/mitre/openid/connect/model/WhitelistedSite.java
diff --git a/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java b/server/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java
rename to server/src/main/java/org/mitre/openid/connect/model/serializer/JSONIdTokenView.java
diff --git a/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java b/server/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java
rename to server/src/main/java/org/mitre/openid/connect/model/serializer/JSONUserInfoView.java
diff --git a/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
rename to server/src/main/java/org/mitre/openid/connect/repository/ApprovedSiteRepository.java
diff --git a/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java
rename to server/src/main/java/org/mitre/openid/connect/repository/IdTokenRepository.java
diff --git a/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
rename to server/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java
diff --git a/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java b/server/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
rename to server/src/main/java/org/mitre/openid/connect/repository/WhitelistedSiteRepository.java
diff --git a/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt b/server/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/repository/impl/empty.txt
rename to server/src/main/java/org/mitre/openid/connect/repository/impl/empty.txt
diff --git a/src/main/java/org/mitre/openid/connect/service/empty.txt b/server/src/main/java/org/mitre/openid/connect/service/empty.txt
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/service/empty.txt
rename to server/src/main/java/org/mitre/openid/connect/service/empty.txt
diff --git a/src/main/java/org/mitre/openid/connect/service/impl/empty.txt b/server/src/main/java/org/mitre/openid/connect/service/impl/empty.txt
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/service/impl/empty.txt
rename to server/src/main/java/org/mitre/openid/connect/service/impl/empty.txt
diff --git a/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java
rename to server/src/main/java/org/mitre/openid/connect/web/AuthorizationEndpoint.java
diff --git a/src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java
rename to server/src/main/java/org/mitre/openid/connect/web/CheckIDEndpoint.java
diff --git a/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java
rename to server/src/main/java/org/mitre/openid/connect/web/TokenEndpoint.java
diff --git a/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java b/server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
similarity index 100%
rename from src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
rename to server/src/main/java/org/mitre/openid/connect/web/UserInfoEndpoint.java
diff --git a/src/main/resources/META-INF/persistence.xml b/server/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from src/main/resources/META-INF/persistence.xml
rename to server/src/main/resources/META-INF/persistence.xml
diff --git a/src/main/resources/log4j.xml b/server/src/main/resources/log4j.xml
similarity index 100%
rename from src/main/resources/log4j.xml
rename to server/src/main/resources/log4j.xml
diff --git a/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/server/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
rename to server/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
diff --git a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
rename to server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
diff --git a/src/main/webapp/WEB-INF/spring/application-context.xml b/server/src/main/webapp/WEB-INF/spring/application-context.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring/application-context.xml
rename to server/src/main/webapp/WEB-INF/spring/application-context.xml
diff --git a/src/main/webapp/WEB-INF/spring/data-context.xml b/server/src/main/webapp/WEB-INF/spring/data-context.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring/data-context.xml
rename to server/src/main/webapp/WEB-INF/spring/data-context.xml
diff --git a/src/main/webapp/WEB-INF/spring/security-context.xml b/server/src/main/webapp/WEB-INF/spring/security-context.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/spring/security-context.xml
rename to server/src/main/webapp/WEB-INF/spring/security-context.xml
diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/server/src/main/webapp/WEB-INF/views/home.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/home.jsp
rename to server/src/main/webapp/WEB-INF/views/home.jsp
diff --git a/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from src/main/webapp/WEB-INF/web.xml
rename to server/src/main/webapp/WEB-INF/web.xml
diff --git a/src/test/java/org/mitre/jwt/JwtTest.java b/server/src/test/java/org/mitre/jwt/JwtTest.java
similarity index 100%
rename from src/test/java/org/mitre/jwt/JwtTest.java
rename to server/src/test/java/org/mitre/jwt/JwtTest.java
diff --git a/src/test/java/org/mitre/openid/connect/empty.txt b/server/src/test/java/org/mitre/openid/connect/empty.txt
similarity index 100%
rename from src/test/java/org/mitre/openid/connect/empty.txt
rename to server/src/test/java/org/mitre/openid/connect/empty.txt
diff --git a/src/test/resources/log4j.xml b/server/src/test/resources/log4j.xml
similarity index 100%
rename from src/test/resources/log4j.xml
rename to server/src/test/resources/log4j.xml