Author: ilgrosso
Date: Thu Dec 13 16:41:05 2012
New Revision: 1421376
URL: http://svn.apache.org/viewvc?rev=1421376&view=rev
Log:
Merge from 1_0_X
Removed:
syncope/trunk/core/src/main/java/org/apache/syncope/core/security/NullSecurityContextRepository.java
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/resources/securityContext.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_0_X:r1420763-1421370
Modified: syncope/trunk/core/src/main/resources/securityContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/securityContext.xml?rev=1421376&r1=1421375&r2=1421376&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/securityContext.xml (original)
+++ syncope/trunk/core/src/main/resources/securityContext.xml Thu Dec 13
16:41:05 2012
@@ -28,7 +28,7 @@ under the License.
<security:global-method-security pre-post-annotations="enabled"/>
- <bean id="securityContextRepository"
class='org.apache.syncope.core.security.NullSecurityContextRepository'/>
+ <bean id="securityContextRepository"
class='org.springframework.security.web.context.NullSecurityContextRepository'/>
<security:http security-context-repository-ref="securityContextRepository">
<security:http-basic/>
