cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r501966 - in /incubator/cxf/trunk: ./ api/src/main/java/org/apache/cxf/ api/src/test/java/org/apache/cxf/ buildtools/src/main/resources/ etc/eclipse/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ integration/jca/src/main/java/org/ap...
Date Wed, 31 Jan 2007 19:52:21 GMT
Author: dkulp
Date: Wed Jan 31 11:52:18 2007
New Revision: 501966

URL: http://svn.apache.org/viewvc?view=rev&rev=501966
Log:
* Fix for CXF-323
* Actually update checkstyle and eclipse import order rules so they match
* Delete unused top-level checkstyle.xml
* Move default bus concept into base BusFactory class so a BusFactory doesn't need to be instatiated to get one.


Removed:
    incubator/cxf/trunk/checkstyle.xml
Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
    incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java
    incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml
    incubator/cxf/trunk/etc/eclipse/CXF.importorder
    incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
    incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
    incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
    incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
    incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
    incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
    incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/JaxbPropertyEditorTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
    incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
    incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
    incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/Server.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/Server.java
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdl2java.xml
    incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdltojavalib.properties

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java Wed Jan 31 11:52:18 2007
@@ -33,6 +33,8 @@
     public static final String BUS_FACTORY_PROPERTY_NAME = "org.apache.cxf.bus.factory";
     public static final String DEFAULT_BUS_FACTORY = "org.apache.cxf.bus.CXFBusFactory";
 
+    protected static Bus defaultBus;
+
     private static final Logger LOG = LogUtils.getL7dLogger(BusFactory.class, "APIMessages");
     
 
@@ -51,19 +53,44 @@
      * 
      * @return the default bus.
      */
-    public abstract Bus getDefaultBus();
+    public static synchronized Bus getDefaultBus() {
+        if (defaultBus == null) {
+            defaultBus = newInstance().createBus();
+        }
+        return defaultBus;
+    }
     
     /**
      * Sets the default bus.
      * @param bus the default bus.
      */
-    public abstract void setDefaultBus(Bus bus);    
-    
+    public static synchronized void setDefaultBus(Bus bus) {
+        defaultBus = bus;
+    }
+
+    /**
+     * Sets the default bus if a default bus is not already set.
+     * @param bus the default bus.
+     * @return true if the bus was not set and is now set
+     */
+    public static synchronized boolean possiblySetDefaultBus(Bus bus) {
+        if (defaultBus == null) {
+            defaultBus = bus;            
+            return true;
+        }
+        return false;
+    }
+
     
     public static BusFactory newInstance() {
+        return newInstance(null);
+    }
+    public static BusFactory newInstance(String className) {
         BusFactory instance = null;
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-        String className = getBusFactoryClass(null, classLoader);
+        if (className == null) {
+            className = getBusFactoryClass(null, classLoader);
+        }
         Class<? extends BusFactory> busFactoryClass;
         try {
             busFactoryClass = Class.forName(className, true, classLoader).asSubclass(BusFactory.class);

Modified: incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java (original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java Wed Jan 31 11:52:18 2007
@@ -44,11 +44,5 @@
             return null;
         }
 
-        public Bus getDefaultBus() {
-            return null;
-        }
-
-        public void setDefaultBus(Bus bus) {         
-        }
     }
 }

Modified: incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml (original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml Wed Jan 31 11:52:18 2007
@@ -88,7 +88,7 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
         <module name="ImportOrder">
-            <property name="groups" value="java,javax,org.w3c,org.xml,w3c"/>
+            <property name="groups" value="java,javax,org.w3c,org.xml,junit"/>
             <property name="ordered" value="true"/>
         </module>
         <!--

Modified: incubator/cxf/trunk/etc/eclipse/CXF.importorder
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/etc/eclipse/CXF.importorder?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/etc/eclipse/CXF.importorder (original)
+++ incubator/cxf/trunk/etc/eclipse/CXF.importorder Wed Jan 31 11:52:18 2007
@@ -20,8 +20,6 @@
 #
 #Organize Import Order
 #Thu Aug 11 12:37:29 EDT 2005
-6=org
-5=com
 4=junit
 3=org.xml
 2=org.w3c

Modified: incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java (original)
+++ incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java Wed Jan 31 11:52:18 2007
@@ -99,9 +99,8 @@
     protected Bus createBus(ClassLoader loader) throws ResourceException {
         try {
             //REVISIT we need to use the CXF defualt BusFactory
-            Class busClazz = Class.forName(getBusClassName(), true, loader);
-            bf = (org.apache.cxf.BusFactory) busClazz.newInstance();
-            bus = bf.getDefaultBus();
+            bf = org.apache.cxf.BusFactory.newInstance(getBusClassName());
+            bus = bf.createBus();
         } catch (Exception ex) {
             throw new ResourceAdapterInternalException("Failed to initialize cxf runtime", ex);
         }

Modified: incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java (original)
+++ incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java Wed Jan 31 11:52:18 2007
@@ -51,7 +51,7 @@
         ManagedConnectionFactoryImpl mcf = (ManagedConnectionFactoryImpl)o;
         //NOTE reset the inited bus to current ,so CXF-rt can play with JCA setup bus
         Bus bus = mcf.getBus();        
-        BusFactory.newInstance().setDefaultBus(bus);        
+        BusFactory.setDefaultBus(bus);        
         return invokeNext(proxy, method, args);
     }
 }

Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java (original)
+++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java Wed Jan 31 11:52:18 2007
@@ -194,7 +194,7 @@
         Subject subj = new Subject();
         BusFactory bf = BusFactory.newInstance();        
         Bus bus = bf.createBus();
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         ManagedConnectionFactoryImpl factory = EasyMock.createMock(ManagedConnectionFactoryImpl.class);
         factory.getBus();
         // In ManagedConnectionImpl:

Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java (original)
+++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java Wed Jan 31 11:52:18 2007
@@ -78,7 +78,7 @@
         
         BusFactory bf = BusFactory.newInstance();
         bus = bf.createBus();
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         
         
         EasyMock.reset(factory); 

