cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r544506 - in /incubator/cxf/trunk: ./ rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/ rt/core/src/main/java/org/apache/cxf/configuration/spring/ rt/core/src/main...
Date Tue, 05 Jun 2007 14:51:59 GMT
Author: dkulp
Date: Tue Jun  5 07:51:56 2007
New Revision: 544506

URL: http://svn.apache.org/viewvc?view=rev&rev=544506
Log:
Update STATUS file a bit
Update to use Bus on the Exchange instead of default bus in interceptors
Update to use thread default bus whenever possible
Don't have Servlet reset the default bus

Modified:
    incubator/cxf/trunk/STATUS
    incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
    incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
    incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
    incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
    incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java
    incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web.xml

Modified: incubator/cxf/trunk/STATUS
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/STATUS?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/STATUS (original)
+++ incubator/cxf/trunk/STATUS Tue Jun  5 07:51:56 2007
@@ -7,23 +7,23 @@
 
 Copyrights & Licensing
 
-  -- Do all the software in the codebase has its copyright assigned to The
+X  -- Do all the software in the codebase has its copyright assigned to The
      Apache Software Foundation?
 
-  -- Do All the software in the codebase, are licensed (or multi-licensed) under the
+X  -- Do All the software in the codebase, are licensed (or multi-licensed) under the
      Apache licence?
 
-  -- Do all the software in the codebase,are compliant with the
+X  -- Do all the software in the codebase,are compliant with the
      Specifications set by Java Community Process?(Wherever applicable)
      * This criteria has been superceded by the Exit Milestone below
 
 Distribution rights
 
-  -- For all code included with the distribution that is not under the
+X  -- For all code included with the distribution that is not under the
      Apache license, do we have the right to combine with Apache-licensed
      code and redistribute?
 
-  -- Is all source code distributed by the project covered by one or more
+X  -- Is all source code distributed by the project covered by one or more
      of the following approved licenses:  Apache, BSD, Artistic, MIT/X,
      MIT/W3C, MPL 1.1, or something with essentially the same terms?
 
@@ -32,25 +32,26 @@
 X -- SVN modules created and committers added to avail file?
      Yes:       https://svn.apache.org/repos/asf/incubator/cxf
 
-  -- Are the developer,commit and user mailing lists set up and archived?
+X  -- Are the developer,commit and user mailing lists set up and archived?
 
-  -- Bug tracking system enabled?
+X  -- Bug tracking system enabled?
      Yes:       https://issues.apache.org/jira/browse/CXF
 
-  -- wiki based documentation site enabled?
+X  -- wiki based documentation site enabled?
+     Yes:       http://cwiki.apache.org/confluence/display/CXF/Index
 
-  -- Has the project migrated to our infrastructure?
+X  -- Has the project migrated to our infrastructure?
 
 Committers:
 
-  -- Have all of the active long-term volunteers been identified
+X  -- Have all of the active long-term volunteers been identified
      and acknowledged as committers on the project?
 
-  -- Have all the commiters signed the CLA?
+X  -- Have all the commiters signed the CLA?
 
-  -- Do they have accounts on svn.apache.org?
+X  -- Do they have accounts on svn.apache.org?
 
-  -- Are there three or more independent committers?
+X  -- Are there three or more independent committers?
      Yes
 
 Collaborative Development:

Modified: incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
Tue Jun  5 07:51:56 2007
@@ -66,7 +66,10 @@
     
     public void handleMessage(Message message) throws Fault {
         if (bus == null) {
-            bus = BusFactory.getDefaultBus(false);
+            bus = message.getExchange().get(Bus.class);
+            if (bus == null) {
+                bus = BusFactory.getDefaultBus(false);
+            }
             if (bus == null) {
                 throw new Fault(new org.apache.cxf.common.i18n.Message("BUS_NOT_FOUND", BUNDLE));
             }
@@ -205,6 +208,6 @@
         exchange.put(Endpoint.class, ep);
         exchange.put(Service.class, ep.getService());
         exchange.put(Binding.class, ep.getBinding());
-        exchange.put(Bus.class, BusFactory.getDefaultBus(false));
+        exchange.put(Bus.class, bus == null ? BusFactory.getDefaultBus(false) : bus);
     }
 }

