Author: jim.ma Date: 2010-04-20 23:03:47 -0400 (Tue, 20 Apr 2010) New Revision: 12059 Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java Log: [JBWS-2791]:modified AbstractDeploymentAspect.canHandle() to take into account jms endpoints deployment descriptor;Added utitily method to check if the spi depoyment containsjms endpoints deployment Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java =================================================================== --- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-04-21 02:46:17 UTC (rev 12058) +++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2010-04-21 03:03:47 UTC (rev 12059) @@ -48,6 +48,7 @@ private boolean isLast; private boolean isForJaxWs = true; private boolean isForJaxRpc = true; + private boolean processEndpointDeployment = false; private WeakReference<ClassLoader> loader; public AbstractDeploymentAspect() @@ -135,9 +136,20 @@ public boolean canHandle(Deployment dep) { return (this.isForJaxWs && WSHelper.isJaxwsDeployment(dep) || - this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep)); + this.isForJaxRpc && WSHelper.isJaxrpcDeployment(dep) + || this.isForJaxWs && processEndpointDeployment); } + public boolean isProcessEndpointDeployment() + { + return processEndpointDeployment; + } + + public void setProcessEndpointDeployment(boolean processEndpointDeployment) + { + this.processEndpointDeployment = processEndpointDeployment; + } + public boolean isForJaxWs() { return isForJaxWs; Modified: common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java =================================================================== --- common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-04-21 02:46:17 UTC (rev 12058) +++ common/branches/jms-integration/src/main/java/org/jboss/wsf/common/integration/WSHelper.java 2010-04-21 03:03:47 UTC (rev 12059) @@ -24,6 +24,7 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.endpoints.EndpointsMetaData; /** * Cross WS stack and JBoss AS integration helper. @@ -189,5 +190,10 @@ return isJaxrpcEjb || isJaxrpcJse; } + + public static boolean hasEndpointsDeployment(final Deployment dep) + { + return WSHelper.getRequiredAttachment(dep, EndpointsMetaData.class) != null ? true : false; + } }