Modified: incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java (original)
+++ incubator/cxf/trunk/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java Wed Jan 31 11:52:18 2007
@@ -56,16 +56,15 @@
 
    
     public void testInvokeSetsBusCurrent() throws Throwable {
-        BusFactory bf = BusFactory.newInstance();
-        Bus oldBus = bf.getDefaultBus();
+        Bus oldBus = BusFactory.getDefaultBus();
         
         testObject.invoke(target, testMethod, new Object[] {});
 
-        Bus  newBus = bf.getDefaultBus();
+        Bus  newBus = BusFactory.getDefaultBus();
        
         assertSame("Current Bus has been set and is as expected, val=" + newBus, newBus, mockBus);
          // set back the JVM current local variable        
-        bf.setDefaultBus(oldBus);
+        BusFactory.setDefaultBus(oldBus);
     }
 
     public static Test suite() {

Modified: incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java (original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java Wed Jan 31 11:52:18 2007
@@ -21,9 +21,10 @@
 
 import javax.wsdl.extensions.soap.SOAPAddress;
 
+import junit.framework.TestCase;
+
 import com.ibm.wsdl.extensions.soap.SOAPAddressImpl;
 
-import junit.framework.TestCase;
 
 import org.apache.cxf.binding.soap.model.SoapBindingInfo;
 import org.apache.cxf.service.model.EndpointInfo;

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java Wed Jan 31 11:52:18 2007
@@ -28,19 +28,6 @@
 
 public class CXFBusFactory extends BusFactory {
     
-    private static Bus defaultBus;
-
-    public synchronized Bus getDefaultBus() {
-        if (null == defaultBus) {
-            defaultBus = new ExtensionManagerBus();
-        }
-        return defaultBus;
-    }
-
-    public void setDefaultBus(Bus bus) {
-        defaultBus = bus;
-    }
-    
     public Bus createBus() {
         return createBus(new HashMap<Class, Object>());
     }
@@ -50,7 +37,9 @@
     }
     
     public Bus createBus(Map<Class, Object> e, Map<String, Object> properties) {
-        return new ExtensionManagerBus(e, properties);
+        Bus bus = new ExtensionManagerBus(e, properties);
+        possiblySetDefaultBus(bus);
+        return bus;
     }
     
 }

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java Wed Jan 31 11:52:18 2007
@@ -37,8 +37,6 @@
     
     private static final Logger LOG = LogUtils.getL7dLogger(SpringBusFactory.class);
     
-    private static Bus defaultBus;
-
     private ApplicationContext context;
 
     public SpringBusFactory() {
@@ -47,18 +45,7 @@
     public SpringBusFactory(ApplicationContext context) {
         this.context = context;
     }
-    
-    public synchronized Bus getDefaultBus() {
-        if (null == defaultBus) {
-            defaultBus = createBus();
-        }
-        return defaultBus;
-    }
-
-    public void setDefaultBus(Bus bus) {
-        defaultBus = bus;
-    }
-    
+        
     public Bus createBus() {
         return createBus((String)null);
     }
@@ -87,6 +74,7 @@
         Configurer configurer = new ConfigurerImpl(bac);
         bus.setExtension(configurer, Configurer.class);
 
+        possiblySetDefaultBus(bus);
         return bus;
     }
     
@@ -112,6 +100,7 @@
         Configurer configurer = new ConfigurerImpl(bac);
         bus.setExtension(configurer, Configurer.class);
 
+        possiblySetDefaultBus(bus);
         return bus;
     }
     

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/AbstractCXFTest.java Wed Jan 31 11:52:18 2007
@@ -85,7 +85,7 @@
         if (bus != null) {
             bus.shutdown(false);
         } 
-        BusFactory.newInstance().setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
     }
 
 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java Wed Jan 31 11:52:18 2007
@@ -26,9 +26,9 @@
 import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
 import javax.xml.namespace.QName;
 
-import com.sun.xml.bind.DatatypeConverterImpl;
-
 import junit.framework.TestCase;
+
+import com.sun.xml.bind.DatatypeConverterImpl;
 
 import org.apache.cxf.configuration.Configurable;
 

Modified: incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/JaxbPropertyEditorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/JaxbPropertyEditorTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/JaxbPropertyEditorTest.java (original)
+++ incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/configuration/spring/JaxbPropertyEditorTest.java Wed Jan 31 11:52:18 2007
@@ -21,14 +21,15 @@
 
 import javax.xml.bind.DatatypeConverter;
 
-import com.sun.xml.bind.DatatypeConverterImpl;
-
 import junit.framework.TestCase;
 
