Author: ningjiang
Date: Thu May 27 06:45:16 2010
New Revision: 948689
URL: http://svn.apache.org/viewvc?rev=948689&view=rev
Log:
CAMEL-2756 Refacted AuthenticationConverter to AuthenticationAdapter to avoid
the confusing of camel type converter
Added:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java
(contents, props changed)
- copied, changed from r948653,
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/AuthenticationConverter.java
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java
(contents, props changed)
- copied, changed from r948653,
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/DefaultAuthenticationConverter.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
(contents, props changed)
- copied, changed from r948659,
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationConverter.java
Removed:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/AuthenticationConverter.java
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/DefaultAuthenticationConverter.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationConverter.java
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/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
camel/trunk/components/camel-spring-security/src/main/resources/schema/camel-spring-security.xsd
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
Copied:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java
(from r948653,
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/AuthenticationConverter.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java?p2=camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java&p1=camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/AuthenticationConverter.java&r1=948653&r2=948689&rev=948689&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/AuthenticationConverter.java
(original)
+++
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java
Thu May 27 06:45:16 2010
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.spring.security.converter;
+package org.apache.camel.component.spring.security;
import javax.security.auth.Subject;
import org.springframework.security.Authentication;
-public interface AuthenticationConverter {
+public interface AuthenticationAdapter {
Authentication toAuthentication(Subject subject);
Propchange:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/AuthenticationAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java
(from r948653,
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/DefaultAuthenticationConverter.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java?p2=camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java&p1=camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/DefaultAuthenticationConverter.java&r1=948653&r2=948689&rev=948689&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/converter/DefaultAuthenticationConverter.java
(original)
+++
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java
Thu May 27 06:45:16 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.spring.security.converter;
+package org.apache.camel.component.spring.security;
import java.util.Set;
@@ -22,7 +22,7 @@ import javax.security.auth.Subject;
import org.springframework.security.Authentication;
-public class DefaultAuthenticationConverter implements AuthenticationConverter
{
+public class DefaultAuthenticationAdapter implements AuthenticationAdapter {
public Authentication toAuthentication(Subject subject) {
if (subject == null || subject.getPrincipals().size() == 0) {
Propchange:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/DefaultAuthenticationAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
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=948689&r1=948688&r2=948689&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
Thu May 27 06:45:16 2010
@@ -22,8 +22,6 @@ import org.apache.camel.CamelAuthorizati
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import
org.apache.camel.component.spring.security.converter.AuthenticationConverter;
-import
org.apache.camel.component.spring.security.converter.DefaultAuthenticationConverter;
import org.apache.camel.processor.DelegateProcessor;
import org.apache.camel.spi.AuthorizationPolicy;
import org.apache.camel.spi.RouteContext;
@@ -48,7 +46,7 @@ public class SpringSecurityAuthorization
private static final transient Log LOG =
LogFactory.getLog(SpringSecurityAuthorizationPolicy.class);
private AccessDecisionManager accessDecisionManager;
private AuthenticationManager authenticationManager;
- private AuthenticationConverter authenticationConverter;
+ private AuthenticationAdapter authenticationAdapter;
private ApplicationEventPublisher eventPublisher;
private SpringSecurityAccessPolicy accessPolicy;
@@ -96,7 +94,7 @@ public class SpringSecurityAuthorization
Subject subject = message.getHeader(Exchange.AUTHENTICATION,
Subject.class);
Authentication answer = null;
if (subject != null) {
- answer = getAuthenticationConverter().toAuthentication(subject);
+ answer = getAuthenticationAdapter().toAuthentication(subject);
}
// try to get it from thread context as a fallback
if (answer == null && useThreadSecurityContext) {
@@ -152,21 +150,21 @@ public class SpringSecurityAuthorization
}
}
- public AuthenticationConverter getAuthenticationConverter() {
- if (authenticationConverter == null) {
+ public AuthenticationAdapter getAuthenticationAdapter() {
+ if (authenticationAdapter == null) {
synchronized (this) {
- if (authenticationConverter != null) {
- return authenticationConverter;
+ if (authenticationAdapter != null) {
+ return authenticationAdapter;
} else {
- authenticationConverter = new
DefaultAuthenticationConverter();
+ authenticationAdapter = new DefaultAuthenticationAdapter();
}
}
}
- return authenticationConverter;
+ return authenticationAdapter;
}
- public void setAuthenticationConverter(AuthenticationConverter converter) {
- this.authenticationConverter = converter;
+ public void setAuthenticationAdapter(AuthenticationAdapter adapter) {
+ this.authenticationAdapter = adapter;
}
public AccessDecisionManager getAccessDecisionManager() {
Modified:
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java?rev=948689&r1=948688&r2=948689&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
(original)
+++
camel/trunk/components/camel-spring-security/src/main/java/org/apache/camel/component/spring/security/config/SpringSecurityAuthorizationPolicyParser.java
Thu May 27 06:45:16 2010
@@ -45,8 +45,9 @@ public class SpringSecurityAuthorization
setReferenceIfAttributeDefine(builder, element,
"accessDecisionManager");
setReferenceIfAttributeDefine(builder, element,
"authenticationManager");
- setReferenceIfAttributeDefine(builder, element,
"authenticationConverter");
-
+ if
(ObjectHelper.isNotEmpty(element.getAttribute("authenticationAdapter"))) {
+ builder.addPropertyReference("authenticationAdapter",
element.getAttribute("authenticationAdapter"));
+ }
BeanDefinitionBuilder accessPolicyBuilder =
BeanDefinitionBuilder.genericBeanDefinition(
SpringSecurityAccessPolicy.class.getCanonicalName());
accessPolicyBuilder.addConstructorArgValue(element.getAttribute("access"));
Modified:
camel/trunk/components/camel-spring-security/src/main/resources/schema/camel-spring-security.xsd
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-security/src/main/resources/schema/camel-spring-security.xsd?rev=948689&r1=948688&r2=948689&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-security/src/main/resources/schema/camel-spring-security.xsd
(original)
+++
camel/trunk/components/camel-spring-security/src/main/resources/schema/camel-spring-security.xsd
Thu May 27 06:45:16 2010
@@ -34,7 +34,7 @@
<xsd:attribute name="id" type="xsd:ID" use="required" />
<xsd:attribute name="access" type="xsd:string" />
<xsd:attribute name="accessDecisionManager" type="xsd:string" />
- <xsd:attribute name="authenticationConverter" type="xsd:string"
/>
+ <xsd:attribute name="authenticationAdapter" type="xsd:string" />
<xsd:attribute name="authenticationManager" type="xsd:string" />
<xsd:attribute name="useThreadSecurityContext"
type="xsd:boolean" default="true"/>
<xsd:attribute name="alwaysReauthenticate" type="xsd:boolean"
default="false"/>
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=948689&r1=948688&r2=948689&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
Thu May 27 06:45:16 2010
@@ -36,11 +36,11 @@ import org.springframework.beans.factory
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-import static org.junit.Assert.*;
+
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
@ContextConfiguration(locations = {"camel-context.xml"})
public class GreeterClientTest extends AbstractJUnit4SpringContextTests {
private static final java.net.URL WSDL_LOC;
Copied:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
(from r948659,
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationConverter.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java?p2=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java&p1=camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationConverter.java&r1=948659&r2=948689&rev=948689&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationConverter.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
Thu May 27 06:45:16 2010
@@ -21,12 +21,12 @@ import java.security.cert.X509Certificat
import javax.security.auth.Subject;
-import
org.apache.camel.component.spring.security.converter.DefaultAuthenticationConverter;
+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;
-public class MyAuthenticationConverter extends DefaultAuthenticationConverter {
+public class MyAuthenticationAdapter extends DefaultAuthenticationAdapter {
protected Authentication convertToAuthentication(Subject subject) {
Authentication answer = null;
Propchange:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/security/MyAuthenticationAdapter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml?rev=948689&r1=948688&r2=948689&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
(original)
+++
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/security/camel-context.xml
Thu May 27 06:45:16 2010
@@ -35,12 +35,12 @@
<import
resource="classpath:org/apache/camel/itest/security/commonSecurity.xml"/>
<authorizationPolicy id="admin" access="ROLE_ADMIN"
- authenticationConverter="myAuthenticationConverter"
+ authenticationAdapter="myAuthenticationAdapter"
authenticationManager="authenticationManager"
accessDecisionManager="accessDecisionManager"
xmlns="http://camel.apache.org/schema/spring-security"/>
- <bean id="myAuthenticationConverter"
class="org.apache.camel.itest.security.MyAuthenticationConverter"/>
+ <bean id="myAuthenticationAdapter"
class="org.apache.camel.itest.security.MyAuthenticationAdapter"/>
<bean id="myProcessor"
class="org.apache.camel.itest.security.MyProcessor"/>
<camelContext id="myCamelContext"
xmlns="http://camel.apache.org/schema/spring";>
