You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/05/30 21:34:06 UTC
svn commit: r1487984 - in /cxf/branches/dkulp-nowsdl4j:
rt/core/src/main/java/org/apache/cxf/service/factory/
rt/core/src/main/resources/META-INF/cxf/
rt/core/src/test/java/org/apache/cxf/bus/
rt/core/src/test/java/org/apache/cxf/bus/spring/ rt/core/sr...
Author: dkulp
Date: Thu May 30 19:34:03 2013
New Revision: 1487984
URL: http://svn.apache.org/r1487984
Log:
Update to get rt/core wsdl4j free
Added:
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/META-INF/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/META-INF/cxf/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/XPathAssertTest.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test.xml
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test.xml
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test2.xml
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test2.xml
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
- copied, changed from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
Removed:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test.xml
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test2.xml
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
Modified:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java
cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
Modified: cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Thu May 30 19:34:03 2013
@@ -1,5 +1,3 @@
-org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
-org.apache.cxf.wsdl11.WSDLServiceFactoryImpl:org.apache.cxf.wsdl.WSDLServiceFactory:true
org.apache.cxf.bus.managers.PhaseManagerImpl:org.apache.cxf.phase.PhaseManager:true
org.apache.cxf.bus.managers.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
org.apache.cxf.bus.managers.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
@@ -7,7 +5,6 @@ org.apache.cxf.bus.managers.ServerRegist
org.apache.cxf.transports.http.internal.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true
org.apache.cxf.bus.managers.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true
org.apache.cxf.bus.managers.HeaderManagerImpl:org.apache.cxf.headers.HeaderManager:true
-org.apache.cxf.catalog.OASISCatalogManager:org.apache.cxf.catalog.OASISCatalogManager:true
org.apache.cxf.service.factory.FactoryBeanListenerManager::true
org.apache.cxf.bus.managers.ServerLifeCycleManagerImpl:org.apache.cxf.endpoint.ServerLifeCycleManager:true
org.apache.cxf.bus.managers.ClientLifeCycleManagerImpl:org.apache.cxf.endpoint.ClientLifeCycleManager:true
Modified: cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java Thu May 30 19:34:03 2013
@@ -32,7 +32,6 @@ import org.apache.cxf.management.Instrum
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.wsdl.WSDLManager;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
import org.junit.Assert;
@@ -47,7 +46,6 @@ public class CXFBusImplTest extends Asse
assertNotNull(bus.getExtension(BindingFactoryManager.class));
assertNotNull(bus.getExtension(ConduitInitiatorManager.class));
assertNotNull(bus.getExtension(DestinationFactoryManager.class));
- assertNotNull(bus.getExtension(WSDLManager.class));
assertNotNull(bus.getExtension(PhaseManager.class));
}
@@ -56,7 +54,6 @@ public class CXFBusImplTest extends Asse
IMocksControl control;
BindingFactoryManager bindingFactoryManager;
- WSDLManager wsdlManager;
InstrumentationManager instrumentationManager;
PhaseManager phaseManager;
@@ -64,19 +61,16 @@ public class CXFBusImplTest extends Asse
Map<Class<?>, Object> extensions = new HashMap<Class<?>, Object>();
bindingFactoryManager = control.createMock(BindingFactoryManager.class);
- wsdlManager = control.createMock(WSDLManager.class);
instrumentationManager = control.createMock(InstrumentationManager.class);
phaseManager = control.createMock(PhaseManager.class);
extensions.put(BindingFactoryManager.class, bindingFactoryManager);
- extensions.put(WSDLManager.class, wsdlManager);
extensions.put(InstrumentationManager.class, instrumentationManager);
extensions.put(PhaseManager.class, phaseManager);
Bus bus = new ExtensionManagerBus(extensions);
assertSame(bindingFactoryManager, bus.getExtension(BindingFactoryManager.class));
- assertSame(wsdlManager, bus.getExtension(WSDLManager.class));
assertSame(instrumentationManager, bus.getExtension(InstrumentationManager.class));
assertSame(phaseManager, bus.getExtension(PhaseManager.class));
Modified: cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java Thu May 30 19:34:03 2013
@@ -48,7 +48,6 @@ import org.apache.cxf.resource.ResourceM
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.workqueue.WorkQueueManager;
-import org.apache.cxf.wsdl.WSDLManager;
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Assert;
@@ -71,7 +70,6 @@ public class SpringBusFactoryTest extend
assertNotNull("No resource manager", bus.getExtension(ResourceManager.class));
assertNotNull("No destination factory manager", bus.getExtension(DestinationFactoryManager.class));
assertNotNull("No conduit initiator manager", bus.getExtension(ConduitInitiatorManager.class));
- assertNotNull("No wsdl manager", bus.getExtension(WSDLManager.class));
assertNotNull("No phase manager", bus.getExtension(PhaseManager.class));
assertNotNull("No workqueue manager", bus.getExtension(WorkQueueManager.class));
assertNotNull("No lifecycle manager", bus.getExtension(BusLifeCycleManager.class));
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -19,7 +19,7 @@
package org.apache.cxf.aegis.databinding;
import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
/**
* Obsolete copy of {@link XFireCompatibilityServiceConfiguration}.
* @deprecated 2.1
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XFireCompatibilityServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -19,7 +19,7 @@
package org.apache.cxf.aegis.databinding;
import org.apache.cxf.aegis.util.NamespaceHelper;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
/**
* This service configuration uses XFire-compatible conventions for assigning namespace URI's to Java packages
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java Thu May 30 19:34:03 2013
@@ -29,8 +29,9 @@ import org.apache.cxf.frontend.ClientPro
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
+
import org.junit.Before;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/DOMMappingTest.java Thu May 30 19:34:03 2013
@@ -33,7 +33,7 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Thu May 30 19:34:03 2013
@@ -83,11 +83,11 @@ import org.apache.cxf.jaxb.io.DataWriter
import org.apache.cxf.message.Message;
import org.apache.cxf.resource.URIResolver;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.addressing.ObjectFactory;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
@NoJSR250Annotations
public class JAXBDataBinding extends AbstractDataBinding
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Thu May 30 19:34:03 2013
@@ -49,9 +49,9 @@ import org.apache.cxf.resource.DefaultRe
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
/**
* Factory for creating JAX-WS proxies, This class provides access to the
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Thu May 30 19:34:03 2013
@@ -86,7 +86,6 @@ import org.apache.cxf.jaxws.support.JaxW
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.AbstractServiceFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.EndpointInfo;
@@ -98,6 +97,7 @@ import org.apache.cxf.ws.addressing.Endp
import org.apache.cxf.wsdl.EndpointReferenceUtils;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl.http.AddressType;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
public class ServiceImpl extends ServiceDelegate {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/WrapperClassGenerator.java Thu May 30 19:34:03 2013
@@ -49,12 +49,12 @@ import org.apache.cxf.common.util.Packag
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public final class WrapperClassGenerator extends ASMHelper {
public static final String DEFAULT_PACKAGE_NAME = "defaultnamespace";
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java Thu May 30 19:34:03 2013
@@ -38,13 +38,13 @@ import org.apache.cxf.message.MessageCon
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public class WrapperClassInInterceptor extends AbstractPhaseInterceptor<Message> {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java Thu May 30 19:34:03 2013
@@ -37,13 +37,13 @@ import org.apache.cxf.message.MessageCon
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message> {
public WrapperClassOutInterceptor() {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -57,13 +57,13 @@ import org.apache.cxf.common.util.Packag
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.JaxWsConfigurationException;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public class JaxWsServiceConfiguration extends AbstractServiceConfiguration {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Thu May 30 19:34:03 2013
@@ -69,10 +69,8 @@ import org.apache.cxf.jaxws.JAXWSProvide
import org.apache.cxf.jaxws.WrapperClassGenerator;
import org.apache.cxf.jaxws.interceptors.WebFaultOutInterceptor;
import org.apache.cxf.jaxws.spi.ProviderImpl;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.service.factory.FactoryBeanListener;
import org.apache.cxf.service.factory.FactoryBeanListener.Event;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.invoker.SingletonFactory;
@@ -86,6 +84,8 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
/**
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/WebServiceProviderConfiguration.java Thu May 30 19:34:03 2013
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public class WebServiceProviderConfiguration extends JaxWsServiceConfiguration {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Thu May 30 19:34:03 2013
@@ -66,10 +66,10 @@ import org.apache.cxf.jaxws.service.SayH
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.message.Message;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java Thu May 30 19:34:03 2013
@@ -40,11 +40,11 @@ import org.apache.cxf.jaxws.service.Hell
import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/GreeterTest.java Thu May 30 19:34:03 2013
@@ -26,9 +26,9 @@ import org.w3c.dom.Node;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java Thu May 30 19:34:03 2013
@@ -40,12 +40,12 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.transport.Destination;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceModelUtilsTest.java Thu May 30 19:34:03 2013
@@ -34,10 +34,10 @@ import org.apache.cxf.message.ExchangeIm
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceModelUtil;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
import org.junit.Before;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SoapFaultTest.java Thu May 30 19:34:03 2013
@@ -31,9 +31,9 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorDocLitTest.java Thu May 30 19:34:03 2013
@@ -37,11 +37,12 @@ import org.apache.cxf.message.ExchangeIm
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
+
import org.junit.Before;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/URIMappingInterceptorRPCTest.java Thu May 30 19:34:03 2013
@@ -36,11 +36,11 @@ import org.apache.cxf.message.ExchangeIm
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.hello_world_soap_http.RPCLitGreeterImpl;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Thu May 30 19:34:03 2013
@@ -44,7 +44,6 @@ import org.apache.cxf.jaxws.AbstractJaxW
import org.apache.cxf.mtom_xop.TestMtomImpl;
import org.apache.cxf.no_body_parts.NoBodyPartsImpl;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.service.model.FaultInfo;
import org.apache.cxf.service.model.InterfaceInfo;
@@ -53,6 +52,7 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.ws.commons.schema.XmlSchemaElement;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractServiceFactory.java Thu May 30 19:34:03 2013
@@ -21,11 +21,11 @@ package org.apache.cxf.frontend;
import java.io.File;
import org.apache.cxf.service.ServiceBuilder;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.WSDLEndpointFactory;
public abstract class AbstractServiceFactory extends AbstractWSDLBasedEndpointFactory implements
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Thu May 30 19:34:03 2013
@@ -35,9 +35,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.EndpointImpl;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.service.factory.FactoryBeanListener;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -48,6 +46,8 @@ import org.apache.cxf.transport.ConduitI
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.WSDLEndpointFactory;
public abstract class AbstractWSDLBasedEndpointFactory extends AbstractEndpointFactory {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java Thu May 30 19:34:03 2013
@@ -28,11 +28,11 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.service.factory.FactoryBeanListener;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.transport.ConduitInitiator;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.WSDLEndpointFactory;
public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java Thu May 30 19:34:03 2013
@@ -42,7 +42,7 @@ import org.apache.cxf.feature.Feature;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.service.factory.FactoryBeanListener;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
/**
* This class will create a client for you which implements the specified
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Thu May 30 19:34:03 2013
@@ -32,7 +32,6 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.feature.Feature;
import org.apache.cxf.service.factory.FactoryBeanListener;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.invoker.BeanInvoker;
import org.apache.cxf.service.invoker.FactoryInvoker;
@@ -41,6 +40,7 @@ import org.apache.cxf.service.invoker.Si
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.wsdl11.WSDLEndpointFactory;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/spring/ServerFactoryBeanDefinitionParser.java Thu May 30 19:34:03 2013
@@ -30,7 +30,7 @@ import org.apache.cxf.common.injection.N
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.apache.cxf.frontend.ServerFactoryBean;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/main/java/org/apache/cxf/simple/SimpleServiceBuilder.java Thu May 30 19:34:03 2013
@@ -20,7 +20,7 @@
package org.apache.cxf.simple;
import org.apache.cxf.frontend.AbstractServiceFactory;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public class SimpleServiceBuilder extends AbstractServiceFactory {
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java Thu May 30 19:34:03 2013
@@ -41,6 +41,8 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.junit.Test;
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
@@ -27,17 +27,18 @@ import javax.xml.namespace.QName;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceFactoryBean;
public abstract class AbstractServiceConfiguration {
protected String serviceNamespace;
- private ReflectionServiceFactoryBean serviceFactory;
+ private AbstractServiceFactoryBean serviceFactory;
- public ReflectionServiceFactoryBean getServiceFactory() {
+ public AbstractServiceFactoryBean getServiceFactory() {
return serviceFactory;
}
- public void setServiceFactory(ReflectionServiceFactoryBean serviceFactory) {
+ public void setServiceFactory(AbstractServiceFactoryBean serviceFactory) {
this.serviceFactory = serviceFactory;
}
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
@@ -36,6 +36,7 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
+import org.apache.cxf.wsdl.service.factory.ServiceConstructionException;
public class DefaultServiceConfiguration extends AbstractServiceConfiguration {
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/MethodNameSoapActionServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/MethodNameSoapActionServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
import java.lang.reflect.Method;
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java Thu May 30 19:34:03 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Array;
@@ -90,7 +90,6 @@ import org.apache.cxf.resource.ResourceM
import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.ServiceModelSchemaValidator;
-import org.apache.cxf.service.factory.FactoryBeanListener.Event;
import org.apache.cxf.service.invoker.FactoryInvoker;
import org.apache.cxf.service.invoker.Invoker;
import org.apache.cxf.service.invoker.MethodDispatcher;
@@ -108,6 +107,12 @@ import org.apache.cxf.service.model.Sche
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.service.model.UnwrappedOperationInfo;
import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.DefaultServiceConfiguration;
+import org.apache.cxf.wsdl.service.factory.ServiceConstructionException;
+import org.apache.cxf.wsdl.service.factory.SimpleMethodDispatcher;
+import org.apache.cxf.wsdl.service.factory.FactoryBeanListener.Event;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.ws.commons.schema.XmlSchema;
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/service/factory/WSDLBasedServiceConfiguration.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/WSDLBasedServiceConfiguration.java Thu May 30 19:34:03 2013
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.service.factory;
+package org.apache.cxf.wsdl.service.factory;
import javax.wsdl.extensions.soap.SOAPBinding;
import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
/**
* An AbstractServiceConfiguration that gets the style
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLServiceFactory.java Thu May 30 19:34:03 2013
@@ -39,10 +39,10 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
-import org.apache.cxf.service.factory.AbstractServiceFactoryBean;
-import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceFactoryBean;
+import org.apache.cxf.wsdl.service.factory.ServiceConstructionException;
import org.apache.ws.commons.schema.XmlSchemaException;
public class WSDLServiceFactory extends AbstractServiceFactoryBean {
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/resources/META-INF/cxf/bus-extensions.txt&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/XPathAssertTest.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/XPathAssertTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/XPathAssertTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/XPathAssertTest.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test.xml (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test.xml?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test.xml&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test.xml&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test2.xml (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test2.xml)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test2.xml?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/test/test2.xml&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/test/test2.xml&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactorBeanTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java Thu May 30 19:34:03 2013
@@ -1,76 +1,77 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.service.factory;
-
-import javax.wsdl.WSDLException;
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.wsdl.WSDLManager;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- *
- */
-public class ReflectionServiceFactorBeanTest extends Assert {
- protected IMocksControl control;
-
- @Before
- public void setUp() throws Exception {
- control = EasyMock.createNiceControl();
- }
-
- @After
- public void tearDown() throws Exception {
- control.verify();
- }
-
- @Test
- public void testEmptyWsdlAndNoServiceClass() throws Exception {
- final String dummyWsdl = "target/dummy.wsdl";
- ReflectionServiceFactoryBean bean = new ReflectionServiceFactoryBean();
- Bus bus = control.createMock(Bus.class);
-
- WSDLManager wsdlmanager = control.createMock(WSDLManager.class);
- EasyMock.expect(bus.getExtension(WSDLManager.class)).andReturn(wsdlmanager);
- EasyMock.expect(wsdlmanager.getDefinition(dummyWsdl))
- .andThrow(new WSDLException("PARSER_ERROR", "Problem parsing '" + dummyWsdl + "'."));
- EasyMock.expect(bus.getExtension(FactoryBeanListenerManager.class)).andReturn(null);
-
- control.replay();
-
- bean.setWsdlURL(dummyWsdl);
- bean.setServiceName(new QName("http://cxf.apache.org/hello_world_soap_http", "GreeterService"));
- bean.setBus(bus);
-
- try {
- bean.create();
- fail("no valid wsdl nor service class specified");
- } catch (ServiceConstructionException e) {
- // ignore
- }
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.wsdl.service.factory;
+
+import javax.wsdl.WSDLException;
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class ReflectionServiceFactorBeanTest extends Assert {
+ protected IMocksControl control;
+
+ @Before
+ public void setUp() throws Exception {
+ control = EasyMock.createNiceControl();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ control.verify();
+ }
+
+ @Test
+ public void testEmptyWsdlAndNoServiceClass() throws Exception {
+ final String dummyWsdl = "target/dummy.wsdl";
+ ReflectionServiceFactoryBean bean = new ReflectionServiceFactoryBean();
+ Bus bus = control.createMock(Bus.class);
+
+ WSDLManager wsdlmanager = control.createMock(WSDLManager.class);
+ EasyMock.expect(bus.getExtension(WSDLManager.class)).andReturn(wsdlmanager);
+ EasyMock.expect(wsdlmanager.getDefinition(dummyWsdl))
+ .andThrow(new WSDLException("PARSER_ERROR", "Problem parsing '" + dummyWsdl + "'."));
+ EasyMock.expect(bus.getExtension(FactoryBeanListenerManager.class)).andReturn(null);
+
+ control.replay();
+
+ bean.setWsdlURL(dummyWsdl);
+ bean.setServiceName(new QName("http://cxf.apache.org/hello_world_soap_http", "GreeterService"));
+ bean.setBus(bus);
+
+ try {
+ bean.create();
+ fail("no valid wsdl nor service class specified");
+ } catch (ServiceConstructionException e) {
+ // ignore
+ }
+ }
+}
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/ServiceWSDLBuilderTest.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLDefinitionBuilderTest.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLManagerImplTest.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (from r1487975, cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java&p1=cxf/branches/dkulp-nowsdl4j/rt/core/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java&r1=1487975&r2=1487984&rev=1487984&view=diff
==============================================================================
(empty)
Modified: cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java (original)
+++ cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java Thu May 30 19:34:03 2013
@@ -29,12 +29,12 @@ import org.apache.cxf.jaxws.EndpointImpl
import org.apache.cxf.jaxws.JAXWSMethodInvoker;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.ordered_param_holder.OrderedParamHolderImpl;
-import org.apache.cxf.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.service.invoker.Factory;
import org.apache.cxf.service.invoker.PerRequestFactory;
import org.apache.cxf.service.invoker.PooledFactory;
import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.service.factory.AbstractServiceConfiguration;
public class ServerMisc extends AbstractBusTestServerBase {
Modified: cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java Thu May 30 19:34:03 2013
@@ -52,10 +52,10 @@ import org.apache.cxf.mime.TestMtom;
import org.apache.cxf.mime.types.XopStringType;
import org.apache.cxf.mtom_xop.TestMtomImpl;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopWithJMSTest.java Thu May 30 19:34:03 2013
@@ -46,11 +46,11 @@ import org.apache.cxf.jaxws.support.JaxW
import org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean;
import org.apache.cxf.mime.TestMtom;
import org.apache.cxf.service.Service;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java Thu May 30 19:34:03 2013
@@ -24,7 +24,6 @@ import java.lang.reflect.ParameterizedTy
import java.lang.reflect.Type;
import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
@@ -35,6 +34,7 @@ import org.apache.cxf.tools.common.model
import org.apache.cxf.tools.common.model.JavaParameter;
import org.apache.cxf.tools.common.model.JavaReturn;
import org.apache.cxf.tools.common.model.JavaType.Style;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public final class JavaFirstUtil {
private JavaFirstUtil() {
Modified: cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java?rev=1487984&r1=1487983&r2=1487984&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java Thu May 30 19:34:03 2013
@@ -33,7 +33,6 @@ import javax.jws.WebService;
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PackageUtils;
-import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.service.model.OperationInfo;
@@ -56,6 +55,7 @@ import org.apache.cxf.tools.java2wsdl.pr
import org.apache.cxf.tools.java2wsdl.processor.internal.jaxws.generator.JaxwsSEIGenerator;
import org.apache.cxf.tools.java2wsdl.processor.internal.jaxws.generator.JaxwsServerGenerator;
import org.apache.cxf.tools.wsdlto.core.AbstractGenerator;
+import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
public class JAXWSFrontEndProcessor implements Processor {
private static final String SEI_SUFFIX = "_PortType";