+import com.sun.xml.bind.DatatypeConverterImpl;
+
 import org.apache.cxf.configuration.Configurable;
 import org.apache.cxf.configuration.foo.Address;
 import org.apache.cxf.configuration.foo.Foo;
 import org.apache.cxf.configuration.foo.Point;
+
 
 public class JaxbPropertyEditorTest extends TestCase {
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java Wed Jan 31 11:52:18 2007
@@ -108,7 +108,8 @@
             }
             
             // This constructor works whether there is a context or not
-            bus = new SpringBusFactory(ctx).getDefaultBus();
+            bus = new SpringBusFactory(ctx).createBus();
+            SpringBusFactory.setDefaultBus(bus);
         }
         if (null != busid) {
             BUS_MAP.put(busid, new WeakReference<Bus>(bus));
@@ -279,8 +280,7 @@
         BUS_MAP.remove(s);
         bus.shutdown(true);
         //clean up the defaultBus
-        new SpringBusFactory().setDefaultBus(null);
-        
+        SpringBusFactory.setDefaultBus(null);
     }
 
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java Wed Jan 31 11:52:18 2007
@@ -44,7 +44,7 @@
     public ServiceDelegate createServiceDelegate(URL url,
                                                  QName qname,
                                                  Class cls) {
-        Bus bus = BusFactory.newInstance().getDefaultBus();
+        Bus bus = BusFactory.getDefaultBus();
         return new ServiceImpl(bus, url, qname, cls);
     }
 
@@ -53,7 +53,7 @@
 
         Endpoint ep = null;
         if (EndpointUtils.isValidImplementor(implementor)) {
-            Bus bus = BusFactory.newInstance().getDefaultBus();
+            Bus bus = BusFactory.getDefaultBus();
             ep = new EndpointImpl(bus, implementor, bindingId);
             return ep;
         } else {

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Wed Jan 31 11:52:18 2007
@@ -57,26 +57,26 @@
     private BusFactory factory;
     
     public void tearDown() {
-        Bus bus = factory.getDefaultBus();
+        Bus bus = BusFactory.getDefaultBus();
         if (null != bus) {
             bus.shutdown(true);
-            factory.setDefaultBus(null);
+            BusFactory.setDefaultBus(null);
         }
         System.clearProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME);
     }
    
     public void testCXFDefaultClientEndpoint() {
         factory = new CXFBusFactory();
-        factory.setDefaultBus(null);
-        factory.getDefaultBus();
+        BusFactory.setDefaultBus(null);
+        factory.createBus();
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, CXFBusFactory.class.getName());
         doTestDefaultClientEndpoint();
     }
      
     public void testSpringDefaultClientEndpoint() {
         factory = new SpringBusFactory();
-        factory.setDefaultBus(null);
-        factory.getDefaultBus();
+        BusFactory.setDefaultBus(null);
+        factory.createBus();
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, SpringBusFactory.class.getName());
         doTestDefaultClientEndpoint();
     }
@@ -126,11 +126,11 @@
     public void xtestCXFConfiguredClientEndpoint() {
         CXFBusFactory cf = new CXFBusFactory();
         factory = cf;
-        factory.setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put(Configurer.USER_CFG_FILE_PROPERTY_NAME,
             "org/apache/cxf/jaxws/configured-endpoints.xml");
-        cf.setDefaultBus(cf.createBus(null, properties));
+        BusFactory.setDefaultBus(cf.createBus(null, properties));
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, CXFBusFactory.class.getName());
         doTestConfiguredClientEndpoint();
     }
@@ -138,8 +138,8 @@
     public void testSpringConfiguredClientEndpoint() {
         SpringBusFactory sf = new SpringBusFactory();
         factory = sf;
-        factory.setDefaultBus(null);
-        sf.setDefaultBus(sf.createBus("org/apache/cxf/jaxws/configured-endpoints.xml"));
+        BusFactory.setDefaultBus(null);
+        BusFactory.setDefaultBus(sf.createBus("org/apache/cxf/jaxws/configured-endpoints.xml"));
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, SpringBusFactory.class.getName());
         doTestConfiguredClientEndpoint();
     }
@@ -194,8 +194,8 @@
     
     public void testCXFDefaultServerEndpoint() {
         factory = new CXFBusFactory();
-        factory.setDefaultBus(null);
-        factory.getDefaultBus();
+        BusFactory.setDefaultBus(null);
+        factory.createBus();
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, CXFBusFactory.class.getName());
         initializeBus();
         doTestDefaultServerEndpoint();
@@ -203,8 +203,8 @@
      
     public void testSpringDefaultServerEndpoint() {
         factory = new SpringBusFactory();
-        factory.setDefaultBus(null);
-        factory.getDefaultBus();
+        BusFactory.setDefaultBus(null);
+        factory.createBus();
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, SpringBusFactory.class.getName());
         initializeBus();
         doTestDefaultServerEndpoint();
@@ -244,11 +244,11 @@
     public void xtestCXFConfiguredServerEndpoint() {
         CXFBusFactory cf = new CXFBusFactory();
         factory = cf;
-        factory.setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         Map<String, Object> properties = new HashMap<String, Object>();
         properties.put(Configurer.USER_CFG_FILE_PROPERTY_NAME,
             "org/apache/cxf/jaxws/configured-endpoints.xml");
-        cf.setDefaultBus(cf.createBus(null, properties));
+        BusFactory.setDefaultBus(cf.createBus(null, properties));
         initializeBus();
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, CXFBusFactory.class.getName());
         doTestConfiguredServerEndpoint();
