cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r902256 - in /cxf/trunk: api/src/main/java/org/apache/cxf/transport/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ rt/bindings/soap/src/main/resources/META-INF/cxf/ rt/core/src/main/java/org/apache/cxf/bus/extension/ rt/core/s...
Date Fri, 22 Jan 2010 20:33:07 GMT
Author: dkulp
Date: Fri Jan 22 20:33:05 2010
New Revision: 902256

URL: http://svn.apache.org/viewvc?rev=902256&view=rev
Log:
More work toward limitting the objects created at startup time
Start removing traces of soap from http transports

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
    cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
    cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
    cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
    cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
    cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
    cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
    cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ClientOnlyHTTPTransportFactory.java
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
    cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java Fri Jan 22 20:33:05 2010
@@ -85,8 +85,15 @@
         if (is == null && base != null 
             && base.getScheme() != null) {
             try {
-                ConduitInitiator ci = bus.getExtension(ConduitInitiatorManager.class)
-                    .getConduitInitiatorForUri(base.toString());
+                ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
+                ConduitInitiator ci = null;
+                if ("http".equals(base.getScheme()) || "https".equals(base.getScheme())) {
+                    //common case, don't "search"
+                    ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http");
+                } 
+                if (ci == null) {
+                    ci = mgr.getConduitInitiatorForUri(base.toString());
+                }
                 if (ci != null) {
                     EndpointInfo info = new EndpointInfo();
                     info.setAddress(base.toString());

Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original)
+++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Fri Jan 22 20:33:05 2010
@@ -73,28 +73,50 @@
     public Set<String> getUriPrefixes() {
         return Collections.singleton("soap.tcp");
     }
-    public String mapTransportURI(String s) {
-        if ("http://www.w3.org/2008/07/soap/bindings/JMS/".equals(s)) {
+    public String mapTransportURI(String s, String address) {
+        if ("http://www.w3.org/2008/07/soap/bindings/JMS/".equals(s)
+            || (address != null && address.startsWith("jms"))) {
             s = "http://cxf.apache.org/transports/jms";
+        } else if (SOAP_11_HTTP_BINDING.equals(s)
+            || SOAP_12_HTTP_BINDING.equals(s)
+            || "http://schemas.xmlsoap.org/wsdl/soap/".equals(s)
+            || "http://schemas.xmlsoap.org/wsdl/http".equals(s)
+            || "http://schemas.xmlsoap.org/wsdl/soap/http".equals(s)
+            || "http://schemas.xmlsoap.org/wsdl/soap/http/".equals(s)
+            || "http://schemas.xmlsoap.org/wsdl/http/".equals(s)) {
+            s = "http://cxf.apache.org/transports/http";
         }
         return s;
     }
 
     public Destination getDestination(EndpointInfo ei) throws IOException {
-        if (ei.getAddress() != null && ei.getAddress().startsWith("soap.tcp")) {
+        String address = ei.getAddress();
+        if (!StringUtils.isEmpty(address) && address.startsWith("soap.tcp")) {
             return new SoapTcpDestination(ei.getTarget(), ei);
-            //return SoapTcpDestination.getInstance(ei.getTarget(), ei);
         }
-        
-        SoapBindingInfo binding = (SoapBindingInfo)ei.getBinding();
+        BindingInfo bi = ei.getBinding();
+        String transId = ei.getTransportId();
+        if (bi instanceof SoapBindingInfo) {
+            transId = ((SoapBindingInfo)bi).getTransportURI();
+            if (transId == null) {
+                transId = ei.getTransportId();
+            }
+        }
         DestinationFactory destinationFactory;
         try {
-            destinationFactory = bus.getExtension(DestinationFactoryManager.class)
-                .getDestinationFactory(mapTransportURI(binding.getTransportURI()));
+            DestinationFactoryManager mgr = bus.getExtension(DestinationFactoryManager.class);
+            if (StringUtils.isEmpty(address) 
+                || address.startsWith("http") 
+                || address.startsWith("jms")
+                || address.startsWith("/")) {
+                destinationFactory = mgr.getDestinationFactory(mapTransportURI(transId, address));
+            } else {
+                destinationFactory = mgr.getDestinationFactoryForUri(address);
+            }
             return destinationFactory.getDestination(ei);
         } catch (BusException e) {
             throw new RuntimeException("Could not find destination factory for transport "
-                                       + binding.getTransportURI());
+                                       + transId);
         }
     }
 
@@ -158,21 +180,31 @@
     }
 
     public Conduit getConduit(EndpointInfo ei) throws IOException {
-        if (!StringUtils.isEmpty(ei.getAddress()) && ei.getAddress().startsWith("soap.tcp://")) {
+        String address = ei.getAddress();
+        if (!StringUtils.isEmpty(address) && address.startsWith("soap.tcp://")) {
             //TODO - examine policies and stuff to look for the sun tcp policies
             return new TCPConduit(ei);
         }
-        
-        SoapBindingInfo binding = (SoapBindingInfo)ei.getBinding();
+        BindingInfo bi = ei.getBinding();
+        String transId = ei.getTransportId();
+        if (bi instanceof SoapBindingInfo) {
+            transId = ((SoapBindingInfo)bi).getTransportURI();
+            if (transId == null) {
+                transId = ei.getTransportId();
+            }
+        }
         ConduitInitiator conduitInit;
         try {
-            conduitInit = bus.getExtension(ConduitInitiatorManager.class)
-                .getConduitInitiator(mapTransportURI(binding.getTransportURI()));
-
+            ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
+            if (StringUtils.isEmpty(address) || address.startsWith("http") || address.startsWith("jms")) {
+                conduitInit = mgr.getConduitInitiator(mapTransportURI(transId, address));
+            } else {
+                conduitInit = mgr.getConduitInitiatorForUri(address);
+            }
             return conduitInit.getConduit(ei);
         } catch (BusException e) {
             throw new RuntimeException("Could not find conduit initiator for transport "
-                                       + binding.getTransportURI());
+                                       + transId);
         }
     }
 

Modified: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml Fri Jan 22 20:33:05 2010
@@ -27,6 +27,7 @@
         <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
         <namespace>http://www.w3.org/2008/07/soap/bindings/JMS/</namespace>
         <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
+        <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
     </extension>
     
     <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" 
@@ -34,5 +35,7 @@
         <namespace>http://schemas.xmlsoap.org/soap/</namespace>
         <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
         <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
+        <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
+        <namespace>http://schemas.xmlsoap.org/soap/http/</namespace>
     </extension>    
 </extensions>

Modified: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml (original)
+++ cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf-extension-soap.xml Fri Jan 22 20:33:05 2010
@@ -37,7 +37,11 @@
                 <value>http://schemas.xmlsoap.org/soap/</value>
                 <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
 		        <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
+		        <value>http://schemas.xmlsoap.org/soap/http/</value>
+                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
             	<value>http://www.w3.org/2008/07/soap/bindings/JMS/</value>
+                <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
+            	<value>http://schemas.xmlsoap.org/soap/http</value>
             </list>
         </property>
         <property name="bus" ref="cxf"/>

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Fri Jan 22 20:33:05 2010
@@ -151,15 +151,16 @@
         
         if (!e.isDeferred()) {
             loadAndRegister(e);
-        }
-        Collection<String> namespaces = e.getNamespaces();
-        for (String ns : namespaces) {
-            Collection<Extension> extensions = deferred.get(ns);
-            if (null == extensions) {
-                extensions = new ArrayList<Extension>();
-                deferred.put(ns, extensions);
+        } else {
+            Collection<String> namespaces = e.getNamespaces();
+            for (String ns : namespaces) {
+                Collection<Extension> extensions = deferred.get(ns);
+                if (null == extensions) {
+                    extensions = new ArrayList<Extension>();
+                    deferred.put(ns, extensions);
+                }
+                extensions.add(e);
             }
-            extensions.add(e);
         }
     }
     

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java Fri Jan 22 20:33:05 2010
@@ -92,6 +92,13 @@
         if (!isProcessing) {
             return bean;
         }
+        
+        /*
+        if (bean.getClass().getName().contains("Corb")) {
+            Thread.dumpStack();
+        }
+        */
+        
         if (bean != null 
             && injectable(bean, beanId)) {
             new ResourceInjector(getResourceManager(bean)).inject(bean);
@@ -100,7 +107,7 @@
         } else if (bean != null) {
             System.out.println("np: " + (++count2) 
                                + ": " + bean.getClass().getName() + " " + beanId);
-            */
+                               */
         }
         return bean;
     }

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java Fri Jan 22 20:33:05 2010
@@ -66,7 +66,9 @@
                                                                                             true)));
         Collections.reverse(list);
         for (String s : list) {
-            if (listener.loadBean(s, type)) {
+            Class<?> beanType = context.getType(s);
+            Class<? extends T> t = beanType.asSubclass(type);
+            if (listener.loadBean(s, t)) {
                 Object o = context.getBean(s);
                 if (listener.beanLoaded(s, type.cast(o))) {
                     return true;

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java Fri Jan 22 20:33:05 2010
@@ -39,17 +39,12 @@
 public class CatalogXmlSchemaURIResolver implements URIResolver {
 
     private ExtendedURIResolver resolver;
-    private OASISCatalogManager catalogResolver;
+    private Bus bus;
     private Map<String, String> resolved = new HashMap<String, String>();
 
     public CatalogXmlSchemaURIResolver(Bus bus) {
-        this(OASISCatalogManager.getCatalogManager(bus));
         this.resolver = new TransportURIResolver(bus);
-        this.catalogResolver = OASISCatalogManager.getCatalogManager(bus);
-    }
-    public CatalogXmlSchemaURIResolver(OASISCatalogManager catalogManager) {
-        this.resolver = new ExtendedURIResolver();
-        this.catalogResolver = catalogManager;
+        this.bus = bus; 
     }
     
     public Map<String, String> getResolvedMap() {
@@ -57,11 +52,11 @@
     }
 
     public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) {
-        
         String resolvedSchemaLocation = null;
-        if (this.catalogResolver != null) {
+        OASISCatalogManager catalogResolver = OASISCatalogManager.getCatalogManager(bus);
+        if (catalogResolver != null) {
             try {
-                resolvedSchemaLocation = this.catalogResolver.resolveSystem(schemaLocation);
+                resolvedSchemaLocation = catalogResolver.resolveSystem(schemaLocation);
                 
                 if (resolvedSchemaLocation == null) {
                     resolvedSchemaLocation = catalogResolver.resolveURI(schemaLocation);

Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java (original)
+++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java Fri Jan 22 20:33:05 2010
@@ -23,6 +23,8 @@
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.transport.local.LocalTransportFactory;
+
 import org.junit.Test;
 
 /**
@@ -34,6 +36,7 @@
     public void testNamespaceCrash() {
         ServerFactoryBean svrFactory = new ServerFactoryBean();
         svrFactory.setServiceClass(University.class);
+        svrFactory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
         svrFactory.setAddress("local://dlbTest");
         svrFactory.setServiceBean(new UniversityImpl());
         svrFactory.getServiceFactory().setDataBinding(new AegisDatabinding());
@@ -43,6 +46,7 @@
         factory.getServiceFactory().setDataBinding(new AegisDatabinding());
        
         factory.setServiceClass(University.class);
+        factory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
         factory.setAddress("local://dlbTest");
         University client = (University) factory.create();
        

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientFactoryBean.java Fri Jan 22 20:33:05 2010
@@ -48,7 +48,16 @@
 
     @Override
     public void setBindingId(String bind) {
-        super.setBindingId(bind);
+        if (SOAPBinding.SOAP11HTTP_BINDING.equals(bind) 
+            || SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bind)) {
+            super.setBindingId("http://schemas.xmlsoap.org/wsdl/soap/");
+        } else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bind)
+            || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bind)) {
+            super.setBindingId("http://schemas.xmlsoap.org/wsdl/soap12/");
+        } else {
+            super.setBindingId(bind);
+        }
+        
         if (SOAPBinding.SOAP11HTTP_BINDING.equals(bind)
             || SOAPBinding.SOAP12HTTP_BINDING.equals(bind)) {
             setBindingConfig(new JaxWsSoapBindingConfiguration((JaxWsServiceFactoryBean)getServiceFactory()));

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java Fri Jan 22 20:33:05 2010
@@ -153,6 +153,11 @@
 
             if (transportId != null) {
                 conf.setTransportURI(transportId);
+            } else if (getAddress() != null 
+                && !getAddress().startsWith("http")
+                && !getAddress().startsWith("/")) {
+                // need to try and detect an id
+                transportId = detectTransportIdFromAddress(getAddress());
             }
             conf.setJaxWsServiceFactoryBean(sf);
             

Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java Fri Jan 22 20:33:05 2010
@@ -42,6 +42,8 @@
         setBindingConfig(new JaxWsSoapBindingConfiguration(serviceFactory));
     }
     
+    
+    
     public File getOutputFile() {
         JaxWsImplementorInfo jaxwsImpl = serviceFactory.getJaxWsImplementorInfo();
         String wsdlLocation = jaxwsImpl.getWsdlLocation();

Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java Fri Jan 22 20:33:05 2010
@@ -66,20 +66,21 @@
         soapDF.setBus(bus);
         dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/", soapDF);
         dfm.registerDestinationFactory(SoapBindingConstants.SOAP11_BINDING_ID, soapDF);
+        dfm.registerDestinationFactory(SoapBindingConstants.SOAP12_BINDING_ID, soapDF);
         dfm.registerDestinationFactory("http://cxf.apache.org/transports/local", soapDF);
         
         localTransport = new LocalTransportFactory();
         localTransport.setUriPrefixes(new HashSet<String>(Arrays.asList("http", "local")));
-        dfm.registerDestinationFactory("http://schemas.xmlsoap.org/soap/http", localTransport);
-        dfm.registerDestinationFactory("http://schemas.xmlsoap.org/wsdl/soap/http", localTransport);
-        dfm.registerDestinationFactory("http://cxf.apache.org/bindings/xformat", localTransport);
-        dfm.registerDestinationFactory("http://cxf.apache.org/transports/local", localTransport);
+        dfm.registerDestinationFactory(LocalTransportFactory.TRANSPORT_ID, localTransport);
+        dfm.registerDestinationFactory("http://cxf.apache.org/transports/http", localTransport);
+        dfm.registerDestinationFactory("http://cxf.apache.org/transports/http/configuration", localTransport);
 
         ConduitInitiatorManager extension = bus.getExtension(ConduitInitiatorManager.class);
         extension.registerConduitInitiator(LocalTransportFactory.TRANSPORT_ID, localTransport);
-        extension.registerConduitInitiator("http://schemas.xmlsoap.org/wsdl/soap/", localTransport);
         extension.registerConduitInitiator("http://schemas.xmlsoap.org/soap/http", localTransport);
-        extension.registerConduitInitiator(SoapBindingConstants.SOAP11_BINDING_ID, localTransport);
+        extension.registerConduitInitiator("http://cxf.apache.org/transports/http", localTransport);
+        extension.registerConduitInitiator("http://cxf.apache.org/transports/http/configuration",
+                                           localTransport);
         
         WSDLManagerImpl manager = new WSDLManagerImpl();
         manager.setBus(bus);

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java Fri Jan 22 20:33:05 2010
@@ -23,6 +23,10 @@
 import org.apache.cxf.service.ServiceBuilder;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl11.WSDLEndpointFactory;
 
 public abstract class AbstractServiceFactory extends AbstractWSDLBasedEndpointFactory implements
     ServiceBuilder {
@@ -34,6 +38,41 @@
         super(sbean);
     }
     
+    @Override
+    protected String detectTransportIdFromAddress(String ad) {
+        ConduitInitiatorManager cim = getBus().getExtension(ConduitInitiatorManager.class);
+        ConduitInitiator ci = cim.getConduitInitiatorForUri(getAddress());
+        if (ci != null) {
+            return ci.getTransportIds().get(0);
+        }    
+        return null;
+    }
+    
+    @Override
+    protected WSDLEndpointFactory getWSDLEndpointFactory() {
+        if (destinationFactory == null) {
+            try {
+                destinationFactory = getBus().getExtension(DestinationFactoryManager.class)
+                    .getDestinationFactory(transportId);
+            } catch (Throwable t) {
+                try {
+                    Object o = getBus().getExtension(ConduitInitiatorManager.class)
+                        .getConduitInitiator(transportId);
+                    if (o instanceof WSDLEndpointFactory) {
+                        return (WSDLEndpointFactory)o;
+                    }
+                } catch (Throwable th) {
+                    //ignore
+                }
+            }
+        } 
+        if (destinationFactory instanceof WSDLEndpointFactory) {
+            return (WSDLEndpointFactory)destinationFactory;
+        }
+        return null;
+    }
+
+
     public ServiceInfo createService() {
         try {
             return createEndpoint().getEndpointInfo().getService();

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Fri Jan 22 20:33:05 2010
@@ -234,28 +234,10 @@
         }
     }
 
+    protected abstract String detectTransportIdFromAddress(String ad);
+    protected abstract WSDLEndpointFactory getWSDLEndpointFactory();
+    
     protected EndpointInfo createEndpointInfo() throws BusException {
-        if (transportId == null 
-            && getAddress() != null
-            && getAddress().contains("://")) {
-            DestinationFactory df = getDestinationFactory();
-            if (df == null) {
-                DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class);
-                df = dfm.getDestinationFactoryForUri(getAddress());
-            }
-            
-            if (df != null) {
-                transportId = df.getTransportIds().get(0);
-            } else {
-                //check conduits (the address could be supported on client only)
-                ConduitInitiatorManager cim = getBus().getExtension(ConduitInitiatorManager.class);
-                ConduitInitiator ci = cim.getConduitInitiatorForUri(getAddress());
-                if (ci != null) {
-                    transportId = ci.getTransportIds().get(0);
-                }    
-            }
-        }
-        
         // Get the Service from the ServiceFactory if specified
         Service service = serviceFactory.getService();
         // SOAP nonsense
@@ -270,11 +252,14 @@
         
         if (transportId == null) {
             if (bindingInfo instanceof SoapBindingInfo) {
-                // TODO: we shouldn't have to do this, but the DF is null because the
-                // LocalTransport doesn't return for the http:// uris
-                // People also seem to be supplying a null JMS getAddress(), which is worrying
-                transportId = "http://schemas.xmlsoap.org/wsdl/soap/";                
-            } else {
+                transportId = ((SoapBindingInfo)bindingInfo).getTransportURI();
+            }
+            if (transportId == null 
+                && getAddress() != null
+                && getAddress().contains("://")) {
+                transportId = detectTransportIdFromAddress(getAddress());
+            }
+            if (transportId == null) {
                 transportId = "http://schemas.xmlsoap.org/wsdl/http/";
             }
         }
@@ -283,27 +268,7 @@
 
         setTransportId(transportId);
         
-        WSDLEndpointFactory wsdlEndpointFactory = null;
-        if (destinationFactory == null) {
-            try {
-                destinationFactory = getBus().getExtension(DestinationFactoryManager.class)
-                    .getDestinationFactory(transportId);
-            } catch (Throwable t) {
-                try {
-                    Object o = getBus().getExtension(ConduitInitiatorManager.class)
-                        .getConduitInitiator(transportId);
-                    if (o instanceof WSDLEndpointFactory) {
-                        wsdlEndpointFactory = (WSDLEndpointFactory)o;
-                    }
-                } catch (Throwable th) {
-                    //ignore
-                }
-            }
-        } 
-        if (destinationFactory instanceof WSDLEndpointFactory) {
-            wsdlEndpointFactory = (WSDLEndpointFactory)destinationFactory;
-        }
-        
+        WSDLEndpointFactory wsdlEndpointFactory = getWSDLEndpointFactory();
         EndpointInfo ei;
         if (wsdlEndpointFactory != null) {
             ei = wsdlEndpointFactory.createEndpointInfo(service.getServiceInfos().get(0), bindingInfo, null);

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java Fri Jan 22 20:33:05 2010
@@ -30,6 +30,10 @@
 import org.apache.cxf.service.factory.FactoryBeanListener;
 import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
 import org.apache.cxf.service.factory.ServiceConstructionException;
+import org.apache.cxf.transport.ConduitInitiator;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl11.WSDLEndpointFactory;
 
 public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory {
 
@@ -39,7 +43,41 @@
     public ClientFactoryBean(ReflectionServiceFactoryBean factory) {
         super(factory);
     }
-
+    
+    @Override
+    protected String detectTransportIdFromAddress(String ad) {
+        ConduitInitiatorManager cim = getBus().getExtension(ConduitInitiatorManager.class);
+        ConduitInitiator ci = cim.getConduitInitiatorForUri(getAddress());
+        if (ci != null) {
+            return ci.getTransportIds().get(0);
+        }    
+        return null;
+    }
+    @Override
+    protected WSDLEndpointFactory getWSDLEndpointFactory() {
+        if (destinationFactory instanceof WSDLEndpointFactory) {
+            return (WSDLEndpointFactory)destinationFactory;
+        }
+        try {
+            Object o = getBus().getExtension(ConduitInitiatorManager.class)
+                .getConduitInitiator(transportId);
+            if (o instanceof WSDLEndpointFactory) {
+                return (WSDLEndpointFactory)o;
+            }
+        } catch (Throwable t) {
+            //ignore
+        }
+        
+        if (destinationFactory == null) {
+            try {
+                destinationFactory = getBus().getExtension(DestinationFactoryManager.class)
+                    .getDestinationFactory(transportId);
+            } catch (Throwable t) {
+                //ignore
+            }
+        } 
+        return null;
+    }
     public Client create() {
         getServiceFactory().reset();
         if (getServiceFactory().getProperties() == null) {

Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Fri Jan 22 20:33:05 2010
@@ -36,6 +36,10 @@
 import org.apache.cxf.service.invoker.FactoryInvoker;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.invoker.SingletonFactory;
+import org.apache.cxf.transport.ConduitInitiatorManager;
+import org.apache.cxf.transport.DestinationFactory;
+import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl11.WSDLEndpointFactory;
 
 
 /**
@@ -85,6 +89,44 @@
     public String getBeanName() {
         return this.getClass().getName();
     }
+    
+    @Override
+    protected String detectTransportIdFromAddress(String ad) {
+        DestinationFactory df = getDestinationFactory();
+        if (df == null) {
+            DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class);
+            df = dfm.getDestinationFactoryForUri(getAddress());
+            if (df != null) {
+                return df.getTransportIds().get(0);
+            }
+        }
+        return null;
+    }
+    
+    @Override
+    protected WSDLEndpointFactory getWSDLEndpointFactory() {
+        if (destinationFactory == null) {
+            try {
+                destinationFactory = getBus().getExtension(DestinationFactoryManager.class)
+                    .getDestinationFactory(transportId);
+            } catch (Throwable t) {
+                try {
+                    Object o = getBus().getExtension(ConduitInitiatorManager.class)
+                        .getConduitInitiator(transportId);
+                    if (o instanceof WSDLEndpointFactory) {
+                        return (WSDLEndpointFactory)o;
+                    }
+                } catch (Throwable th) {
+                    //ignore
+                }
+            }
+        } 
+        if (destinationFactory instanceof WSDLEndpointFactory) {
+            return (WSDLEndpointFactory)destinationFactory;
+        }
+        return null;
+    }
+    
 
     public Server create() {
         try {

Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java (original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java Fri Jan 22 20:33:05 2010
@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.xml.namespace.QName;
 
 import org.apache.cxf.binding.soap.model.SoapBindingInfo;
@@ -58,9 +57,6 @@
         Endpoint ep = eps.values().iterator().next();
         EndpointInfo endpointInfo = ep.getEndpointInfo();
         
-        SOAPAddress soapAddress = endpointInfo.getExtensor(SOAPAddress.class);
-        assertNotNull(soapAddress);
-        
         BindingInfo b = endpointInfo.getService().getBindings().iterator().next();
         
         assertTrue(b instanceof SoapBindingInfo);

Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java (original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java Fri Jan 22 20:33:05 2010
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
@@ -160,9 +159,6 @@
         
         assertEquals("test", ep.get("test"));
         
-        SOAPAddress soapAddress = endpointInfo.getExtensor(SOAPAddress.class);
-        assertNotNull(soapAddress);
-        
         BindingInfo b = endpointInfo.getService().getBindings().iterator().next();
         
         assertTrue(b instanceof SoapBindingInfo);

Modified: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml Fri Jan 22 20:33:05 2010
@@ -20,11 +20,9 @@
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
     <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
-        <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
-        <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+        <namespace>http://cxf.apache.org/transports/http</namespace>
         <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
-        <namespace>http://cxf.apache.org/bindings/xformat</namespace>
+        <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace>
+        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
     </extension>
 </extensions>

Modified: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml Fri Jan 22 20:33:05 2010
@@ -31,12 +31,10 @@
         <property name="bus" ref="cxf"/>
         <property name="transportIds">
             <list>
-                <value>http://schemas.xmlsoap.org/soap/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
- 	            <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
+                <value>http://cxf.apache.org/transports/http</value>
                 <value>http://cxf.apache.org/transports/http/configuration</value>
-                <value>http://cxf.apache.org/bindings/xformat</value>
+                <value>http://schemas.xmlsoap.org/wsdl/http</value>
+                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
             </list>
         </property>
     </bean>

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactoryTest.java Fri Jan 22 20:33:05 2010
@@ -78,7 +78,7 @@
             assertNotNull("Cannot get DestinationFactoryManager", destFM);
             DestinationFactory destF = 
                 destFM.getDestinationFactory(
-                        "http://schemas.xmlsoap.org/soap/http");
+                        "http://cxf.apache.org/transports/http");
             assertNotNull("No DestinationFactory", destF);
             assertTrue(JettyHTTPTransportFactory.class.isInstance(destF));
         } catch (BusException e) {

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Fri Jan 22 20:33:05 2010
@@ -106,7 +106,7 @@
         bus.setExtension(cfg, Configurer.class);
         
         DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class);
-        DestinationFactory factory = dfm.getDestinationFactory("http://schemas.xmlsoap.org/soap/http");
+        DestinationFactory factory = dfm.getDestinationFactory("http://cxf.apache.org/transports/http");
         Destination d = factory.getDestination(info);
         assertTrue(d instanceof JettyHTTPDestination);
         JettyHTTPDestination jd = (JettyHTTPDestination) d;        
@@ -117,7 +117,7 @@
         assertEquals(120, engine.getThreadingParameters().getMaxThreads());
         
         ConduitInitiatorManager cim = bus.getExtension(ConduitInitiatorManager.class);
-        ConduitInitiator ci = cim.getConduitInitiator("http://schemas.xmlsoap.org/soap/http");
+        ConduitInitiator ci = cim.getConduitInitiator("http://cxf.apache.org/transports/http");
         HTTPConduit conduit = (HTTPConduit) ci.getConduit(info);
         assertEquals(97, conduit.getClient().getConnectionTimeout());
         

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ClientOnlyHTTPTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ClientOnlyHTTPTransportFactory.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ClientOnlyHTTPTransportFactory.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/ClientOnlyHTTPTransportFactory.java Fri Jan 22 20:33:05 2010
@@ -24,11 +24,13 @@
 
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.transport.Conduit;
 import org.apache.cxf.transport.ConduitInitiator;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
 
+@NoJSR250Annotations(unlessNull = "bus")
 public class ClientOnlyHTTPTransportFactory extends AbstractHTTPTransportFactory
     implements ConduitInitiator {
 

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletTransportFactory.java Fri Jan 22 20:33:05 2010
@@ -53,12 +53,10 @@
     public ServletTransportFactory(Bus b) {
         super.setBus(b);
         List<String> ids = Arrays.asList(new String[] {
-            "http://schemas.xmlsoap.org/wsdl/soap/http",
-            "http://schemas.xmlsoap.org/soap/http",
-            "http://www.w3.org/2003/05/soap/bindings/HTTP/",
-            "http://schemas.xmlsoap.org/wsdl/http/",
+            "http://cxf.apache.org/transports/http",
             "http://cxf.apache.org/transports/http/configuration",
-            "http://cxf.apache.org/bindings/xformat",         
+            "http://schemas.xmlsoap.org/wsdl/http",
+            "http://schemas.xmlsoap.org/wsdl/http/",
         });
         this.setTransportIds(ids);
     }

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml Fri Jan 22 20:33:05 2010
@@ -20,11 +20,9 @@
 <extensions xmlns="http://cxf.apache.org/bus/extension">
 
     <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"  deferred="true">
-        <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
-        <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
-        <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
-        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
+        <namespace>http://cxf.apache.org/transports/http</namespace>
         <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
-        <namespace>http://cxf.apache.org/bindings/xformat</namespace>
+        <namespace>http://schemas.xmlsoap.org/wsdl/http</namespace>
+        <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
     </extension>
 </extensions>

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-extension-http.xml Fri Jan 22 20:33:05 2010
@@ -38,12 +38,10 @@
         <property name="bus" ref="cxf"/>
         <property name="transportIds">
             <list>
-                <value>http://schemas.xmlsoap.org/soap/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
- 	            <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
+                <value>http://cxf.apache.org/transports/http</value>
                 <value>http://cxf.apache.org/transports/http/configuration</value>
-                <value>http://cxf.apache.org/bindings/xformat</value>
+                <value>http://schemas.xmlsoap.org/wsdl/http</value>
+                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
             </list>
         </property>
     </bean>

Modified: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml (original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf-servlet.xml Fri Jan 22 20:33:05 2010
@@ -30,12 +30,10 @@
         <property name="bus" ref="cxf"/>
         <property name="transportIds">
             <set>
-                <value>http://cxf.apache.org/bindings/xformat</value>
-                <value>http://schemas.xmlsoap.org/soap/http</value>
-                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
- 	            <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
+                <value>http://cxf.apache.org/transports/http</value>                
                 <value>http://cxf.apache.org/transports/http/configuration</value>                
+                <value>http://schemas.xmlsoap.org/wsdl/http</value>
+                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
             </set>
         </property>
     </bean>

Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java Fri Jan 22 20:33:05 2010
@@ -584,7 +584,7 @@
     synchronized void init() {
         
         if (null == connection) {
-            LOG.log(Level.FINE, "Using derby.system.home: {0}", System.getProperty("derby.system.home"));
+            LOG.log(Level.INFO, "Using derby.system.home: {0}", System.getProperty("derby.system.home"));
             assert null != url;
             assert null != driverClassName;
             try {
@@ -595,6 +595,7 @@
             }
 
             try {
+                LOG.log(Level.INFO, "Using url: " + url);
                 connection = DriverManager.getConnection(url, userName, password);
 
             } catch (SQLException ex) {

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/restful_service.xml Fri Jan 22 20:33:05 2010
@@ -58,7 +58,7 @@
     <property name="address" value="/services/serverFactory/restful"/>
     <property name="bus" ref="cxf"/>
     <property name="bindingId" value="http://apache.org/cxf/binding/http"/>
-    <property name="transportId" value="http://schemas.xmlsoap.org/wsdl/soap/http"/>
+    <property name="transportId" value="http://schemas.xmlsoap.org/wsdl/http/"/>
     <property name="serviceFactory" ref="JaxWsServiceFactoryBean"/>
   </bean> 
   
@@ -99,7 +99,7 @@
     <property name="address" value="/services/serverFactory/json"/>
     <property name="bus" ref="cxf"/>
     <property name="bindingId" value="http://apache.org/cxf/binding/http"/>
-    <property name="transportId" value="http://schemas.xmlsoap.org/wsdl/soap/http"/>
+    <property name="transportId" value="http://schemas.xmlsoap.org/wsdl/http/"/>
     <property name="serviceFactory"> 
        <bean class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean">
          <property name="wrapped" value="false"/>

Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/SpringBusFactoryTest.java Fri Jan 22 20:33:05 2010
@@ -135,7 +135,7 @@
          
         
         assertNotNull("conduit initiator not available", 
-                      cim.getConduitInitiator("http://cxf.apache.org/bindings/xformat"));
+                      cim.getConduitInitiator("http://cxf.apache.org/transports/http"));
         assertNotNull("conduit initiator not available", 
                       cim.getConduitInitiator("http://cxf.apache.org/transports/jms"));
         assertNotNull("conduit initiator not available", 
@@ -144,7 +144,7 @@
         
 
         assertNotNull("destination factory not available", 
-                      dfm.getDestinationFactory("http://cxf.apache.org/bindings/xformat"));
+                      dfm.getDestinationFactory("http://cxf.apache.org/transports/http"));
         assertNotNull("destination factory not available", 
                       dfm.getDestinationFactory("http://cxf.apache.org/transports/jms"));
         assertNotNull("destination factory not available", 

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java?rev=902256&r1=902255&r2=902256&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ServerPersistenceTest.java Fri Jan 22 20:33:05 2010
@@ -72,8 +72,12 @@
 
     @BeforeClass
     public static void startServers() throws Exception {
+        String derbyHome = System.getProperty("derby.system.home");
+        if (derbyHome == null) {
+            System.setProperty("derby.system.home", "target/derby");
+        }
         RMTxStore.deleteDatabaseFiles();
-        String derbyHome = System.getProperty("derby.system.home"); 
+        derbyHome = System.getProperty("derby.system.home"); 
         try {
             System.setProperty("derby.system.home", derbyHome + "-server");
             RMTxStore.deleteDatabaseFiles();
@@ -88,8 +92,7 @@
         // run server in process to avoid a problem with UUID generation
         // during asynchronous invocations
 
-        boolean inProcess = "Windows 2000".equals(System.getProperty("os.name"));
-        assertTrue("server did not launch correctly", launchServer(Server.class, inProcess));  
+        assertTrue("server did not launch correctly", launchServer(Server.class));  
     }
     
     @Test 
@@ -100,7 +103,7 @@
         LOG.fine("Created bus " + bus + " with default cfg");
         ControlService cs = new ControlService();
         Control control = cs.getControlPort();
-        
+
         assertTrue("Failed to start greeter", control.startGreeter(SERVER_LOSS_CFG)); 
         LOG.fine("Started greeter server.");
         
@@ -194,7 +197,8 @@
         // wait until all messages have received their responses
         int nDone = 0;
         long waited = 0;
-        while (waited < 5000) {
+        while (waited < 20) {
+            nDone = 0;
             for (int i = 0; i < responses.length; i++) {
                 if (responses[i].isDone()) {
                     nDone++;
@@ -204,7 +208,7 @@
                 break;
             }
             Thread.sleep(500);
-            nDone = 0;
+            waited++;
         }
         
         assertEquals("Not all responses have been received.", 3, nDone);



Mime
View raw message