Author: alessio.soldano(a)jboss.com Date: 2011-06-14 10:20:27 -0400 (Tue, 14 Jun 2011) New Revision: 14549 Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java Log: [JBWS-3312] Remove references to old JMS support Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-14 13:49:48 UTC (rev 14548) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-14 14:20:27 UTC (rev 14549) @@ -29,7 +29,6 @@ import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; -import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -85,11 +84,6 @@ this.log.debug("Detected JAXRPC EJB21 deployment"); unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21); } - else if (this.isJaxwsJmsDeployment(unit)) - { - this.log.debug("Detected JAXWS JMS deployment"); - unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JMS); - } } /** @@ -160,15 +154,4 @@ return false; } - - /** - * Returns true if JAXWS JMS deployment is detected. - * - * @param unit deployment unit - * @return true if JAXWS JMS, false otherwise - */ - private boolean isJaxwsJmsDeployment(final DeploymentUnit unit) - { - return ASHelper.hasAttachment(unit, JMSEndpointsMetaData.class); - } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-06-14 13:49:48 UTC (rev 14548) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-06-14 14:20:27 UTC (rev 14549) @@ -47,7 +47,6 @@ WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE()); WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3()); WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JMS, new DeploymentModelBuilderJAXWS_JMS()); } /**