Author: thomas.diesler(a)jboss.com Date: 2008-04-09 08:22:10 -0400 (Wed, 09 Apr 2008) New Revision: 6302 Modified: stack/cxf/trunk/ant-import/build-prepare-deploy.xml stack/cxf/trunk/build.xml stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt Log: Fix jbossws-context. Update excludes. Modified: stack/cxf/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-prepare-deploy.xml 2008-04-09 12:19:48 UTC (rev 6301) +++ stack/cxf/trunk/ant-import/build-prepare-deploy.xml 2008-04-09 12:22:10 UTC (rev 6302) @@ -38,6 +38,7 @@ <patternset refid="jbossws.lib.endorsed.patternset"/> <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> + <include name="jbossws-context.war"/> </fileset> </copy> <copy todir="${deploy.artifacts.dir}/resources"> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-09 12:19:48 UTC (rev 6301) +++ stack/cxf/trunk/build.xml 2008-04-09 12:22:10 UTC (rev 6302) @@ -159,19 +159,26 @@ <metainf dir="${cxf.resources.dir}/jbossws-cxf-client.jar/META-INF"/> </jar> - <!-- Build jbossws-context.war --> - <copy todir="${cxf.output.lib.dir}/jbossws-context.war" filtering="true"> - <fileset dir="${cxf.resources.dir}/jbossws-context.war"> - <include name="index.html"/> - <include name="styles.css"/> - <include name="WEB-INF/**"/> - </fileset> - <filterset> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${cxf.dir}/version.properties"/> - </filterset> - </copy> + <!-- Build jbossws-context.war --> + <copy todir="${cxf.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true"> + <fileset dir="${cxf.resources.dir}/jbossws-context.war"/> + <filterset> + <filter token="build.id" value="${build.id}"/> + <filter token="implementation.version" value="jbossws-${version.id}"/> + <filtersfile file="${cxf.dir}/version.properties"/> + </filterset> + </copy> + <war warfile="${cxf.output.lib.dir}/jbossws-context.war" + webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml" + manifest="${cxf.output.etc.dir}/default.mf"> + <fileset dir="${cxf.output.resources.dir}/jbossws-context.war"> + <include name="index.html"/> + <include name="styles.css"/> + </fileset> + <webinf dir="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + </war> <!-- Remove config files from cxf-${cxf.version}.jar --> <unjar src="${thirdparty.dir}/cxf-${cxf.version}.jar" dest="${cxf.output.lib.dir}/cxf-${cxf.version}"/> Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-09 12:19:48 UTC (rev 6301) +++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-09 12:22:10 UTC (rev 6302) @@ -35,6 +35,7 @@ # [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/** @@ -42,15 +43,18 @@ # [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] Soap attachments are dropped on server response when added in ejb3 jaxws handler +# [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/** @@ -59,4 +63,35 @@ 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/** + + + + + +