Author: ropalka Date: 2011-12-16 05:27:17 -0500 (Fri, 16 Dec 2011) New Revision: 15404 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java Log: [JBWS-3401] if EJBs referencing WSDL are bundled in .war archives, always use WEB-INF/wsdl 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 2011-12-16 10:24:57 UTC (rev 15403) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-12-16 10:27:17 UTC (rev 15404) @@ -25,6 +25,8 @@ import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbDeployment; import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseDeployment; 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 java.io.IOException; import java.net.URL; @@ -112,17 +114,17 @@ throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNSUPPORTED_DEPLOYMENT_TYPE", JAXRPC)); } String metadir = null; - if (isJaxwsEjbDeployment(dep)) + if (isJseDeployment(dep) || isWarArchive(dep)) { - // expected resource location for EJB3 deployments - metadir = "META-INF"; - } - if (isJaxwsJseDeployment(dep)) - { // expected resource location for POJO deployments // if EJBs are bundled in WARs, we default to WEB-INF metadir = "WEB-INF"; } + else + { + // expected resource location for EJB3 deployments + metadir = "META-INF"; + } URL cxfURL = null; try