svn commit: r946017 - in /camel/trunk/components/camel-spring-security/src: main/java/org/apache/camel/component/spring/security/ test/java/org/apache/camel/component/spring/security/

[ningjiang]

Author: ningjiang
Date: Wed May 19 04:20:35 2010
New Revision: 946017

URL: http://svn.apache.org/viewvc?rev=946017&view=rev
Log:
CAMEL-2735 Stored the security subject into the camel message instead of camel 
exchange

Modified:
    
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
    
camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java

Modified: 
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java?rev=946017&r1=946016&r2=946017&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
 (original)
+++ 
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicy.java
 Wed May 19 04:20:35 2010
@@ -18,6 +18,7 @@ package org.apache.camel.component.sprin
 
 import org.apache.camel.CamelAuthorizationException;
 import org.apache.camel.Exchange;
+import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.processor.DelegateProcessor;
 import org.apache.camel.spi.AuthorizationPolicy;
@@ -59,7 +60,7 @@ public class SpringSecurityAuthorization
         ConfigAttributeDefinition attributes = 
accessPolicy.getConfigAttributeDefinition();
         
         try {
-            Authentication authToken = getAuthentication(exchange);
+            Authentication authToken = getAuthentication(exchange.getIn());
             if (authToken == null) {
                 CamelAuthorizationException authorizationException =
                     new CamelAuthorizationException("Cannot find the 
Authentication instance.", exchange);
@@ -86,8 +87,8 @@ public class SpringSecurityAuthorization
         }
     }
     
-    protected Authentication getAuthentication(Exchange exchange) {
-        Authentication answer = exchange.getProperty(Exchange.AUTHENTICATION, 
Authentication.class);
+    protected Authentication getAuthentication(Message message) {
+        Authentication answer = message.getHeader(Exchange.AUTHENTICATION, 
Authentication.class);
         // try to get it from thread context as a fallback
         if (answer == null && useThreadSecurityContext) {
             answer = SecurityContextHolder.getContext().getAuthentication();

Modified: 
camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java?rev=946017&r1=946016&r2=946017&view=diff
==============================================================================
--- 
camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
 (original)
+++ 
camel/trunk/components/camel-spring-security/src/test/java/org/apache/camel/component/spring/security/SpringSecurityAuthorizationPolicyTest.java
 Wed May 19 04:20:35 2010
@@ -89,7 +89,7 @@ public class SpringSecurityAuthorization
         Subject subject = new Subject();
         subject.getPrincipals().add(authToken);
 
-        template.sendBodyAndProperty("direct:start", "hello world", 
Exchange.AUTHENTICATION, subject);
+        template.sendBodyAndHeader("direct:start", "hello world", 
Exchange.AUTHENTICATION, subject);
 
     }