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:46:02 UTC
svn commit: r1487988 - in /cxf/branches/dkulp-nowsdl4j:
rt/core/src/main/java/org/apache/cxf/catalog/
rt/core/src/main/resources/META-INF/cxf/
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ rt/wsdl/
rt/wsdl/src/main/java/org/apache/cxf/c...
Author: dkulp
Date: Thu May 30 19:46:01 2013
New Revision: 1487988
URL: http://svn.apache.org/r1487988
Log:
Move catalog manager back to core (jax-rs does use it), but move the wsdl specific loader to wsdl11
Added:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
- copied, changed from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
- copied, changed from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
- copied, changed from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
- copied, changed from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java
Removed:
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
Modified:
cxf/branches/dkulp-nowsdl4j/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/AbstractServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
Copied: cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java (from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java?p2=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java&p1=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java&r1=1487985&r2=1487988&rev=1487988&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java (from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java?p2=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java&p1=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java&r1=1487985&r2=1487988&rev=1487988&view=diff
==============================================================================
(empty)
Copied: cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java (from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java?p2=cxf/branches/dkulp-nowsdl4j/rt/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java&p1=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java&r1=1487985&r2=1487988&rev=1487988&view=diff
==============================================================================
(empty)
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=1487988&r1=1487987&r2=1487988&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:46:01 2013
@@ -9,4 +9,5 @@ org.apache.cxf.service.factory.FactoryBe
org.apache.cxf.bus.managers.ServerLifeCycleManagerImpl:org.apache.cxf.endpoint.ServerLifeCycleManager:true
org.apache.cxf.bus.managers.ClientLifeCycleManagerImpl:org.apache.cxf.endpoint.ClientLifeCycleManager:true
org.apache.cxf.bus.resource.ResourceManagerImpl:org.apache.cxf.resource.ResourceManager:true
+org.apache.cxf.catalog.OASISCatalogManager:org.apache.cxf.catalog.OASISCatalogManager:true
Modified: cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceConfigurationTest.java Thu May 30 19:46:01 2013
@@ -34,11 +34,11 @@ import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
import org.apache.cxf.service.model.MessageInfo;
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactoryManager;
+import org.apache.cxf.wsdl11.CatalogWSDLLocator;
import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml Thu May 30 19:46:01 2013
@@ -36,9 +36,13 @@
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
+ <artifactId>cxf-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/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?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/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:46:01 2013
@@ -27,18 +27,17 @@ 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 AbstractServiceFactoryBean serviceFactory;
+ private ReflectionServiceFactoryBean serviceFactory;
- public AbstractServiceFactoryBean getServiceFactory() {
+ public ReflectionServiceFactoryBean getServiceFactory() {
return serviceFactory;
}
- public void setServiceFactory(AbstractServiceFactoryBean serviceFactory) {
+ public void setServiceFactory(ReflectionServiceFactoryBean serviceFactory) {
this.serviceFactory = serviceFactory;
}
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/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?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/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:46:01 2013
@@ -36,7 +36,6 @@ 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 {
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/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?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/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:46:01 2013
@@ -107,12 +107,6 @@ 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;
@@ -134,7 +128,7 @@ import org.apache.ws.commons.schema.util
* will be filled in from the service class. If no WSDL URL is specified, the
* Service will be constructed directly from the class structure.
*/
-public class ReflectionServiceFactoryBean extends AbstractServiceFactoryBean {
+public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory.AbstractServiceFactoryBean {
public static final String ENDPOINT_CLASS = "endpoint.class";
public static final String GENERIC_TYPE = "generic.type";
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java (from r1487985, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java&p1=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java&r1=1487985&r2=1487988&rev=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/catalog/CatalogWSDLLocator.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java Thu May 30 19:46:01 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.catalog;
+package org.apache.cxf.wsdl11;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -26,6 +26,8 @@ import javax.wsdl.xml.WSDLLocator;
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
+import org.apache.cxf.catalog.OASISCatalogManager;
+import org.apache.cxf.catalog.OASISCatalogManagerHelper;
import org.apache.cxf.resource.ExtendedURIResolver;
import org.apache.cxf.transport.TransportURIResolver;
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ResourceManagerWSDLLocator.java Thu May 30 19:46:01 2013
@@ -25,7 +25,6 @@ import javax.wsdl.xml.WSDLLocator;
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
import org.apache.cxf.resource.ResourceManager;
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java Thu May 30 19:46:01 2013
@@ -52,7 +52,6 @@ import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.logging.LogUtils;
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/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?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Thu May 30 19:46:01 2013
@@ -45,7 +45,6 @@ import org.w3c.dom.Node;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.CastUtils;
Modified: cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java?rev=1487988&r1=1487987&r2=1487988&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/OASISCatalogTest.java Thu May 30 19:46:01 2013
@@ -32,11 +32,11 @@ import javax.xml.ws.WebServiceException;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.catalog.CatalogWSDLLocator;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.cxf.wsdl.WSDLManager;
+import org.apache.cxf.wsdl11.CatalogWSDLLocator;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
import org.apache.hello_world.Greeter;