Author: jim.ma Date: 2011-09-05 04:28:04 -0400 (Mon, 05 Sep 2011) New Revision: 14930 Modified: stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/Message.properties stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java Log: [JBWS-3346]:Remove DeploymentType and use EndpointType Modified: stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-09-05 08:13:28 UTC (rev 14929) +++ stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-09-05 08:28:04 UTC (rev 14930) @@ -31,9 +31,9 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.ws.common.integration.WSConstants; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.stack.cxf.client.util.SpringUtils; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.metadata.MetadataBuilder; @@ -92,15 +92,14 @@ */ private URL getCXFConfigFromDeployment(Deployment dep) { - DeploymentType depType = dep.getType(); String metadir; - if (depType == DeploymentType.JAXWS_EJB3) + if (WSHelper.isJaxwsEjbDeployment(dep)) { // expected resource location for EJB3 deployments metadir = "META-INF"; } - else if (depType == DeploymentType.JAXWS_JSE) + if (WSHelper.isJaxwsJseDeployment(dep)) { // expected resource location for POJO deployments metadir = "WEB-INF"; @@ -108,7 +107,7 @@ else { // only POJO and EJB3 deployments are supported - throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNSUPPORTED_DEPLOYMENT_TYPE", depType)); + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNSUPPORTED_DEPLOYMENT_TYPE")); } URL cxfURL = null; Modified: stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/Message.properties =================================================================== --- stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/Message.properties 2011-09-05 08:13:28 UTC (rev 14929) +++ stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/Message.properties 2011-09-05 08:28:04 UTC (rev 14930) @@ -1 +1 @@ -UNSUPPORTED_DEPLOYMENT_TYPE=Unsupported deployment type: {0} +UNSUPPORTED_DEPLOYMENT_TYPE=JAXRPC_JSE or JAXRPC_EJB21 endpoint is not supported Modified: stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-09-05 08:13:28 UTC (rev 14929) +++ stack/cxf/branches/JBWS-3343/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-09-05 08:28:04 UTC (rev 14930) @@ -51,8 +51,8 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; import org.jboss.wsf.spi.invocation.EndpointAssociation; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; @@ -141,8 +141,7 @@ ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class); if (factory != null) { - if (DeploymentType.JAXWS_EJB3 != endpoint.getService().getDeployment().getType() - && factory.getServiceBean() != null) + if (EndpointType.JAXWS_EJB3 != endpoint.getType() && factory.getServiceBean() != null) { InjectionHelper.callPreDestroyMethod(factory.getServiceBean()); }