From 2e80dcdc4f46637e6d53810e1744fd29a2c94b71 Mon Sep 17 00:00:00 2001
From: opax <o.pax@web.de>
Date: Fri, 4 Apr 2014 09:54:24 +0200
Subject: [PATCH 1/3] Base URL must be configured as Java system property

---
 .../src/main/webapp/WEB-INF/server-config.xml                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml
index 491bfd93a6..a72732ff3e 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/server-config.xml
@@ -28,8 +28,10 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
 	<bean id="configBean" class="org.mitre.openid.connect.config.ConfigurationPropertiesBean">
-		<property name="issuer" value="http://localhost:8080/openid-connect-server-webapp/" />
+		<property name="issuer" value="${oic.baseurl}/openid-connect-server-webapp/" />
  		<property name="logoImageUrl" value="resources/images/openid_connect_small.png" />
  		<property name="topbarTitle" value="OpenID Connect Server" />
 	</bean>

From ee5838e564b61590d4ff4d45f11c6a2a42e8e2bd Mon Sep 17 00:00:00 2001
From: Florian Waibel <fwaibel@eclipsesource.com>
Date: Fri, 4 Apr 2014 10:17:29 +0200
Subject: [PATCH 2/3] Adds Dockerfile to test automated MITREid Connect Server
 installation

---
 .../src/main/docker/Dockerfile                | 21 +++++++++++++++++++
 .../src/main/docker/README.md                 | 10 +++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 openid-connect-server-webapp/src/main/docker/Dockerfile
 create mode 100644 openid-connect-server-webapp/src/main/docker/README.md

diff --git a/openid-connect-server-webapp/src/main/docker/Dockerfile b/openid-connect-server-webapp/src/main/docker/Dockerfile
new file mode 100644
index 0000000000..048393dd3d
--- /dev/null
+++ b/openid-connect-server-webapp/src/main/docker/Dockerfile
@@ -0,0 +1,21 @@
+# Pull base image.
+FROM dockerfile/ubuntu
+
+# Install Java
+RUN apt-get install -y software-properties-common
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN apt-get update
+RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
+RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
+RUN apt-get install -y oracle-java7-installer
+
+RUN apt-get install -y git
+RUN apt-get install -y maven
+
+RUN git clone https://github.com/instauth/OpenID-Connect-Java-Spring-Server.git
+
+RUN /usr/bin/mvn -f OpenID-Connect-Java-Spring-Server/pom.xml install
+
+EXPOSE 8080
+
+CMD /usr/bin/mvn -f OpenID-Connect-Java-Spring-Server/openid-connect-server-webapp/pom.xml jetty:run
diff --git a/openid-connect-server-webapp/src/main/docker/README.md b/openid-connect-server-webapp/src/main/docker/README.md
new file mode 100644
index 0000000000..255743f829
--- /dev/null
+++ b/openid-connect-server-webapp/src/main/docker/README.md
@@ -0,0 +1,10 @@
+Dockerfile for MITREid Connect Server
+-------------------------------------
+
+How to build the MITREid Connect Server image:
+
+$ docker build -t=instauth/mitreid-server .
+
+How to create and run the MITREid Connect Server container:
+
+$ docker run -p 8080:8080 -t instauth/mitreid-server

From 85b11375707a73bc67470fe6c726dc3d72e16b46 Mon Sep 17 00:00:00 2001
From: opax <o.pax@web.de>
Date: Thu, 10 Apr 2014 09:32:10 +0200
Subject: [PATCH 3/3] don't install sources to save startup time

---
 openid-connect-server-webapp/pom.xml | 13 -------------
 pom.xml                              | 12 ------------
 2 files changed, 25 deletions(-)

diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml
index 4c90faab2f..961168ec2f 100644
--- a/openid-connect-server-webapp/pom.xml
+++ b/openid-connect-server-webapp/pom.xml
@@ -39,19 +39,6 @@
 					</webResources>
                 </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.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 53d5bb6bc3..28a08cf138 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,18 +148,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>