Author: richard.opalka(a)jboss.com Date: 2011-03-08 06:48:51 -0500 (Tue, 08 Mar 2011) New Revision: 13859 Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/ 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/xb/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml Modified: stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/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 Log: [JBWS-3206] another classpath definition fixes Modified: stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-08 09:18:16 UTC (rev 13858) +++ stack/native/branches/ropalka/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-03-08 11:48:51 UTC (rev 13859) @@ -90,6 +90,7 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-jboss600:jar</include> + <include>org.jboss:jbossxb:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> Added: 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 (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/apache/ws/commons/policy/main/module.xml 2011-03-08 11:48:51 UTC (rev 13859) @@ -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.apache.ws.commons.policy"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.slf4j.jcl-over-slf4j"/> + </dependencies> + +</module> Modified: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-08 09:18:16 UTC (rev 13858) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/as/webservices/main/module.xml 2011-03-08 11:48:51 UTC (rev 13859) @@ -29,6 +29,8 @@ </resources> <dependencies> + <module name="com.sun.xml.bind" services="import"/> <!-- TODO: JAXB API relies on TCCL - investigate how to workaround this factories import --> + <module name="org.apache.xerces" services="import"/> <!-- TODO: DOM API relies on TCCL - investigate how to workaround this factories import --> <module name="javax.api"/> <module name="javax.jws.api"/> <module name="javax.xml.ws.api"/> 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-08 09:18:16 UTC (rev 13858) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/ws/native/jbossws-native-core/main/module.xml 2011-03-08 11:48:51 UTC (rev 13859) @@ -38,8 +38,10 @@ <module name="javax.xml.stream.api" /> <module name="javax.xml.rpc.api" /> <module name="javax.xml.ws.api" /> - <module name="org.apache.xerces" /> + <module name="org.apache.xerces" services="import"/> + <module name="org.apache.ws.commons.policy"/> <module name="org.javassist" /> + <module name="org.jboss.xb" /> <module name="org.jboss.ws.api" /> <module name="org.jboss.ws.spi" /> <module name="org.jboss.ws.common" /> Added: stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml =================================================================== --- stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml (rev 0) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/modules/org/jboss/xb/main/module.xml 2011-03-08 11:48:51 UTC (rev 13859) @@ -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.jboss.xb"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + </dependencies> +</module> 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-08 09:18:16 UTC (rev 13858) +++ stack/native/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-03-08 11:48:51 UTC (rev 13859) @@ -314,6 +314,16 @@ <include name="**/jaxrpc-api.jar"/> </fileset> </copy> + <copy todir="@{targetdir}/org/jboss/xb/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossxb.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/apache/ws/commons/policy/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/wscommons-policy.jar"/> + </fileset> + </copy> <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-common.jar"/>