You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/06/18 09:43:30 UTC
svn commit: r955874 - in
/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main:
java/org/apache/servicemix/cxfbc/CxfBcComponent.java
java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
resources/META-INF/spring/servicemix-cxf-bc.xml
Author: ffang
Date: Fri Jun 18 07:43:29 2010
New Revision: 955874
URL: http://svn.apache.org/viewvc?rev=955874&view=rev
Log:
[SMXCOMP-763] inject authenticationService to smx-cxf-bc as OSGi service
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/resources/META-INF/spring/servicemix-cxf-bc.xml
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java?rev=955874&r1=955873&r2=955874&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcComponent.java Fri Jun 18 07:43:29 2010
@@ -141,4 +141,20 @@ public class CxfBcComponent extends Defa
public CxfBcConfiguration getConfiguration() {
return configuration;
}
+
+ /**
+ * @return the authenticationService
+ */
+ public Object getAuthenticationService() {
+ return configuration.getAuthenticationService();
+ }
+
+ /**
+ * @param authenticationService the authenticationService to set
+ * @org.apache.xbean.Property description="the authentication service object used by a component"
+ */
+ public void setAuthenticationService(Object authenticationService) {
+ this.configuration.setAuthenticationService(authenticationService);
+ }
+
}
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java?rev=955874&r1=955873&r2=955874&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java Fri Jun 18 07:43:29 2010
@@ -475,8 +475,8 @@ public class CxfBcConsumer extends Consu
cxfService.getInInterceptors().add(new JbiInInterceptor());
cxfService.getInInterceptors().add(new JbiJAASInterceptor(
AuthenticationService.Proxy.create(
- ((CxfBcComponent)this.getServiceUnit().getComponent()).
- getConfiguration().getAuthenticationService()), isX509(), isDelegateToJaas()));
+ ((CxfBcComponent)this.getServiceUnit().getComponent())
+ .getAuthenticationService()), isX509(), isDelegateToJaas()));
cxfService.getInInterceptors().add(new JbiInvokerInterceptor());
cxfService.getInInterceptors().add(new JbiPostInvokerInterceptor());
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/resources/META-INF/spring/servicemix-cxf-bc.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/resources/META-INF/spring/servicemix-cxf-bc.xml?rev=955874&r1=955873&r2=955874&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/resources/META-INF/spring/servicemix-cxf-bc.xml (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/main/resources/META-INF/spring/servicemix-cxf-bc.xml Fri Jun 18 07:43:29 2010
@@ -36,9 +36,12 @@
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
<bean id="servicemix-cxf-bc" class="org.apache.servicemix.cxfbc.CxfBcComponent">
+ <property name="authenticationService" ref="authenticationService" />
<property name="executorFactory" ref="executorFactory" />
</bean>
+ <osgi:reference id="authenticationService" interface="org.apache.servicemix.nmr.api.security.AuthenticationService" />
+
<bean id="executorFactory" class="org.apache.servicemix.executors.impl.ExecutorFactoryImpl">
<property name="defaultConfig">
<bean class="org.apache.servicemix.executors.impl.ExecutorConfig">