cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From egl...@apache.org
Subject svn commit: r534108 - in /incubator/cxf/trunk: distribution/src/main/release/samples/colocated/ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ systests/src/test/java/org/apache/cxf/systest/coloc/
Date Tue, 01 May 2007 14:53:34 GMT
Author: eglynn
Date: Tue May  1 07:53:33 2007
New Revision: 534108

URL: http://svn.apache.org/viewvc?view=rev&rev=534108
Log:
Modified ColocFeature so that a DeferredConduitSelector is also installed, avoiding the need
to explicitly configure this also.

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/colocated/coloc.xml
    incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/colocated/coloc.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/colocated/coloc.xml?view=diff&rev=534108&r1=534107&r2=534108
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/colocated/coloc.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/colocated/coloc.xml Tue May
 1 07:53:33 2007
@@ -39,8 +39,5 @@
         <jaxws:features>
             <coloc:enableColoc/>
         </jaxws:features>
-        <jaxws:conduitSelector>
-            <bean class="org.apache.cxf.endpoint.DeferredConduitSelector"/>
-        </jaxws:conduitSelector>
     </jaxws:client>
 </beans>

Modified: incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java?view=diff&rev=534108&r1=534107&r2=534108
==============================================================================
--- incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
(original)
+++ incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
Tue May  1 07:53:33 2007
@@ -21,12 +21,23 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.coloc.ColocInInterceptor;
 import org.apache.cxf.binding.coloc.ColocOutInterceptor;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.ConduitSelector;
+import org.apache.cxf.endpoint.DeferredConduitSelector;
 import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.interceptor.InterceptorProvider;
 
 public class ColocFeature extends AbstractFeature {
     private static final ColocOutInterceptor COLOC_OUT = new ColocOutInterceptor();
     private static final ColocInInterceptor COLOC_IN = new ColocInInterceptor();
+
+    @Override
+    public void initialize(Client client, Bus bus) {
+        ConduitSelector selector = new DeferredConduitSelector();
+        selector.setEndpoint(client.getEndpoint());
+        client.setConduitSelector(selector);
+        initializeProvider(client, bus);
+    }
     
     @Override
     protected void initializeProvider(InterceptorProvider provider, Bus bus) {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml?view=diff&rev=534108&r1=534107&r2=534108
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/coloc/coloc_rpc.xml
Tue May  1 07:53:33 2007
@@ -56,8 +56,10 @@
         <jaxws:features>
             <coloc:enableColoc/>
         </jaxws:features>
+        <!--
         <jaxws:conduitSelector>
             <bean class="org.apache.cxf.endpoint.DeferredConduitSelector"/>
         </jaxws:conduitSelector>
+        -->
     </jaxws:client>
 </beans>



Mime
View raw message