Author: richard.opalka(a)jboss.com Date: 2011-03-10 06:16:50 -0500 (Thu, 10 Mar 2011) New Revision: 13877 Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/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] enabled WSRM, JaxbIntros, updated excludes, further AS7 CP fixes Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/commons/beanutils/main/module.xml 2011-03-10 11:16:50 UTC (rev 13877) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, 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.apache.commons.beanutils"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.slf4j.jcl-over-slf4j"/> + </dependencies> + +</module> Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/jaxbintros/main/module.xml 2011-03-10 11:16:50 UTC (rev 13877) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2011, 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.jboss.jaxbintros"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.xml.bind.api" /> + <module name="com.sun.xml.bind" services="import"/> + <module name="org.slf4j.jcl-over-slf4j"/> + <module name="org.apache.commons.beanutils"/> + </dependencies> + +</module> Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-09 23:09:56 UTC (rev 13876) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/common/main/module.xml 2011-03-10 11:16:50 UTC (rev 13877) @@ -34,6 +34,7 @@ <module name="javax.ejb.api"/> <module name="javax.servlet.api"/> <module name="javax.xml.ws.api"/> + <module name="org.jboss.jaxbintros"/> <module name="org.jboss.ws.api"/> <module name="org.jboss.ws.spi"/> <module name="org.jboss.logging"/> 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 23:09:56 UTC (rev 13876) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-10 11:16:50 UTC (rev 13877) @@ -344,6 +344,16 @@ <include name="**/wstx.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/jboss/jaxbintros/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jboss-jaxb-intros.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/commons/beanutils/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/commons-beanutils.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 23:09:56 UTC (rev 13876) +++ stack/native/branches/ropalka/modules/testsuite/pom.xml 2011-03-10 11:16:50 UTC (rev 13877) @@ -761,8 +761,7 @@ <!--# not yet supported on AS7 --> <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/**</exclude> - <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude> - <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude> + <!-- EJB3 client API dependencies --> <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> @@ -863,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> + <exclude>org/jboss/test/ws/jaxws/samples/jmstransport/**</exclude> <!-- # [JBWS-3227] handles config file not found on classpath --> <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude> @@ -895,13 +895,23 @@ <exclude>org/jboss/test/ws/jaxws/jbws3223/**</exclude> <!-- # [JBWS-3244] resuscitate WS-Eventing --> + <exclude>org/jboss/test/ws/jaxws/wseventing/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wseventing/**</exclude> + <!-- # [JBWS-3245] AS7 RemoteDeployer have to always undeploy deployed archives --> + <exclude>org/jboss/test/ws/jaxws/jbws1582/**</exclude> + + <!-- # [JBWS-3246] Resuscitate JSON --> + <exclude>org/jboss/test/ws/jaxws/json/JsonTestCase*</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> + <!-- # [JBAS-8936] @Resource injection from web.xml doesn't work --> + <exclude>org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase*</exclude> + <!-- JAXR not available --> <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>