From 5b09c93024a0ea14b2b90fa1a0319ac37367535a Mon Sep 17 00:00:00 2001
From: Amanda Anganes <aanganes@mitre.org>
Date: Mon, 9 Apr 2012 10:53:02 -0400
Subject: [PATCH] Cleaned up the context files a bit, no big changes yet.

---
 .../WEB-INF/spring/appServlet/servlet-context.xml |  1 -
 .../webapp/WEB-INF/spring/application-context.xml | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/openid-connect-server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
index 663d2fef9..b003a78cd 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
@@ -52,6 +52,5 @@
 		authorization-endpoint-url="/openidconnect/auth" token-endpoint-url="/openidconnect/token">
 		<oauth:authorization-code authorization-code-services-ref="authCodeServices"/>
 	</oauth:authorization-server>
-	
 
 </beans:beans>
diff --git a/openid-connect-server/src/main/webapp/WEB-INF/spring/application-context.xml b/openid-connect-server/src/main/webapp/WEB-INF/spring/application-context.xml
index 9c0087030..2b4b20f83 100644
--- a/openid-connect-server/src/main/webapp/WEB-INF/spring/application-context.xml
+++ b/openid-connect-server/src/main/webapp/WEB-INF/spring/application-context.xml
@@ -19,6 +19,8 @@
 		
 	<import resource="data-context.xml" />	
 
+	<!-- Begin Spring Security configuration -->
+
 	<security:global-method-security pre-post-annotations="enabled" proxy-target-class="true" authentication-manager-ref="springSecurityAuthenticationManager"/>
 
 	<http pattern="/oauth/token" create-session="stateless" authentication-manager-ref="clientAuthenticationManager" 
@@ -79,6 +81,8 @@
 		</security:authentication-provider>
 	</security:authentication-manager>
 		
+	<!-- End Spring Security configuration -->	
+		
 	<tx:annotation-driven transaction-manager="transactionManager" />
 	
 	<bean id="jpaAdapter" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter">
@@ -117,9 +121,6 @@
 		</property>
 	</bean>
 
-	<!-- TODO: working remove red X's see: http://forum.springsource.org/showthread.php?123193-STS-not-respecting-META-INF-spring-schemas-for-validation&p=401926#post401926 -->
-
-
 	<bean id="defaultKeystore" class="org.mitre.jwt.signer.service.impl.KeyStore">
 		<constructor-arg name="location" value="classpath:keystore.jks" />
 		<constructor-arg name="password" value="changeit" />
@@ -146,14 +147,6 @@
 		</property>	
 	</bean>	
 
-	
-<!-- 	<jwt-signer:keystore id="defaultKeystore" location="classpath:keystore.jks" password="changeit" /> -->
-
-<!-- 	<jwt-signer:service id="defaultSignerService"> -->
-<!-- 		<jwt-signer:rsa bits="256" keystore-ref="defaultKeystore" key-alias="rsa" password="changeit" />  -->
-<!-- 		<jwt-signer:hmac bits="256" passphrase="changeit" />		 -->
-<!-- 	</jwt-signer:service> -->
-	 
 	<!-- scheduled tasks -->
 <!-- 	<task:scheduler id="taskScheduler" pool-size="10" /> -->
 <!-- 	<task:executor id="taskExecutor" pool-size="5" /> -->