[jbossws-commits] JBossWS SVN: r6709 - in stack/cxf/trunk: modules/server and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-25 11:58:26 -0400 (Fri, 25 Apr 2008) New Revision: 6709 Removed: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt Modified: stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: jboss501 integration (wip) Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -155,6 +155,22 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory> </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> + </artifactItem> </artifactItems> </configuration> </execution> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -53,16 +53,26 @@ &lt;/deployment&gt; </footer> </concat> - <!-- Concat jbossws-jboss500-beans/META-INF/jboss-beans.xml - -> - <echo message="Concat jbossws-jboss500-beans/META-INF/jboss-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss500-beans/META-INF/jboss-beans.xml"> + <!-- Concat jbossws-jboss500/jbossws.beans --> + <echo message="Concat jbossws-jboss500/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> - </concat--> + </concat> + <!-- Concat jbossws-jboss501/jbossws.beans --> + <echo message="Concat jbossws-jboss501/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; </footer> + </concat> + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -13,6 +13,7 @@ <version>3.0.2-SNAPSHOT</version> </parent> + <!-- Plugins --> <build> <plugins> <plugin> @@ -80,6 +81,48 @@ </plugins> </build> </profile> + + <!-- + Name: jboss500 + Descr: JBoss-5.0.0 specific options + --> + <profile> + <id>jboss500</id> + <activation> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <testExcludes> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jboss501 + Descr: JBoss-5.0.1 specific options + --> + <profile> + <id>jboss501</id> + <activation> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <testExcludes> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -22,7 +22,7 @@ <!-- A time/date based rolling appender --> <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${jbossws.test.log}/test.log"/> + <param name="File" value="${build.testlog}/test.log"/> <param name="Append" value="true"/> <!-- Rollover at midnight each day --> Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -13,6 +13,7 @@ <version>3.0.2-SNAPSHOT</version> </parent> + <!-- Plugins --> <build> <plugins> <plugin> @@ -87,6 +88,10 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> + <!-- + Exlude tests via an external exlude file + http://jira.codehaus.org/browse/SUREFIRE-486 + --> <testExcludes> <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly --> <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> @@ -196,6 +201,10 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> + <!-- + Exlude tests via an external exlude file + http://jira.codehaus.org/browse/SUREFIRE-486 + --> <testExcludes> <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly --> <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> @@ -287,14 +296,266 @@ <!-- [CXF-1522] NPE in ServiceUtils --> <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jboss500 + Descr: JBoss-5.0.0 specific options + --> + <profile> + <id>jboss500</id> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- + Exlude tests via an external exlude file + http://jira.codehaus.org/browse/SUREFIRE-486 + --> + <testExcludes> + <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly --> + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory --> + <!-- [JBWS-1178] Multiple virtual host and soap:address problem --> + <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude> + + <!-- [JBWS-1774] Provide tools implementation for CXF --> + <exclude>org/jboss/test/ws/jaxws/complex/**</exclude> + <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> + + <!-- [JBWS-1683] Fix JAXR samples for CXF --> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + + <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) --> + <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude> + + <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + + <!-- [CXF-1244] Application Exception not initialized properly --> + <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> + + <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope --> + <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> + + <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI --> + <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude> + + <!-- [JBWS-2107] Resolve dependency on @SecurityDomain --> + <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude> + + <!-- [CXF-1510] Cannot handle anonymous bare requests --> + <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude> + + <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext --> + <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> + + <!-- [JBWS-2112] Cannot use CXF with endpoint API --> + <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> + + <!-- [CXF-1513] NPE in JaxWsServiceConfiguration --> + <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> + + <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account --> + <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude> + + <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class --> + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> + + <!-- [CXF-1515] Bad Enumeration value 'extension restriction' --> + <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> + + <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated --> + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + + <!-- [CXF-1516] Type inheritance with document/literal/wrapped --> + <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude> + + <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail --> + <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude> + + <!-- [CXF-1517] HTTP bindings for Provider --> + <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> + + <!-- [JBWS-2118] context-root in jboss.xml is ignored --> + <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> + + <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider --> + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + + <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work --> + <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> + + <!-- [CXF-1519] Explicitly set the namespace of a WebFault --> + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + + <!-- [CXF-1520] MTOM chunked encoding transfer --> + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + + <!-- [CXF-1521] Exception handling with @WebFault annotation --> + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + + <!-- [CXF-1522] NPE in ServiceUtils --> + <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + + <!-- [JBWS-2120] @WebWservice does not work with class isolation --> + <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude> + + <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks --> + <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jboss501 + Descr: JBoss-5.0.1 specific options + --> + <profile> + <id>jboss501</id> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- + Exlude tests via an external exlude file + http://jira.codehaus.org/browse/SUREFIRE-486 + --> + <testExcludes> + + <!-- Won't Fix: [CXF-1261] Handler does not see XOP message properly --> + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> + + <!-- [JBWS-1178] Multiple virtual host and soap:address problem --> + <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude> + + <!-- [JBWS-1774] Provide tools implementation for CXF --> + <exclude>org/jboss/test/ws/jaxws/complex/**</exclude> + <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> + + <!-- [JBWS-1683] Fix JAXR samples for CXF --> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + + <!-- [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) --> + <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude> + + <!-- [EJBTHREE-1150] WebServiceContext injection requires mapped-name --> + <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*</exclude> + + <!-- [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored --> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*</exclude> + + <!-- [CXF-1244] Application Exception not initialized properly --> + <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> + + <!-- [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope --> + <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> + + <!-- [CXF-1253] CXF does not respect @HandlerChain on client SEI --> + <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude> + + <!-- TODO: Fix classpath to ClientLauncher --> + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + + <!-- [JBWS-2107] Resolve dependency on @SecurityDomain --> + <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude> + + <!-- [CXF-1510] Cannot handle anonymous bare requests --> + <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude> + + <!-- [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext --> + <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> + + <!-- [JBWS-2112] Cannot use CXF with endpoint API --> + <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> + + <!-- [CXF-1513] NPE in JaxWsServiceConfiguration --> + <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> + + <!-- [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account --> + <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude> + + <!-- [JBWS-2114] IllegalArgumentException: Wrong target. class --> + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> + + <!-- [CXF-1515] Bad Enumeration value 'extension restriction' --> + <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> + + <!-- [JBWS-2115] EJB client vehicle not sufficiently isolated --> + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + + <!-- [CXF-1516] Type inheritance with document/literal/wrapped --> + <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude> + + <!-- [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail --> + <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude> + + <!-- [CXF-1517] HTTP bindings for Provider --> + <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> + + <!-- [JBWS-2118] context-root in jboss.xml is ignored --> + <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> + + <!-- [CXF-1518] Missing fault detail in messages from SLSB Provider --> + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + + <!-- [JBWS-2119] WebServiceRef injection from DD doesn't work --> + <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> + + <!-- [CXF-1519] Explicitly set the namespace of a WebFault --> + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + + <!-- [CXF-1520] MTOM chunked encoding transfer --> + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + + <!-- [CXF-1521] Exception handling with @WebFault annotation --> + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + + <!-- [CXF-1522] NPE in ServiceUtils --> + <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + + <!-- [JBAS-5359] mapped-name is required for context of deployment --> + <exclude>org/jboss/test/ws/console/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1611/**</exclude> + + <!-- [JBWS-2097] Unlock WS-ReliableMessaging in all stacks --> + <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude> + + <!-- [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory - -> <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/webservice/**</exclude--> </testExcludes> </configuration> </plugin> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -251,7 +251,7 @@ <profile> <id>jboss501</id> <properties> - <jboss.version>5.0.1-SNAPSHOT</jboss.version> + <jboss.version>5.0.0-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss501</jbossws.integration.target> </properties> <dependencies> Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-25 15:58:26 UTC (rev 6709) @@ -1,97 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-25 15:58:26 UTC (rev 6709) @@ -1,103 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/webserviceref/Secure** -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2120] @WebWservice does not work with class isolation -org/jboss/test/ws/jaxws/jbws1556/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-25 15:58:26 UTC (rev 6709) @@ -1,110 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1150] WebServiceContext injection requires mapped-name -org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# TODO: Fix classpath to ClientLauncher -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBAS-5359] mapped-name is required for context of deployment -org/jboss/test/ws/console/** -org/jboss/test/ws/jaxws/jbws1611/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -43,35 +43,22 @@ Here we explain first the manual procedure. Further down you find instruction on how to do this using our automated Hudson QA environment. - Working with JBossWS-Native - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Working with JBossWS + ~~~~~~~~~~~~~~~~~~~~ - To run the general JAXWS samples against our native WS stack on JBoss-5.0 you would run the sequence below. + To run the general JAXWS samples against our web service stack on JBoss-5.0 you would run the sequence below. This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly. - cd stack/native/trunk ant deploy-jboss500 - ant tests-smoke + mvn -Ptestsuite,jboss500 test - To run the collection of provider sample tests, you would run - - ant -Dtest=jaxws/samples/provider test - - To run a single specific test, you would run - - ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test - - This can be done in debug mode as well - - ant -Ddebug=true -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test - Working with the Hudson QA environment ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Hudson QA environment helps you to test any supported stack against any supported target container. To setup Hudson on your local box, you would run - cd framework/trunk + cd framework/trunk/hudson ant hudson-setup ant hudson-start @@ -116,10 +103,12 @@ <cxf.version>2.0.5-incubator</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> - <jbossws.framework.version>${version}</jbossws.framework.version> + <jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.jboss422.version>3.0.0-SNAPSHOT</jbossws.jboss422.version> <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version> + <jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version> + <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> @@ -187,6 +176,42 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + <classifier>container</classifier> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>container</classifier> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> <!-- provided apis --> <dependency> @@ -303,34 +328,76 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <classifier>scripts</classifier> + <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <classifier>testsuite</classifier> + <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <classifier>resources</classifier> + <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <classifier>resources</classifier> + <scope>provided</scope> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <classifier>container</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <classifier>resources</classifier> + <scope>provided</scope> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <classifier>container</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <classifier>resources</classifier> + <scope>provided</scope> + <type>zip</type> + </dependency> </dependencies> <!-- Plugins --> Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -102,6 +102,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/> </target> <!-- ================================================================== --> @@ -123,6 +124,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/> </target> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -162,11 +162,13 @@ <macrodef name="macro-deploy-jbossws-client"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; </fileset> </copy> </sequential> @@ -176,7 +178,7 @@ <!-- Deploy Server Lib --> <!-- ================================================================== --> - <macrodef name="macro-deploy-jbossws-server-lib"> + <macrodef name="macro-deploy-jbossws-server-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -191,6 +193,20 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-server-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JBossWS Service --> <!-- ================================================================== --> @@ -230,33 +246,72 @@ </macrodef> <macrodef name="macro-deploy-jbossws-cxf50-sar"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> </fileset> </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot; overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-context*.war"/> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot;&gt; - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf50-beans.xml"/> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> </fileset> </copy> - <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf50-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; - </copy> </sequential> </macrodef> + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name=&quot;**/jbossws-(a){jbossid}-container.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + <!-- ================================================================== --> <!-- Deploy JBossWS --> <!-- ================================================================== --> @@ -266,18 +321,20 @@ <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -295,15 +352,42 @@ <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> - <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> - <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + <!-- delete stale container integration jars --> <delete> - <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + <fileset dir="${jboss.server.home}/lib"> + <include name="jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> </delete> + + <!-- delete content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> <delete dir="@{targetdir}"/> + </sequential> </macrodef> + <macrodef name="macro-undeploy-deployer"> + <attribute name="targetdir"/> + <sequential> + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <delete> + <fileset dir="${jboss.server.home}/deployers/jbossws.deployer"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + </project> \ No newline at end of file Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -13,6 +13,7 @@ <dependencySet> <outputDirectory>bin</outputDirectory> <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> <unpack>true</unpack> <includes> <include>*:jbossws-framework:zip:scripts</include> @@ -24,12 +25,26 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> + <scope>provided</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> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500:jar:container</include> + <include>*:jbossws-jboss501:jar:container</include> + </includes> + </dependencySet> </dependencySets> <!-- lib -->