From ceb91123b55e2eca21a8dbb90bbfd24a08a6b35f Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Wed, 4 Jan 2012 14:15:03 -0500
Subject: [PATCH] shuffled projects around so that it builds in maven and
 eclipse

---
 .gitignore                                    |  1 +
 .project                                      | 17 ++++++++
 .settings/org.maven.ide.eclipse.prefs         |  8 ++++
 pom.xml                                       |  2 +-
 server/.classpath                             | 15 +++++++
 server/.project                               | 43 +++++++++++++++++++
 server/.settings/.jsdtscope                   | 12 ++++++
 .../com.springsource.sts.maven.prefs          |  3 ++
 server/.settings/org.eclipse.jdt.core.prefs   |  9 ++++
 .../org.eclipse.wst.common.component          | 13 ++++++
 ....eclipse.wst.common.project.facet.core.xml |  7 +++
 ...rg.eclipse.wst.jsdt.ui.superType.container |  1 +
 .../org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 server/.settings/org.maven.ide.eclipse.prefs  |  8 ++++
 server/pom.xml                                |  6 +--
 server/src/main/webapp/META-INF/MANIFEST.MF   |  2 +
 16 files changed, 144 insertions(+), 4 deletions(-)
 create mode 100644 .project
 create mode 100644 .settings/org.maven.ide.eclipse.prefs
 create mode 100644 server/.classpath
 create mode 100644 server/.project
 create mode 100644 server/.settings/.jsdtscope
 create mode 100644 server/.settings/com.springsource.sts.maven.prefs
 create mode 100644 server/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 server/.settings/org.eclipse.wst.common.component
 create mode 100644 server/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 server/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 server/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 server/.settings/org.maven.ide.eclipse.prefs
 create mode 100644 server/src/main/webapp/META-INF/MANIFEST.MF

diff --git a/.gitignore b/.gitignore
index 6fef6c8a2..fe032b224 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /local-values.conf
 /target
 *~
+/bin
 
diff --git a/.project b/.project
new file mode 100644
index 000000000..965bb02e4
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>OpenIDConnect</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..46d0bb234
--- /dev/null
+++ b/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Wed Jan 04 13:38:09 EST 2012
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/pom.xml b/pom.xml
index da6be30cf..43c219ae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
          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-parent</artifactId>
+    <artifactId>openid-connect-parent</artifactId>
     <name>OpenIdConnect</name>
     <packaging>pom</packaging>
     <version>0.1</version>
diff --git a/server/.classpath b/server/.classpath
new file mode 100644
index 000000000..fc2725aa3
--- /dev/null
+++ b/server/.classpath
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<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>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="/spring-security-oauth2"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/server/.project b/server/.project
new file mode 100644
index 000000000..d94333531
--- /dev/null
+++ b/server/.project
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>openid</name>
+	<comment>Reference implementation of OpenID Connect spec (http://openid.net/connect/). NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+	<projects>
+		<project>spring-security-oauth2</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/server/.settings/.jsdtscope b/server/.settings/.jsdtscope
new file mode 100644
index 000000000..b46b9207a
--- /dev/null
+++ b/server/.settings/.jsdtscope
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/webapp"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/server/.settings/com.springsource.sts.maven.prefs b/server/.settings/com.springsource.sts.maven.prefs
new file mode 100644
index 000000000..ca1b6dc30
--- /dev/null
+++ b/server/.settings/com.springsource.sts.maven.prefs
@@ -0,0 +1,3 @@
+#Wed Jan 04 13:45:00 EST 2012
+com.springsource.sts.maven.maven.automatically.update=true
+eclipse.preferences.version=1
diff --git a/server/.settings/org.eclipse.jdt.core.prefs b/server/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..34653a858
--- /dev/null
+++ b/server/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+#Wed Jan 04 13:07:35 EST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/server/.settings/org.eclipse.wst.common.component b/server/.settings/org.eclipse.wst.common.component
new file mode 100644
index 000000000..b21733a55
--- /dev/null
+++ b/server/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="openid">
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/spring-security-oauth2/spring-security-oauth2">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="java-output-path" value="/openid/target/classes"/>
+        <property name="context-root" value="openid-connect-server"/>
+    </wb-module>
+</project-modules>
diff --git a/server/.settings/org.eclipse.wst.common.project.facet.core.xml b/server/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 000000000..9f1491f6f
--- /dev/null
+++ b/server/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="wst.jsdt.web"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.web" version="2.5"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
diff --git a/server/.settings/org.eclipse.wst.jsdt.ui.superType.container b/server/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 000000000..3bd5d0a48
--- /dev/null
+++ b/server/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/server/.settings/org.eclipse.wst.jsdt.ui.superType.name b/server/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 000000000..05bd71b6e
--- /dev/null
+++ b/server/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/server/.settings/org.maven.ide.eclipse.prefs b/server/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..9210fb858
--- /dev/null
+++ b/server/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Wed Jan 04 13:07:33 EST 2012
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/server/pom.xml b/server/pom.xml
index e81c7e994..e32dd5d68 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,8 +3,8 @@
          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>
+    <artifactId>openid-connect-server</artifactId>
+    <name>OpenIdConnect Server</name>
     <packaging>war</packaging>
     <version>0.1</version>
     <properties>
@@ -15,7 +15,7 @@
     </properties>
     <parent>
     	<groupId>org.mitre</groupId>
-    	<artifactId>openid-parent</artifactId>
+    	<artifactId>openid-connect-parent</artifactId>
     	<version>0.1</version>	
     </parent>
     <dependencies>
diff --git a/server/src/main/webapp/META-INF/MANIFEST.MF b/server/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..58630c02e
--- /dev/null
+++ b/server/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+