You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/07/10 09:58:18 UTC
svn commit: r962783 - in /camel/trunk:
examples/camel-example-spring-security/
examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/
tests/camel-itest/src/test/java/org/apache/camel/itest/security/ tests/ca...
Author: ningjiang
Date: Sat Jul 10 07:58:17 2010
New Revision: 962783
URL: http://svn.apache.org/viewvc?rev=962783&view=rev
Log:
CAMEL-2930 Upgrade to spring security 3.0.3
Modified:
camel/trunk/examples/camel-example-spring-security/pom.xml
camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/camel-context.xml
camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/common-security.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/commonSecurity.xml
Modified: camel/trunk/examples/camel-example-spring-security/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-security/pom.xml?rev=962783&r1=962782&r2=962783&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-security/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-security/pom.xml Sat Jul 10 07:58:17 2010
@@ -44,6 +44,12 @@
</dependency>
<dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring-security-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servlet</artifactId>
</dependency>
Modified: camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/camel-context.xml?rev=962783&r1=962782&r2=962783&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/camel-context.xml Sat Jul 10 07:58:17 2010
@@ -28,14 +28,13 @@
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
- <!-- we don't authenticate the user again here-->
- <bean id="authenticationManager" class="org.springframework.security.MockAuthenticationManager"/>
-
- <bean id="accessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
+ <import resource="classpath:org/apache/camel/example/spring/security/common-security.xml"/>
+
+ <bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="true"/>
<property name="decisionVoters">
<list>
- <bean class="org.springframework.security.vote.RoleVoter"/>
+ <bean class="org.springframework.security.access.vote.RoleVoter"/>
</list>
</property>
</bean>
Modified: camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/common-security.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/common-security.xml?rev=962783&r1=962782&r2=962783&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/common-security.xml (original)
+++ camel/trunk/examples/camel-example-spring-security/src/main/resources/org/apache/camel/example/spring/security/common-security.xml Sat Jul 10 07:58:17 2010
@@ -24,7 +24,9 @@
http://www.springframework.org/schema/security/spring-security.xsd">
<!-- set up the user configuration here -->
- <spring-security:authentication-provider user-service-ref="userDetailsService"/>
+ <spring-security:authentication-manager alias="authenticationManager">
+ <spring-security:authentication-provider user-service-ref="userDetailsService"/>
+ </spring-security:authentication-manager>
<spring-security:user-service id="userDetailsService">
<spring-security:user name="jim" password="jimspassword" authorities="ROLE_USER, ROLE_ADMIN"/>
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java?rev=962783&r1=962782&r2=962783&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java Sat Jul 10 07:58:17 2010
@@ -106,7 +106,7 @@ public class GreeterClientTest extends A
} catch (Exception ex) {
assertTrue("Get a wrong type exception.", ex instanceof SOAPFaultException);
assertTrue("Get a wrong exception message", ex.getMessage().startsWith("Cannot access the processor which has been protected."));
- assertTrue("Get a wrong exception message", ex.getMessage().endsWith("Caused by: [org.springframework.security.AccessDeniedException - Access is denied]"));
+ assertTrue("Get a wrong exception message", ex.getMessage().endsWith("Caused by: [org.springframework.security.access.AccessDeniedException - Access is denied]"));
}
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java?rev=962783&r1=962782&r2=962783&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java Sat Jul 10 07:58:17 2010
@@ -23,8 +23,9 @@ import javax.security.auth.Subject;
import org.apache.camel.component.spring.security.DefaultAuthenticationAdapter;
import org.apache.ws.security.WSUsernameTokenPrincipal;
-import org.springframework.security.Authentication;
-import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+
public class MyAuthenticationAdapter extends DefaultAuthenticationAdapter {
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/commonSecurity.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/commonSecurity.xml?rev=962783&r1=962782&r2=962783&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/commonSecurity.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/commonSecurity.xml Sat Jul 10 07:58:17 2010
@@ -24,18 +24,20 @@
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
- <spring-security:authentication-manager alias="authenticationManager"/>
+ <spring-security:authentication-manager alias="authenticationManager">
+ <spring-security:authentication-provider user-service-ref="userDetailsService"/>
+ </spring-security:authentication-manager>
- <bean id="accessDecisionManager" class="org.springframework.security.vote.AffirmativeBased">
+ <bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="true"/>
<property name="decisionVoters">
<list>
- <bean class="org.springframework.security.vote.RoleVoter"/>
+ <bean class="org.springframework.security.access.vote.RoleVoter"/>
</list>
</property>
</bean>
- <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"/>