@@ -257,8 +257,8 @@
     public void testSpringConfiguredServerEndpoint() {
         SpringBusFactory sf = new SpringBusFactory();
         factory = sf;
-        factory.setDefaultBus(null);
-        sf.setDefaultBus(sf.createBus("org/apache/cxf/jaxws/configured-endpoints.xml"));
+        BusFactory.setDefaultBus(null);
+        BusFactory.setDefaultBus(sf.createBus("org/apache/cxf/jaxws/configured-endpoints.xml"));
         initializeBus();
         System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, SpringBusFactory.class.getName());
         doTestConfiguredServerEndpoint();
@@ -312,7 +312,7 @@
     }
       
     private void initializeBus() {
-        Bus bus = factory.getDefaultBus();
+        Bus bus = BusFactory.getDefaultBus();
         
         SoapBindingFactory bindingFactory = new SoapBindingFactory();
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java Wed Jan 31 11:52:18 2007
@@ -42,7 +42,7 @@
     
     @Override
     protected Bus createBus() throws BusException {
-        return BusFactory.newInstance().getDefaultBus();
+        return BusFactory.getDefaultBus();
     }
 
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/header/HeaderClientServerTest.java Wed Jan 31 11:52:18 2007
@@ -58,7 +58,7 @@
     
     public void setUp() throws Exception {
         super.setUp();
-        BusFactory.newInstance().setDefaultBus(getBus());
+        BusFactory.setDefaultBus(getBus());
         
         Object implementor = new TestHeaderImpl();
         String address = "http://localhost:9104/SoapHeaderContext/SoapHeaderPort";

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/servlet/AbstractServletTest.java Wed Jan 31 11:52:18 2007
@@ -53,18 +53,18 @@
     
     public void tearDown() {
         bus.shutdown(false);
-        BusFactory.newInstance().setDefaultBus(null);                
+        BusFactory.setDefaultBus(null);                
     }
        
     //CXFservlet has create the bus, so we need to use this bus for service init 
     @Override
     public Bus getBus() {
-        return BusFactory.newInstance().getDefaultBus();
+        return BusFactory.getDefaultBus();
     }
     
     @Override
     public Bus createBus() {
-        return BusFactory.newInstance().getDefaultBus();
+        return BusFactory.getDefaultBus();
     }
     /**
      * @return The web.xml to use for testing.

Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java Wed Jan 31 11:52:18 2007
@@ -152,7 +152,7 @@
 
     public Bus getBus() {
         if (bus == null) {
-            bus = BusFactory.newInstance().getDefaultBus();
+            bus = BusFactory.getDefaultBus();
         }
         return bus;
     }

Modified: incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java (original)
+++ incubator/cxf/trunk/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java Wed Jan 31 11:52:18 2007
@@ -40,7 +40,7 @@
     public void setUp() throws Exception {
         BusFactory bf = BusFactory.newInstance();
         bus =  bf.createBus();
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         im = bus.getExtension(InstrumentationManager.class);
     }
     

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java Wed Jan 31 11:52:18 2007
@@ -53,7 +53,7 @@
     public void setUp() {
         BusFactory bf = BusFactory.newInstance();
         bus = bf.createBus();
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
     }
     
     public void tearDown() {

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSConduitTest.java Wed Jan 31 11:52:18 2007
@@ -28,6 +28,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
@@ -49,9 +50,9 @@
     public void testGetConfiguration() throws Exception {
         // setup the new bus to get the configuration file
         SpringBusFactory bf = new SpringBusFactory();
-        bf.setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         bus = bf.createBus("/wsdl/jms_test_config.xml");
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         setupServiceInfo("http://cxf.apache.org/jms_conf_test",
                          "/wsdl/jms_test_no_addr.wsdl",
                          "HelloWorldQueueBinMsgService",
@@ -67,7 +68,7 @@
         assertEquals("Can't get the right AddressPolicy's ConnectionPassword",
                      "testPassword",
                      conduit.base.getAddressPolicy().getConnectionPassword());
-        bf.setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         
     }
     

Modified: incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Wed Jan 31 11:52:18 2007
@@ -26,6 +26,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
@@ -97,9 +98,9 @@
     
     public void testGetConfiguration() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
-        bf.setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         bus = bf.createBus("/wsdl/jms_test_config.xml");
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         setupServiceInfo("http://cxf.apache.org/jms_conf_test",
                          "/wsdl/jms_test_no_addr.wsdl",
                          "HelloWorldQueueBinMsgService",
@@ -117,7 +118,7 @@
         assertEquals("Can't get the right AddressPolicy's ConnectionPassword",
                      "testPassword",
                      destination.base.getAddressPolicy().getConnectionPassword());
-        bf.setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         
     }
     

Modified: incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java (original)
+++ incubator/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProviderTest.java Wed Jan 31 11:52:18 2007
@@ -31,6 +31,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.service.model.BindingMessageInfo;
@@ -78,7 +79,8 @@
     }
     
     public static void oneTimeSetUp() {
-        bus = new SpringBusFactory().getDefaultBus();
+        BusFactory.setDefaultBus(null);
+        bus = new SpringBusFactory().createBus();
         WSDLManager manager = bus.getExtension(WSDLManager.class);
         int n = 17;
         services = new ServiceInfo[n];
@@ -101,7 +103,7 @@
     
     public static void oneTimeTearDown() {
         bus.shutdown(true);
-        new SpringBusFactory().setDefaultBus(null);
+        BusFactory.setDefaultBus(null);
         endpoints = null;
         services = null;
         

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/common/ClientServerSetupBase.java Wed Jan 31 11:52:18 2007
@@ -39,7 +39,7 @@
         }
         BusFactory bf = BusFactory.newInstance();
         bus = bf.createBus();
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         super.setUp();
     }
     

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java Wed Jan 31 11:52:18 2007
@@ -110,7 +110,7 @@
 
     private static <T> T createPort(QName serviceName, QName portName, Class<T> serviceEndpointInterface)
         throws Exception {
-        Bus bus = BusFactory.newInstance().getDefaultBus();
+        Bus bus = BusFactory.getDefaultBus();
         ReflectionServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean();
         serviceFactory.setBus(bus);
         serviceFactory.setServiceName(serviceName);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java Wed Jan 31 11:52:18 2007
@@ -104,7 +104,7 @@
 
     @Override
     protected Bus createBus() throws BusException {
-        return BusFactory.newInstance().getDefaultBus();
+        return BusFactory.getDefaultBus();
     }
 
 }

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/Server.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/Server.java Wed Jan 31 11:52:18 2007
@@ -44,7 +44,7 @@
         Object implementor = new TestMtomImpl();
         String address = "http://localhost:9036/mime-test";
         try {
-            Bus bus = BusFactory.newInstance().getDefaultBus();
+            Bus bus = BusFactory.getDefaultBus();
             JaxWsImplementorInfo implInfo = new JaxWsImplementorInfo(implementor.getClass());
             AbstractServiceFactoryBean serviceFactory = new JaxWsServiceFactoryBean(implInfo);
             serviceFactory.setBus(bus);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java Wed Jan 31 11:52:18 2007
@@ -23,6 +23,7 @@
 import javax.xml.ws.Endpoint;
 
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.common.TestServerBase;
 import org.apache.cxf.systest.type_test.TypeTestImpl;
@@ -33,8 +34,9 @@
 
     public void run()  {
         SpringBusFactory sf = new SpringBusFactory();
-        sf.setDefaultBus(null);
-        sf.setDefaultBus(sf.createBus("org/apache/cxf/systest/type_test/databinding-schema-validation.xml"));
+        BusFactory.setDefaultBus(null);
+        BusFactory.setDefaultBus(
+            sf.createBus("org/apache/cxf/systest/type_test/databinding-schema-validation.xml"));
         Object implementor = new SOAPTypeTestImpl();
         String address = "http://localhost:9007/SOAPService/SOAPPort/";
         Endpoint.publish(address, implementor);              

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java Wed Jan 31 11:52:18 2007
@@ -21,6 +21,7 @@
 import javax.jws.WebService;
 import javax.xml.ws.Endpoint;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.common.TestServerBase;
 import org.apache.cxf.systest.type_test.TypeTestImpl;
@@ -30,8 +31,9 @@
 
     public void run()  {
         SpringBusFactory sf = new SpringBusFactory();
-        sf.setDefaultBus(null);
-        sf.setDefaultBus(sf.createBus("org/apache/cxf/systest/type_test/databinding-schema-validation.xml"));
+        BusFactory.setDefaultBus(null);
+        BusFactory.setDefaultBus(
+            sf.createBus("org/apache/cxf/systest/type_test/databinding-schema-validation.xml"));
 
         Object implementor = new XMLTypeTestImpl();
         String address = "http://localhost:9008/XMLService/XMLPort/";

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java Wed Jan 31 11:52:18 2007
@@ -34,6 +34,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.systest.common.ClientServerSetupBase;
@@ -92,7 +93,7 @@
 
                 SpringBusFactory bf = new SpringBusFactory();
                 Bus bus = bf.createBus(config);
-                bf.setDefaultBus(bus);
+                BusFactory.setDefaultBus(bus);
                 setBus(bus);
 
                 mapVerifier = new MAPVerifier();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java Wed Jan 31 11:52:18 2007
@@ -27,6 +27,7 @@
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.systest.common.TestServerBase;
@@ -39,7 +40,7 @@
 
         SpringBusFactory factory = new SpringBusFactory();
         Bus bus = factory.createBus("org/apache/cxf/systest/ws/addressing/cxf.xml");
-        factory.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         setBus(bus);
 
         addVerifiers();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Wed Jan 31 11:52:18 2007
@@ -29,6 +29,7 @@
 import javax.xml.ws.Response;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.greeter_control.Control;
 import org.apache.cxf.greeter_control.types.StartGreeterResponse;
@@ -50,7 +51,7 @@
        
         SpringBusFactory bf = new SpringBusFactory();
         greeterBus = bf.createBus(cfgResource);
-        bf.setDefaultBus(greeterBus);
+        BusFactory.setDefaultBus(greeterBus);
         LOG.info("Initialised bus with cfg file resource: " + cfgResource);
         // greeterBus.getOutInterceptors().add(new JaxwsInterceptorRemover());
         greeterBus.getOutInterceptors().add(new OutMessageRecorder());

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java Wed Jan 31 11:52:18 2007
@@ -27,6 +27,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.common.ClientServerSetupBase;
 import org.apache.cxf.systest.common.ClientServerTestBase;
@@ -52,7 +53,7 @@
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus("/org/apache/cxf/systest/ws/rm/decoupled_bare.xml");
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
             
             Object implementor = new DocLitBareGreeterImpl();
             String address = "http://localhost:7600/SoapContext/SoapPort";
@@ -95,7 +96,7 @@
     public void testDecoupled() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("/org/apache/cxf/systest/ws/rm/decoupled_bare.xml");
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
        
         SOAPServiceAddressingDocLitBare service = new SOAPServiceAddressingDocLitBare();
         assertNotNull(service);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java Wed Jan 31 11:52:18 2007
@@ -27,6 +27,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.GreeterService;
@@ -51,7 +52,7 @@
         protected void run()  {            
             SpringBusFactory bf = new SpringBusFactory();
             Bus bus = bf.createBus("/org/apache/cxf/systest/ws/rm/decoupled.xml");
-            bf.setDefaultBus(bus);
+            BusFactory.setDefaultBus(bus);
             LoggingInInterceptor in = new LoggingInInterceptor();
             bus.getInInterceptors().add(in);
             bus.getInFaultInterceptors().add(in);
@@ -101,7 +102,7 @@
     public void testDecoupled() throws Exception {
         SpringBusFactory bf = new SpringBusFactory();
         bus = bf.createBus("/org/apache/cxf/systest/ws/rm/decoupled.xml");
-        bf.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         LoggingInInterceptor in = new LoggingInInterceptor();
         bus.getInInterceptors().add(in);
         bus.getInFaultInterceptors().add(in);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Wed Jan 31 11:52:18 2007
@@ -26,6 +26,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.greeter_control.Control;
 import org.apache.cxf.greeter_control.ControlService;
@@ -122,8 +123,7 @@
         SpringBusFactory bf = new SpringBusFactory();
         
         controlBus = bf.createBus();
-        bf.setDefaultBus(controlBus);
-        controlBus = new SpringBusFactory().getDefaultBus();
+        BusFactory.setDefaultBus(controlBus);
 
         ControlService cs = new ControlService();
         control = cs.getControlPort();
@@ -133,7 +133,7 @@
         
 
         greeterBus = bf.createBus();
-        bf.setDefaultBus(greeterBus);
+        BusFactory.setDefaultBus(greeterBus);
         LOG.fine("Initialised greeter default bus with configuration");
 
         outRecorder = new OutMessageRecorder();
@@ -755,14 +755,13 @@
         SpringBusFactory bf = new SpringBusFactory();
         
         controlBus = bf.createBus();
-        bf.setDefaultBus(controlBus);
-        controlBus = new SpringBusFactory().getDefaultBus();
+        BusFactory.setDefaultBus(controlBus);
 
         ControlService cs = new ControlService();
         control = cs.getControlPort();
         
         greeterBus = bf.createBus(cfgResource);
-        bf.setDefaultBus(greeterBus);
+        BusFactory.setDefaultBus(greeterBus);
         LOG.fine("Initialised greeter bus with configuration: " + cfgResource);
 
         outRecorder = new OutMessageRecorder();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/Server.java?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/Server.java Wed Jan 31 11:52:18 2007
@@ -23,6 +23,7 @@
 import javax.xml.ws.Endpoint;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.systest.common.TestServerBase;
 
@@ -34,7 +35,7 @@
 
         SpringBusFactory factory = new SpringBusFactory();
         Bus bus = factory.createBus();
-        factory.setDefaultBus(bus);
+        BusFactory.setDefaultBus(bus);
         setBus(bus);
 
         ControlImpl implementor = new ControlImpl();

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdl2java.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdl2java.xml?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdl2java.xml (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdl2java.xml Wed Jan 31 11:52:18 2007
@@ -18,189 +18,189 @@
   under the License.
 -->
 <toolspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	  xmlns:xhtml="http://www.w3.org/TR/xhtml1/strict"
-	  xsi:schemaLocation="http://www.xsume.com/Xutil/ToolSpecification http://www.xsume.com/schema/xutil/tool-specification.xsd"
-	  xmlns="http://www.xsume.com/Xutil/ToolSpecification"
-	  xmlns:ts="http://www.xsume.com/Xutil/ToolSpecification">
+      xmlns:xhtml="http://www.w3.org/TR/xhtml1/strict"
+      xsi:schemaLocation="http://www.xsume.com/Xutil/ToolSpecification http://www.xsume.com/schema/xutil/tool-specification.xsd"
+      xmlns="http://www.xsume.com/Xutil/ToolSpecification"
+      xmlns:ts="http://www.xsume.com/Xutil/ToolSpecification">
 
     <annotation>
-Examples :
+        Examples :
 
-wsdl2java HelloWorld.wsdl
-wsdl2java -p com.iona.greeting Greeting.wsdl
-wsdl2java -client HelloWorld.wsdl
+        wsdl2java HelloWorld.wsdl
+        wsdl2java -p com.iona.greeting Greeting.wsdl
+        wsdl2java -client HelloWorld.wsdl
     </annotation>
 
     <usage>
-	<optionGroup id="options">
-	    <option id="packagename" maxOccurs="unbounded">
-		<annotation>
-		            The java package name to use for the generated code.
-		            Also, optionally specify the wsdl namespace mapping 
-		            to a particular java packagename.
-		</annotation>
-		<switch>p</switch>
-		<associatedArgument placement="afterSpace">
-			<valuetype>NamingSpacePackageString</valuetype>
-		<annotation>[wsdl namespace =]Package Name</annotation>
-		</associatedArgument>
-	    </option>
-
-	    <option id="binding" maxOccurs="unbounded">
-		<annotation>
-		            Specify external jaxws or jaxb binding files, (Each 
-		            file must have its own -b)
-		</annotation>
-		<switch>b</switch>
-		<associatedArgument placement="afterSpace">
-		    <annotation>binding-name</annotation>
-		</associatedArgument>
-	    </option>
-
-	    <option id="outputdir" maxOccurs="1">
-		<annotation>
-		            The directory in which the code is placed</annotation>
-		<switch>d</switch>
-		<associatedArgument placement="afterSpace">
-		    <annotation>output-directory</annotation>
-		</associatedArgument>
-	    </option>
-	    
-	    <option id="compile" maxOccurs="1">
-		<annotation>
-		            Compile the generated file</annotation>
-		<switch>compile</switch>
-	    </option>
-	    
-	    <option id="classdir" maxOccurs="1">
-		<annotation>
-		            Specify where to place generated class files</annotation>
-		<switch>classdir</switch>
-		<associatedArgument placement="afterSpace">
-		    <annotation>compile-classes-directory</annotation>
-		</associatedArgument>
-	    </option>
-	    
-	    <option id="impl" maxOccurs="1">
-		<annotation>
-		            Generate the dummy service implementation.</annotation>
-		<switch>impl</switch>
-	    </option>
-
-	    <option id="server" maxOccurs="1">
-		<annotation>
-		            Generates the server code</annotation>
-		<switch>server</switch>
-	    </option>
-
-	    <option id="client" maxOccurs="1">
-		<annotation>
-		            Generates the client code.</annotation>
-		<switch>client</switch>
-	    </option>
-
-	    <option id="all" maxOccurs="1">
-		<annotation>
-		            Generates interfaces,types,service,server,impl,client
-		            and ant script.
-		</annotation>
-		<switch>all</switch>
-	    </option>
-	    		
-	    <option id="ant" maxOccurs="1">
-		<annotation>
-		            ant script generation.
-		</annotation>
-		<switch>ant</switch>
-	    </option>
-
-        <option id="nexclude" maxOccurs="unbounded">
-                <annotation>
-                            The wsdl namespace to exclude for generating code. This 
-		            option can be specified multiple times. Also, Optionally 
-                            specify the java package name to use for this wsdl namespace.
-                 </annotation>
-            <switch>nexclude</switch>
-            <associatedArgument placement="afterSpace">
-                <annotation>schema namespace [= java packagename]</annotation>
-            </associatedArgument>
-        </option>
+        <optionGroup id="options">
+            <option id="packagename" maxOccurs="unbounded">
+                <annotation>
+                    The java package name to use for the generated code.
+                    Also, optionally specify the wsdl namespace mapping
+                    to a particular java packagename.
+                </annotation>
+                <switch>p</switch>
+                <associatedArgument placement="afterSpace">
+                    <valuetype>NamingSpacePackageString</valuetype>
+                    <annotation>[wsdl namespace =]Package Name</annotation>
+                </associatedArgument>
+            </option>
+
+            <option id="binding" maxOccurs="unbounded">
+                <annotation>
+                    Specify external jaxws or jaxb binding files, (Each
+                    file must have its own -b)
+                </annotation>
+                <switch>b</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>binding-name</annotation>
+                </associatedArgument>
+            </option>
+
+            <option id="outputdir" maxOccurs="1">
+                <annotation>
+                    The directory in which the code is placed</annotation>
+                <switch>d</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>output-directory</annotation>
+                </associatedArgument>
+            </option>
+
+            <option id="compile" maxOccurs="1">
+                <annotation>
+                    Compile the generated file</annotation>
+                <switch>compile</switch>
+            </option>
+
+            <option id="classdir" maxOccurs="1">
+                <annotation>
+                    Specify where to place generated class files</annotation>
+                <switch>classdir</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>compile-classes-directory</annotation>
+                </associatedArgument>
+            </option>
+
+            <option id="impl" maxOccurs="1">
+                <annotation>
+                    Generate the dummy service implementation.</annotation>
+                <switch>impl</switch>
+            </option>
+
+            <option id="server" maxOccurs="1">
+                <annotation>
+                    Generates the server code</annotation>
+                <switch>server</switch>
+            </option>
+
+            <option id="client" maxOccurs="1">
+                <annotation>
+                    Generates the client code.</annotation>
+                <switch>client</switch>
+            </option>
+
+            <option id="all" maxOccurs="1">
+                <annotation>
+                    Generates interfaces,types,service,server,impl,client
+                    and ant script.
+                </annotation>
+                <switch>all</switch>
+            </option>
+
+            <option id="ant" maxOccurs="1">
+                <annotation>
+                    ant script generation.
+                </annotation>
+                <switch>ant</switch>
+            </option>
+
+            <option id="nexclude" maxOccurs="unbounded">
+                <annotation>
+                    The wsdl namespace to exclude for generating code. This
+                    option can be specified multiple times. Also, Optionally
+                    specify the java package name to use for this wsdl namespace.
+                </annotation>
+                <switch>nexclude</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>schema namespace [= java packagename]</annotation>
+                </associatedArgument>
+            </option>
+
+            <option id="exsoapheader" maxOccurs="1">
+                <annotation>
+                    To enable processing of extended soap header message binding
+                </annotation>
+                <switch>exsh</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>enable extended soap header message binding (true, false)</annotation>
+                    <valueenum>true|false</valueenum>
+                </associatedArgument>
+            </option>
+
+            <option id="defaultns" maxOccurs="1">
+                <annotation>
+                    To enable loading the default namespace package name mapping
+                </annotation>
+                <switch>dns</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>Default value is true</annotation>
+                    <valueenum>true|false</valueenum>
+                </associatedArgument>
+            </option>
+
+            <option id="defaultex" maxOccurs="1">
+                <annotation>
+                    To enable loading the default excludes namespace mapping</annotation>
+                <switch>dex</switch>
+                <associatedArgument placement="afterSpace">
+                    <annotation>Default value is true</annotation>
+                    <valueenum>true|false</valueenum>
+                </associatedArgument>
+            </option>
+
+            <option id="validate" maxOccurs="1">
+                <annotation>
+                    To valiate the wsdl before generate the code. We highly sugguest
+                    you to run the tool called schema validator before generating
+                    the code.
+                </annotation>
+                <switch>validate</switch>
+            </option>
+
+        </optionGroup>
+        <optionGroup id="common_options">
+            <option id="help" maxOccurs="1">
+                <annotation>
+                    Display detailed information for options.</annotation>
+                <switch>h</switch>
+                <switch>?</switch>
+                <switch>help</switch>
+            </option>
+
+            <option id="version">
+                <annotation>
+                    Display the version of the tool.</annotation>
+                <switch>v</switch>
+            </option>
+
+            <option id="verbose">
+                <annotation>
+                    Verbose mode</annotation>
+                <switch>verbose</switch>
+                <switch>V</switch>
+            </option>
+
+            <option id="quiet">
+                <annotation>
+                    Quiet mode</annotation>
+                <switch>quiet</switch>
+                <switch>q</switch>
+            </option>
 
-        <option id="exsoapheader" maxOccurs="1">
+        </optionGroup>
+        <argument id="wsdlurl" minOccurs="1" maxOccurs="1">
             <annotation>
-                            To enable processing of extended soap header message binding
-            </annotation>
-            <switch>exsh</switch>
-            <associatedArgument placement="afterSpace">
-                <annotation>enable extended soap header message binding (true, false)</annotation>
-                <valueenum>true|false</valueenum>
-            </associatedArgument>
-        </option>
-
-        <option id="defaultns" maxOccurs="1">
-                 <annotation>
-                            To enable loading the default namespace package name mapping
-                 </annotation>
-            <switch>dns</switch>
-            <associatedArgument placement="afterSpace">
-                <annotation>Default value is true</annotation>
-                <valueenum>true|false</valueenum>
-            </associatedArgument>
-        </option>
-
-        <option id="defaultex" maxOccurs="1">
-                 <annotation>
-                            To enable loading the default excludes namespace mapping</annotation>
-            <switch>dex</switch>
-            <associatedArgument placement="afterSpace">
-                <annotation>Default value is true</annotation>
-                <valueenum>true|false</valueenum>
-            </associatedArgument>
-        </option>
-
-        <option id="validate" maxOccurs="1">
-                <annotation>
-                            To valiate the wsdl before generate the code. We highly sugguest 
-                            you to run the tool called schema validator before generating 
-                            the code.
-            </annotation>
-            <switch>validate</switch>
-        </option>
-
-	</optionGroup>
-	<optionGroup id="common_options">
-	    <option id="help" maxOccurs="1">
-		<annotation>
-		            Display detailed information for options.</annotation>
-		<switch>h</switch>
-		<switch>?</switch>
-		<switch>help</switch>
-	    </option>
-	    
-	    <option id="version">
-		<annotation>
-		            Display the version of the tool.</annotation>
-		<switch>v</switch>
-	    </option>
-
-	    <option id="verbose">
-		<annotation>
-		            Verbose mode</annotation>
-		<switch>verbose</switch>
-		<switch>V</switch>
-	    </option>
-
-	    <option id="quiet">
-		<annotation>
-		            Quiet mode</annotation>
-		<switch>quiet</switch>
-		<switch>q</switch>
-	    </option>
-
-	</optionGroup>
-	<argument id="wsdlurl" minOccurs="1" maxOccurs="1">
-	        <annotation>
-	                    WSDL URL</annotation>
-	</argument>
+                WSDL URL</annotation>
+        </argument>
     </usage>
 </toolspec>

Modified: incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdltojavalib.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdltojavalib.properties?view=diff&rev=501966&r1=501965&r2=501966
==============================================================================
--- incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdltojavalib.properties (original)
+++ incubator/cxf/trunk/tools/wsdl2java/src/main/java/org/apache/cxf/tools/wsdl2java/wsdltojavalib.properties Wed Jan 31 11:52:18 2007
@@ -18,7 +18,5 @@
 #    under the License.
 #
 #
-jaxrpc.version=1.1
-saaj.version=1.2.1
 
 library.references=${cxf.version}/lib/cxf-incubator.jar



Mime
View raw message