cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1235272 - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/wsdl/ rt/core/src/main/java/org/apache/cxf/bus/managers/ rt/core/src/main/java/org/apache/cxf/endpoint/ rt/core/src/main/java/org/apa...
Date Tue, 24 Jan 2012 14:39:10 GMT
Author: dkulp
Date: Tue Jan 24 14:39:08 2012
New Revision: 1235272

URL: http://svn.apache.org/viewvc?rev=1235272&view=rev
Log:
Resolve last split package issues.
Change api to regular bundle, not a fragment

Added:
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java   (contents,
props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java   (contents, props
changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointException.java
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java   (contents, props
changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java   (contents,
props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties   (contents, props
changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Messages.properties
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java   (contents, props
changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
    cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java   (contents,
props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
    cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java   (contents, props
changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistryImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java  
(contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerRegistryImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java   (contents,
props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServerRegistryImpTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
  (contents, props changed)
      - copied, changed from r1235271, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
Removed:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistryImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Messages.properties
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerRegistryImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServerRegistryImpTest.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
Modified:
    cxf/trunk/api/pom.xml
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java

Modified: cxf/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1235272&r1=1235271&r2=1235272&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Tue Jan 24 14:39:08 2012
@@ -34,7 +34,6 @@
     </parent>
 
     <properties>
-        <cxf.fragment.host>org.apache.cxf.bundle</cxf.fragment.host>
         <cxf.osgi.import>
             javax.activation;version="${cxf.osgi.javax.activation.version}",
             javax.annotation;version="${cxf.osgi.javax.annotation.version}",

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java (from
r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Tue Jan 24 14:39:08
2012
@@ -73,7 +73,7 @@ import org.apache.cxf.service.model.Serv
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.workqueue.SynchronousExecutor;
-import org.apache.cxf.wsdl11.WSDLServiceFactory;
+import org.apache.cxf.wsdl.WSDLServiceFactory;
 
 public class ClientImpl
     extends AbstractBasicInterceptorProvider
@@ -153,9 +153,9 @@ public class ClientImpl
         this.bus = bus;
         outFaultObserver = new ClientOutFaultObserver(bus);
 
-        WSDLServiceFactory sf = (service == null)
-            ? (new WSDLServiceFactory(bus, wsdlUrl)) : (new WSDLServiceFactory(bus, wsdlUrl,
service));
-        Service svc = sf.create();
+        Service svc = service == null 
+            ? bus.getExtension(WSDLServiceFactory.class).create(wsdlUrl)
+                : bus.getExtension(WSDLServiceFactory.class).create(wsdlUrl, service);
         EndpointInfo epfo = findEndpoint(svc, port);
 
         try {
@@ -169,6 +169,7 @@ public class ClientImpl
         }
         notifyLifecycleManager();        
     }
+    
     /**
      * Create a Client that uses a specific EndpointImpl.
      * @param bus

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointException.java (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointException.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointException.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java (from
r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Messages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/Messages.properties&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
    (empty)

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java (from r1235271,
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointException.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java Tue Jan 24 14:39:08
2012
@@ -16,25 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.endpoint;
 
-import org.apache.cxf.common.i18n.Exception;
-import org.apache.cxf.common.i18n.Message;
+package org.apache.cxf.wsdl;
 
-public class EndpointException extends Exception {
+import java.net.URL;
 
-    private static final long serialVersionUID = 2718396758999944442L;
+import javax.xml.namespace.QName;
 
-    public EndpointException(Message msg) {
-        super(msg);
-    }
+import org.apache.cxf.service.Service;
 
-    public EndpointException(Message msg, Throwable t) {
-        super(msg, t);
-    }
+/**
+ * 
+ */
+public interface WSDLServiceFactory {
+
+    Service create(URL wsdl);
 
-    public EndpointException(Throwable cause) {
-        super(cause);
-    }
 
+    Service create(URL wsdl, QName serviceName);
 }

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/WSDLServiceFactory.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManagerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManagerImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManagerImpl.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
Tue Jan 24 14:39:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -25,6 +25,9 @@ import java.util.concurrent.CopyOnWriteA
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.configuration.ConfiguredBeanLocator;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.endpoint.ClientLifeCycleListener;
+import org.apache.cxf.endpoint.ClientLifeCycleManager;
 import org.apache.cxf.extension.BusExtension;
 
 @NoJSR250Annotations

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistryImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistryImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistryImpl.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
Tue Jan 24 14:39:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -26,6 +26,8 @@ import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.endpoint.EndpointResolver;
+import org.apache.cxf.endpoint.EndpointResolverRegistry;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
 /**

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManagerImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManagerImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManagerImpl.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
Tue Jan 24 14:39:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import java.util.Collection;
 
@@ -26,6 +26,9 @@ import java.util.concurrent.CopyOnWriteA
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.configuration.ConfiguredBeanLocator;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerLifeCycleListener;
+import org.apache.cxf.endpoint.ServerLifeCycleManager;
 import org.apache.cxf.extension.BusExtension;
 
 @NoJSR250Annotations

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerRegistryImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerRegistryImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerRegistryImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java Tue
Jan 24 14:39:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -29,6 +29,8 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerRegistry;
 
 @NoJSR250Annotations(unlessNull = "bus")
 public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener {

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImpl.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
Tue Jan 24 14:39:08 2012
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import java.net.URI;
 import java.util.List;
@@ -27,6 +27,8 @@ import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.common.injection.NoJSR250Annotations;
+import org.apache.cxf.endpoint.ServiceContractResolver;
+import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
 
 /**
  * A simple contract resolver registry. It maintains a list of contract resolvers in an

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java
(from r1235271, cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java?p2=cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java&p1=cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java Tue
Jan 24 14:39:08 2012
@@ -17,24 +17,35 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.wsdl11;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.service.Service;
-import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.wsdl.WSDLServiceFactory;
 
 /**
- * This interface defines an object that can create EndpointImpl
- * objects. 
+ * 
  */
-public interface EndpointImplFactory {
-    /**
-     * Create an EndpointImpl from a bus, service, and endpoint info.
-     * @param bus
-     * @param service
-     * @param endpointInfo
-     * @return
-     */
-    EndpointImpl newEndpointImpl(Bus bus, Service service, 
-                                 EndpointInfo endpointInfo) throws EndpointException;
+@NoJSR250Annotations
+public class WSDLServiceFactoryImpl implements WSDLServiceFactory {
+    Bus bus;
+    
+    public WSDLServiceFactoryImpl(Bus b) {
+        bus = b;
+        bus.setExtension(this, WSDLServiceFactory.class);
+    }
+    
+    public Service create(URL d) {
+        return new org.apache.cxf.wsdl11.WSDLServiceFactory(bus, d).create();
+    }
+
+    public Service create(URL d, QName serviceName) {
+        return new org.apache.cxf.wsdl11.WSDLServiceFactory(bus, d, serviceName).create();
+    }
+
 }

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactoryImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1235272&r1=1235271&r2=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Tue Jan 24 14:39:08
2012
@@ -1,14 +1,15 @@
 org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
+org.apache.cxf.wsdl11.WSDLServiceFactoryImpl:org.apache.cxf.wsdl.WSDLServiceFactory:true
 org.apache.cxf.bus.managers.PhaseManagerImpl:org.apache.cxf.phase.PhaseManager:true
 org.apache.cxf.bus.managers.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
 org.apache.cxf.bus.managers.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
  	   
-org.apache.cxf.endpoint.ServerRegistryImpl:org.apache.cxf.endpoint.ServerRegistry:true
+org.apache.cxf.bus.managers.ServerRegistryImpl:org.apache.cxf.endpoint.ServerRegistry:true
 org.apache.cxf.transports.http.internal.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true

-org.apache.cxf.endpoint.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true
+org.apache.cxf.bus.managers.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true
 org.apache.cxf.bus.managers.HeaderManagerImpl:org.apache.cxf.headers.HeaderManager:true
 org.apache.cxf.catalog.OASISCatalogManager:org.apache.cxf.catalog.OASISCatalogManager:true
 org.apache.cxf.service.factory.FactoryBeanListenerManager::true
-org.apache.cxf.endpoint.ServerLifeCycleManagerImpl:org.apache.cxf.endpoint.ServerLifeCycleManager:true
-org.apache.cxf.endpoint.ClientLifeCycleManagerImpl:org.apache.cxf.endpoint.ClientLifeCycleManager:true
+org.apache.cxf.bus.managers.ServerLifeCycleManagerImpl:org.apache.cxf.endpoint.ServerLifeCycleManager:true
+org.apache.cxf.bus.managers.ClientLifeCycleManagerImpl:org.apache.cxf.endpoint.ClientLifeCycleManager:true
 org.apache.cxf.bus.resource.ResourceManagerImpl:org.apache.cxf.resource.ResourceManager:true
 

Copied: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
(from r1235271, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java?p2=cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/EndpointResolverRegistryImplTest.java
(original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
Tue Jan 24 14:39:08 2012
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.endpoint.EndpointResolver;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
(from r1235271, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServerRegistryImpTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java?p2=cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServerRegistryImpTest.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServerRegistryImpTest.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
Tue Jan 24 14:39:08 2012
@@ -17,7 +17,10 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
+
+import org.apache.cxf.endpoint.DummyServer;
+import org.apache.cxf.endpoint.Server;
 
 import org.junit.Assert;
 import org.junit.Test;

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
(from r1235271, cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java?p2=cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java&p1=cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java&r1=1235271&r2=1235272&rev=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/ServiceContractResolverRegistryImplTest.java
(original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
Tue Jan 24 14:39:08 2012
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package org.apache.cxf.endpoint;
+package org.apache.cxf.bus.managers;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 import javax.xml.namespace.QName;
 
+import org.apache.cxf.endpoint.ServiceContractResolver;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 import org.junit.After;

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java?rev=1235272&r1=1235271&r2=1235272&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java (original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java Tue Jan 24 14:39:08
2012
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.endpoint;
 
+import org.apache.cxf.bus.managers.ServerRegistryImpl;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
 

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java?rev=1235272&r1=1235271&r2=1235272&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
(original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java
Tue Jan 24 14:39:08 2012
@@ -24,8 +24,8 @@ import java.net.URL;
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
+import org.apache.cxf.bus.managers.ServiceContractResolverRegistryImpl;
 import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
-import org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.hello_world_soap_http.Greeter;
 import org.junit.BeforeClass;



Mime
View raw message