Author: asoldano Date: 2014-05-20 06:24:27 -0400 (Tue, 20 May 2014) New Revision: 18684 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml Log: [JBWS-3779] WIP Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-05-20 10:23:19 UTC (rev 18683) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2014-05-20 10:24:27 UTC (rev 18684) @@ -34,7 +34,6 @@ import org.jboss.logging.Message; import org.jboss.logging.MessageBundle; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentType; import org.jboss.wsf.spi.deployment.WSFDeploymentException; /** @@ -195,9 +194,6 @@ @Message(id = 24076, value = "Service %s, cannot publish wsdl to: %s") RuntimeException cannotPublishWSDLTo(QName serviceName, File file, @Cause Throwable cause); - @Message(id = 24082, value = "Unsupported deployment type: %s") - IllegalStateException unsupportedDeploymentType(DeploymentType depType); - @Message(id = 24083, value = "Endpoint %s is not defined in jbossws-cxf.xml") IllegalStateException endpointNotDefineInJbwsCxf(String ep); Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java 2014-05-20 10:23:19 UTC (rev 18683) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceRefFactoryImpl.java 2014-05-20 10:24:27 UTC (rev 18684) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -23,8 +23,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.serviceref.ServiceRefFactory; -import org.jboss.wsf.spi.serviceref.ServiceRefType; -import org.jboss.wsf.stack.cxf.Messages; /** * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> @@ -34,10 +32,6 @@ @Override public Object newServiceRef(final UnifiedServiceRefMetaData serviceRefUMDM) { - if (serviceRefUMDM.getType() == ServiceRefType.JAXWS) { - return new CXFServiceObjectFactoryJAXWS().getObjectInstance(serviceRefUMDM); - } else { - throw Messages.MESSAGES.jaxrpcServiceRefNotSupported(); - } + return new CXFServiceObjectFactoryJAXWS().getObjectInstance(serviceRefUMDM); } } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2014-05-20 10:23:19 UTC (rev 18683) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2014-05-20 10:24:27 UTC (rev 18684) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2013, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -21,8 +21,6 @@ */ package org.jboss.wsf.stack.cxf.deployment.aspect; -import static org.jboss.wsf.spi.deployment.DeploymentType.JAXRPC; -import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment; import static org.jboss.ws.common.integration.WSHelper.isJseDeployment; import static org.jboss.ws.common.integration.WSHelper.isWarArchive; import static org.jboss.wsf.stack.cxf.Loggers.DEPLOYMENT_LOGGER; @@ -35,7 +33,6 @@ import org.jboss.ws.common.integration.WSConstants; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.cxf.Messages; import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.stack.cxf.client.util.SpringUtils; import org.jboss.wsf.stack.cxf.configuration.BusHolder; @@ -96,10 +93,6 @@ */ private URL getCXFConfigFromDeployment(Deployment dep) { - if (isJaxrpcDeployment(dep)) - { - throw Messages.MESSAGES.unsupportedDeploymentType(JAXRPC); - } String metadir = null; if (isJseDeployment(dep) || isWarArchive(dep)) { Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2014-05-20 10:23:19 UTC (rev 18683) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as8.xml 2014-05-20 10:24:27 UTC (rev 18684) @@ -34,41 +34,34 @@ </entry> </map> </property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> <property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property> <property name="provides" class="java.lang.String">StackDescriptor</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> <property name="provides" class="java.lang.String">ResourceResolver</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect"> <property name="requires" class="java.lang.String">ContainerMetaData</property> <property name="provides" class="java.lang.String">StackEndpointHandler</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect"> <property name="requires" class="java.lang.String">ContainerMetaData,BusHolder</property> <property name="provides" class="java.lang.String">StackInstanceProvider</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect"> <property name="provides" class="java.lang.String">JAXBIntros</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> <property name="provides" class="java.lang.String">BusHolder</property> <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> </deploymentAspects> Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-05-20 10:23:19 UTC (rev 18683) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-05-20 10:24:27 UTC (rev 18684) @@ -34,41 +34,34 @@ </entry> </map> </property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> <property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property> <property name="provides" class="java.lang.String">StackDescriptor</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> <property name="provides" class="java.lang.String">ResourceResolver</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect"> <property name="requires" class="java.lang.String">ContainerMetaData</property> <property name="provides" class="java.lang.String">StackEndpointHandler</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect"> <property name="requires" class="java.lang.String">ContainerMetaData,BusHolder</property> <property name="provides" class="java.lang.String">StackInstanceProvider</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect"> <property name="provides" class="java.lang.String">JAXBIntros</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> <property name="provides" class="java.lang.String">BusHolder</property> <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property> - <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> </deploymentAspects>