svn commit: r517765 - in /incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws: ServiceImpl.java support/JaxWsClientEndpointImpl.java

[an...@apache.org]

Author: andreasmyth
Date: Tue Mar 13 09:43:14 2007
New Revision: 517765

URL: http://svn.apache.org/viewvc?view=rev&rev=517765
Log:
Fix for setExecutor having no effect on javax.xml.ws.Service (always using the one from the cxf Endpoint implementation).

Added:
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java   (with props)
Modified:
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?view=diff&rev=517765&r1=517764&r2=517765
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Tue Mar 13 09:43:14 2007
@@ -66,7 +66,7 @@
 import org.apache.cxf.jaxws.handler.HandlerResolverImpl;
 import org.apache.cxf.jaxws.handler.PortInfoImpl;
 import org.apache.cxf.jaxws.support.DummyImpl;
-import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
+import org.apache.cxf.jaxws.support.JaxWsClientEndpointImpl;
 import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.Service;
@@ -131,7 +131,7 @@
         }
 
         try {
-            return new JaxWsEndpointImpl(bus, service, ei);
+            return new JaxWsClientEndpointImpl(bus, service, ei, this);
         } catch (EndpointException e) {
             throw new WebServiceException(e);
         }
@@ -289,9 +289,9 @@
             throw new WebServiceException(BUNDLE.getString("COULD_NOT_DETERMINE_PORT"));
         }
 
-        JaxWsEndpointImpl jaxwsEndpoint;
+        JaxWsClientEndpointImpl jaxwsEndpoint;
         try {
-            jaxwsEndpoint = new JaxWsEndpointImpl(bus, service, ei);
+            jaxwsEndpoint = new JaxWsClientEndpointImpl(bus, service, ei, this);
         } catch (EndpointException e) {
             throw new WebServiceException(e);
         }

Added: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java?view=auto&rev=517765
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java (added)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java Tue Mar 13 09:43:14 2007
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.jaxws.support;
+
+import java.util.concurrent.Executor;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.EndpointException;
+import org.apache.cxf.jaxws.ServiceImpl;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.model.EndpointInfo;
+
+/**
+ *
+ */
+
+public class JaxWsClientEndpointImpl extends JaxWsEndpointImpl {
+
+    private ServiceImpl executorProvider;
+    
+    public JaxWsClientEndpointImpl(Bus bus, Service s, EndpointInfo ei, ServiceImpl si)
+        throws EndpointException {
+        super(bus, s, ei);
+        executorProvider = si;
+    }
+
+    @Override
+    public Executor getExecutor() {
+        Executor e = executorProvider.getExecutor();
+        if (null == e) {
+            e = super.getExecutor();   
+        }
+        return e;
+    }    
+}

Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsClientEndpointImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date