Author: richard.opalka(a)jboss.com Date: 2011-03-09 18:09:56 -0500 (Wed, 09 Mar 2011) New Revision: 13876 Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/ropalka/modules/testsuite/pom.xml Log: [JBWS-3216] updating excludes, enabling fastinfoset, fixing some wssecurity tests Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/com/sun/xml/fastinfoset/main/module.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.0" name="com.sun.xml.fastinfoset"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + </dependencies> + +</module> Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml 2011-03-09 13:47:10 UTC (rev 13875) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -30,6 +30,7 @@ <dependencies> <module name="javax.api"/> + <module name="javax.xml.stream.api"/> <module name="org.slf4j.jcl-over-slf4j"/> </dependencies> Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/jettison/main/module.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.0" name="org.codehaus.jettison"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api"/> + </dependencies> + +</module> Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/codehaus/woodstox/main/module.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, Red Hat, Inc., and individual contributors + ~ as indicated by the @author tags. See the copyright.txt file in the + ~ distribution for a full listing of individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<module xmlns="urn:jboss:module:1.0" name="org.codehaus.woodstox"> + + <resources> + <!-- Insert resources here --> + </resources> + + <!--dependencies> + <module name="javax.xml.stream.api"/> + </dependencies--> + +</module> Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-09 13:47:10 UTC (rev 13875) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -30,6 +30,7 @@ <dependencies> <module name="com.sun.xml.bind" services="import"/> + <module name="com.sun.xml.fastinfoset"/> <module name="javax.api" /> <module name="javax.servlet.api" /> <module name="javax.jws.api" /> @@ -43,6 +44,7 @@ <module name="org.apache.xmlsec"/> <module name="org.apache.ws.commons.policy"/> <module name="org.javassist" /> + <module name="org.codehaus.jettison"/> <module name="org.jboss.netty" /> <module name="org.jboss.xb" /> <module name="org.jboss.ws.api" /> Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-09 13:47:10 UTC (rev 13875) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -329,6 +329,21 @@ <include name="**/xmlsec.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/com/sun/xml/fastinfoset/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/FastInfoset.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/codehaus/jettison/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jettison.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/codehaus/woodstox/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/wstx.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-common.jar"/> Modified: stack/native/branches/ropalka/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 13:47:10 UTC (rev 13875) +++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-09 23:09:56 UTC (rev 13876) @@ -682,6 +682,11 @@ <version>5.0.5.Final</version> </dependency> <dependency> + <groupId>org.picketbox</groupId> + <artifactId>jbosssx-client</artifactId> + <version>3.0.0.CR2</version> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> </dependency> @@ -779,6 +784,7 @@ <exclude>org/jboss/test/ws/jaxws/jbws1665/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1809/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> @@ -787,11 +793,16 @@ <exclude>org/jboss/test/ws/jaxws/jbws1850/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1909/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2011/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2014/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2166/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2182/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2221/**</exclude> @@ -799,6 +810,7 @@ <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2437/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws2565/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude> @@ -809,6 +821,7 @@ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> <exclude>org/jboss/test/ws/jaxws/benchmark/**</exclude> + <exclude>org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/endpointReference/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> @@ -849,6 +862,7 @@ <!-- # [JBWS-3226] jboss-service.xml not matching AS7 format --> <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> <!-- # [JBWS-3227] handles config file not found on classpath --> <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude> @@ -865,6 +879,7 @@ <!-- # [JBWS-3234] JNDI over RMI not available on AS7 --> <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> <!-- # [JBWS-3239] SPI TCCL issue --> <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> @@ -879,8 +894,13 @@ <!-- # [JBWS-3242] Servlet base test throws IllegalArgumentException: Resource META-INF/jbossws-entities.properties not found --> <exclude>org/jboss/test/ws/jaxws/jbws3223/**</exclude> + <!-- # [JBWS-3244] resuscitate WS-Eventing --> + <exclude>org/jboss/test/ws/jaxws/samples/wseventing/**</exclude> + <!-- # [JBAS-8933] ClassCastException: org.jboss.security.plugins.auth.JaasSecurityManagerBase cannot be cast to org.jboss.security.AuthorizationManager --> + <exclude>org/jboss/test/ws/jaxws/jbws1999/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase*</exclude> <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>