You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/04/23 12:25:06 UTC
svn commit: r937232 - in
/camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security:
SpringSecurityCamelContext.xml commonSecurity.xml
config/SpringSecurityAuthorizationPolicy.xml
Author: davsclaus
Date: Fri Apr 23 10:25:06 2010
New Revision: 937232
URL: http://svn.apache.org/viewvc?rev=937232&view=rev
Log:
Fixed tests because of policy changes yesterday
Modified:
camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml
camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml
camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicy.xml
Modified: camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml?rev=937232&r1=937231&r2=937232&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml (original)
+++ camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/SpringSecurityCamelContext.xml Fri Apr 23 10:25:06 2010
@@ -17,9 +17,9 @@
-->
<!-- START SNIPPET: example -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:spring-security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:spring-security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
@@ -27,23 +27,25 @@
http://camel.apache.org/schema/spring-security/camel-spring-security.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
- <!-- import the spring security configuration -->
- <import resource="classpath:org/apache/camel/component/spring/security/commonSecurity.xml"/>
-
- <authorizationPolicy id="admin" access="ROLE_ADMIN"
- authenticationManager="authenticationManager"
- accessDecisionManager="accessDecisionManager"
- xmlns="http://camel.apache.org/schema/spring-security"/>
-
- <camelContext id="myCamelContext" xmlns="http://camel.apache.org/schema/spring">
- <route>
- <from uri="direct:start"/>
- <!-- The exchange should be authenticated with the role of ADMIN before it is send to mock:endpoint -->
- <policy ref="admin" />
- <to uri="mock:end"/>
- </route>
- </camelContext>
-
+
+ <!-- import the spring security configuration -->
+ <import resource="classpath:org/apache/camel/component/spring/security/commonSecurity.xml"/>
+
+ <authorizationPolicy id="admin" access="ROLE_ADMIN"
+ authenticationManager="authenticationManager"
+ accessDecisionManager="accessDecisionManager"
+ xmlns="http://camel.apache.org/schema/spring-security"/>
+
+ <camelContext id="myCamelContext" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="direct:start"/>
+ <!-- The exchange should be authenticated with the role of ADMIN before it is send to mock:endpoint -->
+ <policy ref="admin">
+ <to uri="mock:end"/>
+ </policy>
+ </route>
+ </camelContext>
+
</beans>
- <!-- END SNIPPET: example -->
+ <!-- END SNIPPET: example -->
Modified: camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml?rev=937232&r1=937231&r2=937232&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml (original)
+++ camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/commonSecurity.xml Fri Apr 23 10:25:06 2010
@@ -17,30 +17,30 @@
-->
<!-- START SNIPPET: example -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:spring-security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:spring-security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
- <bean id="authenticationManager" class="org.springframework.security.MockAuthenticationManager"/>
+ <bean id="authenticationManager" class="org.springframework.security.MockAuthenticationManager"/>
- <bean id="accessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
- <property name="allowIfAllAbstainDecisions" value="true"/>
- <property name="decisionVoters">
- <list>
- <bean class="org.springframework.security.vote.RoleVoter"/>
- </list>
- </property>
- </bean>
+ <bean id="accessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
+ <property name="allowIfAllAbstainDecisions" value="true"/>
+ <property name="decisionVoters">
+ <list>
+ <bean class="org.springframework.security.vote.RoleVoter"/>
+ </list>
+ </property>
+ </bean>
- <spring-security:authentication-provider user-service-ref="userDetailsService"/>
+ <spring-security:authentication-provider user-service-ref="userDetailsService"/>
- <spring-security:user-service id="userDetailsService">
- <spring-security:user name="jim" password="jimspassword" authorities="ROLE_USER, ROLE_ADMIN"/>
- <spring-security:user name="bob" password="bobspassword" authorities="ROLE_USER"/>
- </spring-security:user-service>
+ <spring-security:user-service id="userDetailsService">
+ <spring-security:user name="jim" password="jimspassword" authorities="ROLE_USER, ROLE_ADMIN"/>
+ <spring-security:user name="bob" password="bobspassword" authorities="ROLE_USER"/>
+ </spring-security:user-service>
</beans>
-<!-- END SNIPPET: example -->
\ No newline at end of file
+<!-- END SNIPPET: example -->
\ No newline at end of file
Modified: camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicy.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicy.xml?rev=937232&r1=937231&r2=937232&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicy.xml (original)
+++ camel/trunk/components/camel-spring-security/src/test/resources/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicy.xml Fri Apr 23 10:25:06 2010
@@ -16,9 +16,9 @@
limitations under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:spring-security="http://www.springframework.org/schema/security"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:spring-security="http://www.springframework.org/schema/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
@@ -26,17 +26,17 @@
http://camel.apache.org/schema/spring-security/camel-spring-security.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
-
- <import resource="classpath:org/apache/camel/component/spring/security/commonSecurity.xml"/>
-
- <authorizationPolicy id="admin" access="ROLE_ADMIN"
- authenticationManager="authenticationManager"
- accessDecisionManager="accessDecisionManager"
- xmlns="http://camel.apache.org/schema/spring-security"/>
-
- <authorizationPolicy id="user" access="ROLE_USER"
- xmlns="http://camel.apache.org/schema/spring-security"/>
-
+
+ <import resource="classpath:org/apache/camel/component/spring/security/commonSecurity.xml"/>
+
+ <authorizationPolicy id="admin" access="ROLE_ADMIN"
+ authenticationManager="authenticationManager"
+ accessDecisionManager="accessDecisionManager"
+ xmlns="http://camel.apache.org/schema/spring-security"/>
+
+ <authorizationPolicy id="user" access="ROLE_USER"
+ xmlns="http://camel.apache.org/schema/spring-security"/>
+
</beans>