Modified: incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
Tue Jun  5 07:51:56 2007
@@ -39,7 +39,8 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.apache.cxf.BusFactory;
+
+import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.Soap11;
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapHeader;
@@ -128,9 +129,12 @@
             Node nd = headerEls.item(i);
             if (Node.ELEMENT_NODE == nd.getNodeType()) {
                 Element hel = (Element)nd;
-                HeaderProcessor p = BusFactory.getDefaultBus().getExtension(HeaderManager.class)
-                    .getHeaderProcessor(hel.getNamespaceURI());
-
+                Bus b = message.getExchange().get(Bus.class);
+                HeaderProcessor p =  null;
+                if (b != null && b.getExtension(HeaderManager.class) != null) {
+                    p = b.getExtension(HeaderManager.class).getHeaderProcessor(hel.getNamespaceURI());
+                }
+                
                 Object obj;
                 DataBinding dataBinding = null;
                 if (p == null || p.getDataBinding() == null) {

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
Tue Jun  5 07:51:56 2007
@@ -172,13 +172,22 @@
             return ((Configurable)beanInstance).getBeanName();
         }
         String beanName = null;
+        Method m = null;
         try {
-            Method m = beanInstance.getClass().getDeclaredMethod("getBeanName", (Class[])null);
-            beanName = (String)(m.invoke(beanInstance));
+            m = beanInstance.getClass().getDeclaredMethod("getBeanName", (Class[])null);
         } catch (NoSuchMethodException ex) {
-            // ignore
-        } catch (Exception ex) {
-            LogUtils.log(LOG, Level.WARNING, "ERROR_DETERMINING_BEAN_NAME_EXC", ex);
+            try {
+                m = beanInstance.getClass().getMethod("getBeanName", (Class[])null);
+            } catch (NoSuchMethodException e) {
+                //ignore
+            }
+        }
+        if (m != null) {
+            try {
+                beanName = (String)(m.invoke(beanInstance));
+            } catch (Exception ex) {
+                LogUtils.log(LOG, Level.WARNING, "ERROR_DETERMINING_BEAN_NAME_EXC", ex);
+            }
         }
         
         if (null == beanName) {

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Tue
Jun  5 07:51:56 2007
@@ -89,11 +89,11 @@
     }
 
     public ClientImpl(URL wsdlUrl) {
-        this(BusFactory.getDefaultBus(), wsdlUrl, null, null);
+        this(BusFactory.getThreadDefaultBus(), wsdlUrl, null, null);
     }
     
     public ClientImpl(URL wsdlUrl, QName port) {
-        this(BusFactory.getDefaultBus(), wsdlUrl, null, port);
+        this(BusFactory.getThreadDefaultBus(), wsdlUrl, null, port);
     }
 
     public ClientImpl(Bus bus, URL wsdlUrl, QName service, QName port) {

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java Tue
Jun  5 07:51:56 2007
@@ -70,7 +70,7 @@
         }
         
         if (bus == null) {
-            this.bus = BusFactory.getDefaultBus();
+            this.bus = BusFactory.getThreadDefaultBus();
         } else {
             this.bus = bus;
         }

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
(original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
Tue Jun  5 07:51:56 2007
@@ -108,7 +108,7 @@
      * @see CXFBusFactory#getDefaultBus()
      */
     public static DynamicClientFactory newInstance() {
-        Bus bus = CXFBusFactory.getDefaultBus();
+        Bus bus = CXFBusFactory.getThreadDefaultBus();
         return new DynamicClientFactory(bus);
     }
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Tue Jun  5 07:51:56 2007
@@ -94,7 +94,7 @@
     private List<Interceptor> inFault  = new CopyOnWriteArrayList<Interceptor>();
 
     public EndpointImpl(Object implementor) {
-        this(BusFactory.getDefaultBus(), implementor);
+        this(BusFactory.getThreadDefaultBus(), implementor);
     }
    
     public EndpointImpl(Bus b, Object implementor, 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Tue Jun  5 07:51:56 2007
@@ -30,12 +30,12 @@
 import org.w3c.dom.NodeList;
 
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.util.StringUtils;
 
 
 public class EndpointDefinitionParser extends AbstractBeanDefinitionParser {
@@ -51,10 +51,10 @@
     protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean)
{
         NamedNodeMap atts = element.getAttributes();
         String bus = element.getAttribute("bus");
-        if (bus == null && ctx.getRegistry().containsBeanDefinition("cxf")) {
+        if (StringUtils.isEmpty(bus) 
+            && ctx.getRegistry().containsBeanDefinition("cxf")) {
             bean.addConstructorArgReference("cxf");
-        } 
-        
+        }
         for (int i = 0; i < atts.getLength(); i++) {
             Attr node = (Attr) atts.item(i);
             String val = node.getValue();
@@ -107,7 +107,7 @@
     }
 
     private void loadImplementor(BeanDefinitionBuilder bean, String val) {
-        if (StringUtils.hasText(val)) {
+        if (!StringUtils.isEmpty(val)) {
             if (val.startsWith("#")) {
                 bean.addConstructorArgReference(val.substring(1));
             } else {

Modified: incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
(original)
+++ incubator/cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
Tue Jun  5 07:51:56 2007
@@ -38,7 +38,7 @@
     
     public Bus getBus() {
         if (bus == null) {
-            bus = BusFactory.getDefaultBus();
+            bus = BusFactory.getThreadDefaultBus();
         }
         return bus;
     }

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=544506&r1=544505&r2=544506
==============================================================================
--- 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
Tue Jun  5 07:51:56 2007
@@ -289,7 +289,7 @@
 
     public Bus getBus() {
         if (bus == null) {
-            bus = BusFactory.getDefaultBus();
+            bus = BusFactory.getThreadDefaultBus();
         }
         return bus;
     }

Modified: incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/management/src/main/java/org/apache/cxf/management/interceptor/AbstractMessageResponseTimeInterceptor.java
Tue Jun  5 07:51:56 2007
@@ -89,7 +89,7 @@
         Bus bus = ex.get(Bus.class);
         if (null == bus) {
             LOG.log(Level.INFO, "CAN_NOT_GET_BUS_FROM_EXCHANGE");
-            BusFactory.getDefaultBus();
+            BusFactory.getThreadDefaultBus();
         }
         
         Message message = ex.getOutMessage();

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Tue Jun  5 07:51:56 2007
@@ -510,7 +510,7 @@
                 && !needToCacheRequest) {
                 //TODO: The chunking mode be configured or at least some
                 // documented client constant.
-                LOG.log(Level.INFO, "Chunking is set at 2048.");
+                LOG.log(Level.FINER, "Chunking is set at 2048.");
                 connection.setChunkedStreamingMode(2048);
             }
         }

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
Tue Jun  5 07:51:56 2007
@@ -78,32 +78,33 @@
     public void init(ServletConfig servletConfig) throws ServletException {
         super.init(servletConfig);
 
-        BusFactory.setDefaultBus(null);
-        BusFactory.setThreadDefaultBus(null);
-
-        String busid = servletConfig.getInitParameter("bus.id");
-        if (null != busid) {
-            WeakReference<Bus> ref = BUS_MAP.get(busid);
-            if (null != ref) {
-                bus = ref.get();
-            }
-        }
-        
-        String springCls = "org.springframework.context.ApplicationContext";
         try {
-            ClassLoaderUtils.loadClass(springCls, getClass());
-            loadSpringBus(servletConfig);
-        } catch (ClassNotFoundException e) {
-            loadBusNoConfig(servletConfig);
-        }
-            
+            BusFactory.setThreadDefaultBus(null);
+    
+            String busid = servletConfig.getInitParameter("bus.id");
+            if (null != busid) {
+                WeakReference<Bus> ref = BUS_MAP.get(busid);
+                if (null != ref) {
+                    bus = ref.get();
+                    BusFactory.setThreadDefaultBus(bus);
+                }
+            }
             
-        if (null != busid) {
-            BUS_MAP.put(busid, new WeakReference<Bus>(bus));
+            String springCls = "org.springframework.context.ApplicationContext";
+            try {
+                ClassLoaderUtils.loadClass(springCls, getClass());
+                loadSpringBus(servletConfig);
+            } catch (ClassNotFoundException e) {
+                loadBusNoConfig(servletConfig);
+            }
+                
+                
+            if (null != busid) {
+                BUS_MAP.put(busid, new WeakReference<Bus>(bus));
+            }
+        } finally {
+            BusFactory.setThreadDefaultBus(null);
         }
-        
-        BusFactory.setDefaultBus(null);
-        BusFactory.setThreadDefaultBus(null);
     }
     
     private void loadBusNoConfig(ServletConfig servletConfig) throws ServletException {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
Tue Jun  5 07:51:56 2007
@@ -30,11 +30,21 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.helpers.DOMUtils;
+import org.junit.Before;
 import org.junit.Test;
 
 
 public class CXFServletTest extends AbstractServletTest {
+    
+    
+    @Before
+    public void setUp() throws Exception {
+        BusFactory.setDefaultBus(null);
+        BusFactory.setThreadDefaultBus(null);
+        super.setUp();
+    }
     
     @Override
     protected Bus createBus() throws BusException {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web.xml?view=diff&rev=544506&r1=544505&r2=544506
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web.xml (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/web.xml Tue
Jun  5 07:51:56 2007
@@ -35,10 +35,10 @@
       <param-name>config-location</param-name> 
       <param-value>/org/apache/cxf/systest/servlet/cxf-servlet.xml</param-value>

     </init-param> 
-    <init-param> 
+    <!--init-param> 
       <param-name>bus.id</param-name> 
       <param-value>servlet.systest.bus.id</param-value> 
-    </init-param> 
+    </init-param--> 
   </servlet>
 
   <servlet-mapping>



Mime
View raw message