Author: thomas.diesler(a)jboss.com Date: 2008-05-29 05:32:33 -0400 (Thu, 29 May 2008) New Revision: 7199 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Switch container integration to scope=runtime Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-29 09:16:17 UTC (rev 7198) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-05-29 09:32:33 UTC (rev 7199) @@ -25,14 +25,10 @@ import java.io.IOException; import java.net.URL; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.jboss.logging.Logger; -import org.jboss.metadata.javaee.spec.ParamValueMetaData; -import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; @@ -212,53 +208,6 @@ } // put cxf config URL to the property map contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); - - boolean jbossWebMetaDataAvailable = true; - - try - { - Class.forName("org.jboss.metadata.web.jboss.JBossWebMetaData"); - } - catch (Exception ignore) - { - // we are not running on AS 5 - jbossWebMetaDataAvailable = false; - } - - if (jbossWebMetaDataAvailable && (dep.getType() == DeploymentType.JAXWS_EJB3)) - { - // put cxf config URL to generated web app context params - JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class); - if (jbwmd != null) - { - boolean alreadySet = false; - List<ParamValueMetaData> ctxParams = jbwmd.getContextParams(); - if (ctxParams == null) - { - ctxParams = new ArrayList<ParamValueMetaData>(); - jbwmd.setContextParams(ctxParams); - } - - if (ctxParams.size() > 0) - { - for (ParamValueMetaData pvmd : ctxParams) - { - if (pvmd.getParamName().equals(CXFServletExt.PARAM_CXF_BEANS_URL)) - { - alreadySet = true; - } - } - } - - if (false == alreadySet) - { - ParamValueMetaData pvmd = new ParamValueMetaData(); - pvmd.setParamName(CXFServletExt.PARAM_CXF_BEANS_URL); - pvmd.setParamValue(cxfURL.toExternalForm()); - ctxParams.add(pvmd); - } - } - } } } Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-05-29 09:16:17 UTC (rev 7198) +++ stack/cxf/trunk/pom.xml 2008-05-29 09:32:33 UTC (rev 7199) @@ -283,6 +283,8 @@ <!-- Dependencies --> <dependencies> + + <!-- Provided dependencies, visible to all modules --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> @@ -297,64 +299,66 @@ <scope>provided</scope> <type>zip</type> </dependency> + + <!-- Runtime dependencies, not visible at compile time --> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <classifier>container</classifier> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <classifier>container</classifier> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> </dependencies> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:16:17 UTC (rev 7198) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:32:33 UTC (rev 7199) @@ -25,20 +25,20 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> + <scope>runtime</scope> <unpack>false</unpack> <includes> - <include>*:jbossws-jboss422:jar:*</include> - <include>*:jbossws-jboss423:jar:*</include> - <include>*:jbossws-jboss500:jar:*</include> - <include>*:jbossws-jboss501:jar:*</include> + <include>*:jbossws-jboss422:jar</include> + <include>*:jbossws-jboss423:jar</include> + <include>*:jbossws-jboss500:jar</include> + <include>*:jbossws-jboss501:jar</include> </includes> </dependencySet> <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> + <scope>runtime</scope> <unpack>false</unpack> <includes> <include>*:jbossws-jboss500:jar:container</include>