github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleaned up the context files a bit, no big changes yet.

pull/59/head
Amanda Anganes 2012-04-09 10:53:02 -04:00
parent 91c7c6153d
commit 5b09c93024
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openid-connect-server/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
View File

@ -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>

15
openid-connect-server/src/main/webapp/WEB-INF/spring/application-context.xml
View File

@ -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" /> -->