Author: dkulp
Date: Mon Jan 29 09:54:36 2007
New Revision: 501131
URL: http://svn.apache.org/viewvc?view=rev&rev=501131
Log:
* Remove BudFactoryHelper (make factory itself a factory)
* Remove some printlns in tests
* Update Workqueue tests to ignore bug in JDK 1.6 (Java 6 ThreadPoolExecutor
can drop below the low water mark for threads)
* Update TypeTest to fix one test on Java 6 (2 failures left)
* Fix HTTP logging to be multi-subclass safe
Added:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
- copied, changed from r501080,
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactoryHelper.java
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java
- copied, changed from r501080,
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryHelperTest.java
Removed:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactoryHelper.java
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryHelperTest.java
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineShutdown.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/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/main/java/org/apache/cxf/transport/AbstractConduit.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.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/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/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
incubator/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.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/handlers/SmallNumberHandler.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/AbstractTypeTestClient.java
incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Copied: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java
(from r501080,
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactoryHelper.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java?view=diff&rev=501131&p1=incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactoryHelper.java&r1=501080&p2=incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java&r2=501131
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactoryHelper.java
(original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/BusFactory.java Mon
Jan 29 09:54:36 2007
@@ -28,15 +28,37 @@
import org.apache.cxf.common.logging.LogUtils;
-public final class BusFactoryHelper {
- private static final Logger LOG =
LogUtils.getL7dLogger(BusFactoryHelper.class, "APIMessages");
+public abstract class BusFactory {
- /**
- * Prevents instantiation.
+ 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";
+
+ private static final Logger LOG = LogUtils.getL7dLogger(BusFactory.class,
"APIMessages");
+
+
+ /**
+ * Creates a new bus.
+ * While concrete <code>BusFactory</code> may offer differently
+ * parametrized methods for creating a bus, all factories support
+ * this no-arg factory method.
*
+ * @return the newly created bus.
+ */
+ public abstract Bus createBus();
+
+ /**
+ * Returns the default bus, creating it if necessary.
+ *
+ * @return the default bus.
*/
- private BusFactoryHelper() {
- }
+ public abstract Bus getDefaultBus();
+
+ /**
+ * Sets the default bus.
+ * @param bus the default bus.
+ */
+ public abstract void setDefaultBus(Bus bus);
+
public static BusFactory newInstance() {
BusFactory instance = null;
Copied:
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java (from
r501080,
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryHelperTest.java)
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java?view=diff&rev=501131&p1=incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryHelperTest.java&r1=501080&p2=incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java&r2=501131
==============================================================================
---
incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryHelperTest.java
(original)
+++ incubator/cxf/trunk/api/src/test/java/org/apache/cxf/BusFactoryTest.java
Mon Jan 29 09:54:36 2007
@@ -23,22 +23,22 @@
-public class BusFactoryHelperTest extends TestCase {
+public class BusFactoryTest extends TestCase {
public void tearDown() {
System.clearProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME);
}
public void testGetInstance() {
- BusFactory factory = BusFactoryHelper.newInstance();
+ BusFactory factory = BusFactory.newInstance();
assertNull(factory);
System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME,
TestBusFactory.class.getName());
- factory = BusFactoryHelper.newInstance();
+ factory = BusFactory.newInstance();
assertTrue(factory instanceof TestBusFactory);
}
- public static class TestBusFactory implements BusFactory {
+ public static class TestBusFactory extends BusFactory {
public Bus createBus() {
return null;
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineShutdown.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineShutdown.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineShutdown.java
(original)
+++
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineShutdown.java
Mon Jan 29 09:54:36 2007
@@ -32,7 +32,7 @@
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.configuration.Configurer;
@@ -101,7 +101,7 @@
try {
LOG.info(new Message("SE.INIT.BUS", LOG).toString());
if (null == bus) {
- bus = BusFactoryHelper.newInstance().createBus();
+ bus = BusFactory.newInstance().createBus();
}
LOG.info(new Message("SE.INIT.BUS.COMPLETE", LOG).toString());
} catch (Exception 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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -24,7 +24,7 @@
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
@@ -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();
- BusFactoryHelper.newInstance().setDefaultBus(bus);
+ BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -39,7 +39,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.connector.CXFConnectionFactory;
import org.apache.hello_world_soap_http.Greeter;
import org.easymock.classextension.EasyMock;
@@ -193,7 +192,7 @@
Subject subj = new Subject();
- BusFactory bf = BusFactoryHelper.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
bf.setDefaultBus(bus);
ManagedConnectionFactoryImpl factory =
EasyMock.createMock(ManagedConnectionFactoryImpl.class);
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -32,7 +32,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.BusFactoryHelper;
import org.apache.hello_world_soap_http.Greeter;
import org.easymock.classextension.EasyMock;
@@ -77,7 +76,7 @@
cri2 = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName2,
portName2);
- BusFactory bf = BusFactoryHelper.newInstance();
+ BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
bf.setDefaultBus(bus);
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -25,7 +25,6 @@
//import org.apache.cxf.Bus;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.apache.cxf.jca.cxf.CXFManagedConnection;
@@ -57,7 +56,7 @@
public void testInvokeSetsBusCurrent() throws Throwable {
- BusFactory bf = BusFactoryHelper.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus oldBus = bf.getDefaultBus();
testObject.invoke(target, testMethod, new Object[] {});
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -26,7 +26,7 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
-public class CXFBusFactory implements BusFactory {
+public class CXFBusFactory extends BusFactory {
private static Bus defaultBus;
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -31,7 +31,7 @@
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
-public class SpringBusFactory implements BusFactory {
+public class SpringBusFactory extends BusFactory {
private static final String DEFAULT_BUS_ID = "cxf";
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -39,7 +39,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.message.Message;
@@ -85,12 +85,12 @@
if (bus != null) {
bus.shutdown(false);
}
- BusFactoryHelper.newInstance().setDefaultBus(null);
+ BusFactory.newInstance().setDefaultBus(null);
}
protected Bus createBus() throws BusException {
- return BusFactoryHelper.newInstance().createBus();
+ return BusFactory.newInstance().createBus();
}
protected byte[] invokeBytes(String address,
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
Mon Jan 29 09:54:36 2007
@@ -33,14 +33,14 @@
*/
public abstract class AbstractConduit implements Conduit {
- @SuppressWarnings("PMD:LoggerIsNotStaticFinal")
- protected static Logger log;
protected final EndpointReferenceType target;
protected MessageObserver incomingObserver;
public AbstractConduit(EndpointReferenceType t) {
target = t;
}
+
+ protected abstract Logger getLogger();
/**
* @return the reference associated with the target Destination
@@ -73,6 +73,6 @@
*/
public void setMessageObserver(MessageObserver observer) {
incomingObserver = observer;
- log.info("registering incoming observer: " + incomingObserver);
+ getLogger().info("registering incoming observer: " + incomingObserver);
}
}
Modified:
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
(original)
+++
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
Mon Jan 29 09:54:36 2007
@@ -35,8 +35,6 @@
*/
public abstract class AbstractDestination implements Destination {
- @SuppressWarnings("PMD:LoggerIsNotStaticFinal")
- protected static Logger log;
protected final EndpointReferenceType reference;
protected final EndpointInfo endpointInfo;
protected MessageObserver incomingObserver;
@@ -47,6 +45,8 @@
endpointInfo = ei;
}
+ protected abstract Logger getLogger();
+
/**
* @return the reference associated with this Destination
*/
@@ -116,12 +116,12 @@
MessageObserver old = incomingObserver;
incomingObserver = observer;
if (observer != null) {
- log.info("registering incoming observer: " + observer);
+ getLogger().info("registering incoming observer: " + observer);
if (old == null) {
activateIncoming();
}
} else {
- log.info("unregistering incoming observer: " +
incomingObserver);
+ getLogger().info("unregistering incoming observer: " +
incomingObserver);
if (old != null) {
deactivateIncoming();
}
Modified:
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
(original)
+++
incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
Mon Jan 29 09:54:36 2007
@@ -276,7 +276,12 @@
// ignore
}
}
- assertEquals(workqueue.getLowWaterMark(), workqueue.getPoolSize());
+ if (System.getProperty("java.version").startsWith("1.6")) {
+ //ThreadPoolExecutor in 1.6 is broken. The size can get below
the low watermark
+ assertTrue(workqueue.getLowWaterMark() >= workqueue.getPoolSize());
+ } else {
+ assertEquals(workqueue.getLowWaterMark(),
workqueue.getPoolSize());
+ }
}
public void testThreadPoolShrinkUnbounded() {
Modified:
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
(original)
+++
incubator/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
Mon Jan 29 09:54:36 2007
@@ -32,7 +32,7 @@
import junit.framework.TestCase;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.binding.BindingFactory;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -70,7 +70,7 @@
BindingOperationInfo operation;
public void setUp() throws Exception {
- bus = BusFactoryHelper.newInstance().createBus();
+ bus = BusFactory.newInstance().createBus();
BindingFactoryManager bfm =
bus.getExtension(BindingFactoryManager.class);
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -28,7 +28,7 @@
import javax.xml.ws.spi.ServiceDelegate;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxws.EndpointImpl;
@@ -44,7 +44,7 @@
public ServiceDelegate createServiceDelegate(URL url,
QName qname,
Class cls) {
- Bus bus = BusFactoryHelper.newInstance().getDefaultBus();
+ Bus bus = BusFactory.newInstance().getDefaultBus();
return new ServiceImpl(bus, url, qname, cls);
}
@@ -53,7 +53,7 @@
Endpoint ep = null;
if (EndpointUtils.isValidImplementor(implementor)) {
- Bus bus = BusFactoryHelper.newInstance().getDefaultBus();
+ Bus bus = BusFactory.newInstance().getDefaultBus();
ep = new EndpointImpl(bus, implementor, bindingId);
return ep;
} else {
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -27,7 +27,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.invoker.BeanInvoker;
@@ -42,7 +42,7 @@
@Override
protected Bus createBus() throws BusException {
- return BusFactoryHelper.newInstance().getDefaultBus();
+ return BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -28,7 +28,7 @@
import javax.xml.ws.Endpoint;
import javax.xml.ws.Holder;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.AbstractJaxWsTest;
@@ -58,7 +58,7 @@
public void setUp() throws Exception {
super.setUp();
- BusFactoryHelper.newInstance().setDefaultBus(getBus());
+ BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -31,7 +31,7 @@
import com.meterware.servletunit.ServletUnitClient;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.test.AbstractCXFTest;
public abstract class AbstractServletTest extends AbstractCXFTest {
@@ -53,18 +53,18 @@
public void tearDown() {
bus.shutdown(false);
- BusFactoryHelper.newInstance().setDefaultBus(null);
+ BusFactory.newInstance().setDefaultBus(null);
}
//CXFservlet has create the bus, so we need to use this bus for service
init
@Override
public Bus getBus() {
- return BusFactoryHelper.newInstance().getDefaultBus();
+ return BusFactory.newInstance().getDefaultBus();
}
@Override
public Bus createBus() {
- return BusFactoryHelper.newInstance().getDefaultBus();
+ return BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -24,7 +24,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapBindingInfoFactoryBean;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
@@ -152,7 +152,7 @@
public Bus getBus() {
if (bus == null) {
- bus = BusFactoryHelper.newInstance().getDefaultBus();
+ bus = BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -27,7 +27,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.event.ComponentEventFilter;
import org.apache.cxf.event.Event;
import org.apache.cxf.event.EventProcessor;
@@ -39,7 +38,7 @@
Bus bus;
public void setUp() throws Exception {
- BusFactory bf = BusFactoryHelper.newInstance();
+ BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
bf.setDefaultBus(bus);
im = bus.getExtension(InstrumentationManager.class);
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -34,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
@@ -68,12 +69,9 @@
*/
public class HTTPConduit extends AbstractConduit {
- static {
- log = LogUtils.getL7dLogger(HTTPConduit.class);
- }
-
public static final String HTTP_CONNECTION = "http.connection";
-
+ private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class);
+
private final Bus bus;
private HTTPConduitConfigBean config;
private final URLConnectionFactory alternateConnectionFactory;
@@ -98,7 +96,7 @@
ei,
null);
}
-
+
/**
* Constructor
*
@@ -144,6 +142,11 @@
: new URL(t.getAddress().getValue());
}
+ protected Logger getLogger() {
+ return LOG;
+ }
+
+
/**
* Post-configure retreival of connection factory.
*/
@@ -366,7 +369,7 @@
config.getClient().getDecoupledEndpoint());
if (reference != null) {
String decoupledAddress = reference.getAddress().getValue();
- log.info("creating decoupled endpoint: " + decoupledAddress);
+ LOG.info("creating decoupled endpoint: " + decoupledAddress);
try {
decoupledURL = new URL(decoupledAddress);
if (decoupledEngine == null) {
@@ -384,7 +387,7 @@
decoupledHandler.duplicate();
} catch (Exception e) {
// REVISIT move message to localizable Messages.properties
- log.log(Level.WARNING, "decoupled endpoint creation failed: ",
e);
+ LOG.log(Level.WARNING, "decoupled endpoint creation failed: ",
e);
}
}
return new DecoupledDestination(reference, incomingObserver);
Modified:
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
(original)
+++
incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
Mon Jan 29 09:54:36 2007
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.wsdl.Definition;
import javax.wsdl.factory.WSDLFactory;
@@ -57,16 +58,14 @@
import org.mortbay.http.handler.AbstractHttpHandler;
public class JettyHTTPDestination extends AbstractHTTPDestination {
-
- static {
- log = LogUtils.getL7dLogger(JettyHTTPDestination.class);
- }
-
+
public static final String HTTP_REQUEST =
JettyHTTPDestination.class.getName() + ".REQUEST";
public static final String HTTP_RESPONSE =
JettyHTTPDestination.class.getName() + ".RESPONSE";
-
+
protected static final String ANONYMOUS_ADDRESS =
"http://www.w3.org/2005/08/addressing/anonymous";;
+ private static final Logger LOG =
LogUtils.getL7dLogger(JettyHTTPDestination.class);
+
protected ServerEngine engine;
protected ServerEngine alternateEngine;
@@ -97,6 +96,10 @@
alternateEngine = eng;
}
+ protected Logger getLogger() {
+ return LOG;
+ }
+
/**
* Post-configure retreival of server engine.
*/
@@ -121,7 +124,7 @@
* Activate receipt of incoming messages.
*/
protected void activateIncoming() {
- log.log(Level.INFO, "Activating receipt of incoming messages");
+ LOG.log(Level.INFO, "Activating receipt of incoming messages");
try {
URL url = new URL(getAddressValue());
if (contextMatchOnExact()) {
@@ -144,7 +147,7 @@
});
}
} catch (Exception e) {
- log.log(Level.WARNING, "URL creation failed: ", e);
+ LOG.log(Level.WARNING, "URL creation failed: ", e);
}
}
@@ -152,7 +155,7 @@
* Deactivate receipt of incoming messages.
*/
protected void deactivateIncoming() {
- log.log(Level.INFO, "Deactivating receipt of incoming messages");
+ LOG.log(Level.INFO, "Deactivating receipt of incoming messages");
engine.removeServant(nurl);
}
@@ -314,8 +317,8 @@
protected void serviceRequest(final HttpRequest req, final HttpResponse
resp)
throws IOException {
try {
- if (log.isLoggable(Level.INFO)) {
- log.info("Service http request on thread: " +
Thread.currentThread());
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.info("Service http request on thread: " +
Thread.currentThread());
}
MessageImpl inMessage = new MessageImpl();
@@ -341,8 +344,8 @@
resp.commit();
req.setHandled(true);
} finally {
- if (log.isLoggable(Level.INFO)) {
- log.info("Finished servicing http request on thread: " +
Thread.currentThread());
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.info("Finished servicing http request on thread: " +
Thread.currentThread());
}
}
}
@@ -376,12 +379,12 @@
}
} else if (null != responseObj) {
String m = (new
org.apache.cxf.common.i18n.Message("UNEXPECTED_RESPONSE_TYPE_MSG",
- log, responseObj.getClass())).toString();
- log.log(Level.WARNING, m);
+ LOG, responseObj.getClass())).toString();
+ LOG.log(Level.WARNING, m);
throw new IOException(m);
} else {
- String m = (new
org.apache.cxf.common.i18n.Message("NULL_RESPONSE_MSG", log)).toString();
- log.log(Level.WARNING, m);
+ String m = (new
org.apache.cxf.common.i18n.Message("NULL_RESPONSE_MSG", LOG)).toString();
+ LOG.log(Level.WARNING, m);
throw new IOException(m);
}
Modified:
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Mon Jan 29 09:54:36 2007
@@ -34,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -70,11 +71,8 @@
*/
public class HTTPConduit extends AbstractConduit {
- static {
- log = LogUtils.getL7dLogger(HTTPConduit.class);
- }
-
public static final String HTTP_CONNECTION = "http.connection";
+ private static final Logger LOG = LogUtils.getL7dLogger(HTTPConduit.class);
private final Bus bus;
private HTTPConduitConfigBean config;
@@ -146,6 +144,11 @@
: new URL(t.getAddress().getValue());
}
+
+ protected Logger getLogger() {
+ return LOG;
+ }
+
protected void retrieveConnectionFactory() {
connectionFactory = alternateConnectionFactory != null
? alternateConnectionFactory
@@ -364,7 +367,7 @@
config.getClient().getDecoupledEndpoint());
if (reference != null) {
String decoupledAddress = reference.getAddress().getValue();
- log.info("creating decoupled endpoint: " + decoupledAddress);
+ LOG.info("creating decoupled endpoint: " + decoupledAddress);
try {
decoupledURL = new URL(decoupledAddress);
if (decoupledEngine == null) {
@@ -382,7 +385,7 @@
decoupledHandler.duplicate();
} catch (Exception e) {
// REVISIT move message to localizable Messages.properties
- log.log(Level.WARNING, "decoupled endpoint creation failed: ",
e);
+ LOG.log(Level.WARNING, "decoupled endpoint creation failed: ",
e);
}
}
return new DecoupledDestination(reference, incomingObserver);
Modified:
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
(original)
+++
incubator/cxf/trunk/rt/transports/http2/src/main/java/org/apache/cxf/transport/http/JettyHTTPDestination.java
Mon Jan 29 09:54:36 2007
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -59,16 +60,14 @@
public class JettyHTTPDestination extends AbstractHTTPDestination {
-
- static {
- log = LogUtils.getL7dLogger(JettyHTTPDestination.class);
- }
public static final String HTTP_REQUEST =
JettyHTTPDestination.class.getName() + ".REQUEST";
public static final String HTTP_RESPONSE =
JettyHTTPDestination.class.getName() + ".RESPONSE";
protected static final String ANONYMOUS_ADDRESS =
"http://www.w3.org/2005/08/addressing/anonymous";;
+ private static final Logger LOG =
LogUtils.getL7dLogger(JettyHTTPDestination.class);
+
protected ServerEngine engine;
protected ServerEngine alternateEngine;
@@ -99,6 +98,10 @@
alternateEngine = eng;
}
+ protected Logger getLogger() {
+ return LOG;
+ }
+
/**
* Post-configure retreival of server engine.
*/
@@ -122,7 +125,7 @@
* Activate receipt of incoming messages.
*/
protected void activateIncoming() {
- log.log(Level.INFO, "Activating receipt of incoming messages");
+ LOG.log(Level.INFO, "Activating receipt of incoming messages");
try {
URL url = new URL(getAddressValue());
//The handler is bind with the context,
@@ -147,7 +150,7 @@
});
}
} catch (Exception e) {
- log.log(Level.WARNING, "URL creation failed: ", e);
+ LOG.log(Level.WARNING, "URL creation failed: ", e);
}
}
@@ -156,7 +159,7 @@
* Deactivate receipt of incoming messages.
*/
protected void deactivateIncoming() {
- log.log(Level.INFO, "Deactivating receipt of incoming messages");
+ LOG.log(Level.INFO, "Deactivating receipt of incoming messages");
engine.removeServant(nurl);
}
@@ -278,8 +281,8 @@
Request baseRequest = (req instanceof Request)
? (Request)req :
HttpConnection.getCurrentConnection().getRequest();
try {
- if (log.isLoggable(Level.INFO)) {
- log.info("Service http request on thread: " +
Thread.currentThread());
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.info("Service http request on thread: " +
Thread.currentThread());
}
MessageImpl inMessage = new MessageImpl();
@@ -305,8 +308,8 @@
resp.flushBuffer();
baseRequest.setHandled(true);
} finally {
- if (log.isLoggable(Level.INFO)) {
- log.info("Finished servicing http request on thread: " +
Thread.currentThread());
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.info("Finished servicing http request on thread: " +
Thread.currentThread());
}
}
}
@@ -335,12 +338,12 @@
}
} else if (null != responseObj) {
String m = (new
org.apache.cxf.common.i18n.Message("UNEXPECTED_RESPONSE_TYPE_MSG",
- log, responseObj.getClass())).toString();
- log.log(Level.WARNING, m);
+ LOG, responseObj.getClass())).toString();
+ LOG.log(Level.WARNING, m);
throw new IOException(m);
} else {
- String m = (new
org.apache.cxf.common.i18n.Message("NULL_RESPONSE_MSG", log)).toString();
- log.log(Level.WARNING, m);
+ String m = (new
org.apache.cxf.common.i18n.Message("NULL_RESPONSE_MSG", LOG)).toString();
+ LOG.log(Level.WARNING, m);
throw new IOException(m);
}
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -28,7 +28,6 @@
import junit.framework.TestCase;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
@@ -52,7 +51,7 @@
}
public void setUp() {
- BusFactory bf = BusFactoryHelper.newInstance();
+ BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
bf.setDefaultBus(bus);
}
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -23,7 +23,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.BusFactoryHelper;
import org.apache.cxf.testutil.common.AbstractClientServerSetupBase;
public abstract class ClientServerSetupBase extends
AbstractClientServerSetupBase {
@@ -38,7 +37,7 @@
if (configFileName != null) {
System.setProperty("cxf.config.file", configFileName);
}
- BusFactory bf = BusFactoryHelper.newInstance();
+ BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
bf.setDefaultBus(bus);
super.setUp();
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/handlers/SmallNumberHandler.java
Mon Jan 29 09:54:36 2007
@@ -88,22 +88,22 @@
}
public final boolean handleFault(LogicalMessageContext messageContext) {
- System.out.println("LogicalMessageHandler handleFault called");
- System.out.println(messageContext);
+ //System.out.println("LogicalMessageHandler handleFault called");
+ //System.out.println(messageContext);
return true;
}
public void close(MessageContext ctx) {
- System.out.println("LogicalHandler close called");
+ //System.out.println("LogicalHandler close called");
}
public void init(Map config) {
- System.out.println("LogicalHandler init called");
+ //System.out.println("LogicalHandler init called");
}
public void destroy() {
- System.out.println("LogicalHandler close called");
+ //System.out.println("LogicalHandler close called");
}
private boolean isSmall(int i) {
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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -32,7 +32,7 @@
import junit.framework.TestSuite;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.jaxws.JaxWsClientProxy;
@@ -110,7 +110,7 @@
private static <T> T createPort(QName serviceName, QName portName,
Class<T> serviceEndpointInterface)
throws Exception {
- Bus bus = BusFactoryHelper.newInstance().getDefaultBus();
+ Bus bus = BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -28,7 +28,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.attachment.AttachmentDeserializer;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
@@ -104,7 +104,7 @@
@Override
protected Bus createBus() throws BusException {
- return BusFactoryHelper.newInstance().getDefaultBus();
+ return BusFactory.newInstance().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=501131&r1=501130&r2=501131
==============================================================================
---
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
Mon Jan 29 09:54:36 2007
@@ -23,7 +23,7 @@
import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.jaxws.JAXWSMethodInvoker;
import org.apache.cxf.jaxws.binding.soap.SOAPBindingImpl;
@@ -44,7 +44,7 @@
Object implementor = new TestMtomImpl();
String address = "http://localhost:9036/mime-test";;
try {
- Bus bus = BusFactoryHelper.newInstance().getDefaultBus();
+ Bus bus = BusFactory.newInstance().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/AbstractTypeTestClient.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
Mon Jan 29 09:54:36 2007
@@ -775,8 +775,17 @@
public void testGMonth() throws Exception {
javax.xml.datatype.DatatypeFactory datatypeFactory =
javax.xml.datatype.DatatypeFactory.newInstance();
- XMLGregorianCalendar x =
datatypeFactory.newXMLGregorianCalendar("--08--");
- XMLGregorianCalendar yOrig =
datatypeFactory.newXMLGregorianCalendar("--12--+05:00");
+ XMLGregorianCalendar x;
+ XMLGregorianCalendar yOrig;
+
+ try {
+ x = datatypeFactory.newXMLGregorianCalendar("--08");
+ yOrig = datatypeFactory.newXMLGregorianCalendar("--12+05:00");
+ } catch (java.lang.IllegalArgumentException iae) {
+ // broken XMLGregorianCalendar impl
+ x = datatypeFactory.newXMLGregorianCalendar("--08--");
+ yOrig = datatypeFactory.newXMLGregorianCalendar("--12--+05:00");
+ }
Holder<XMLGregorianCalendar> y = new
Holder<XMLGregorianCalendar>(yOrig);
Holder<XMLGregorianCalendar> z = new Holder<XMLGregorianCalendar>();
Modified:
incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?view=diff&rev=501131&r1=501130&r2=501131
==============================================================================
---
incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++
incubator/cxf/trunk/tools2/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Mon Jan 29 09:54:36 2007
@@ -36,7 +36,7 @@
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactoryHelper;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
@@ -86,7 +86,7 @@
}
public Bus getBus() {
- return BusFactoryHelper.newInstance().getDefaultBus();
+ return BusFactory.newInstance().getDefaultBus();
}
@SuppressWarnings("unchecked")
