Author: richard.opalka(a)jboss.com Date: 2009-07-02 03:48:08 -0400 (Thu, 02 Jul 2009) New Revision: 10280 Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml Log: [JBWS-2332][JBWS-2382] refactoring - renaming beans file (WIP) Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf =================================================================== --- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 07:46:19 UTC (rev 10279) +++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/default-deploy.conf 2009-07-02 07:48:08 UTC (rev 10280) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml lib/endorsed/jbossws-native-* lib/endorsed/jaxb-api.jar Modified: stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 07:46:19 UTC (rev 10279) +++ stack/cxf/branches/ropalka/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-07-02 07:48:08 UTC (rev 10280) @@ -446,7 +446,7 @@ </copy> <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> </sequential> @@ -478,7 +478,7 @@ </copy> <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> </sequential> @@ -518,7 +518,7 @@ <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> --> @@ -560,7 +560,7 @@ <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-jboss-beans.xml"/> + <include name="**/stack-agnostic-jboss-beans.xml"/> </fileset> </copy> --> Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-02 07:46:19 UTC (rev 10279) +++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-02 07:48:08 UTC (rev 10280) @@ -1,4 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + <!-- The registry for web service endpoints --> <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> @@ -90,3 +93,5 @@ </constructor> <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround --> </bean> + +</deployment> Modified: stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:46:19 UTC (rev 10279) +++ stack/cxf/branches/ropalka/modules/server/src/main/scripts/antrun-beans-config.xml 2009-07-02 07:48:08 UTC (rev 10280) @@ -14,69 +14,35 @@ <property name="project.resources.directory" value="${basedir}/src/main/resources"/> <property name="project.build.directory" value="${basedir}/target"/> <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> - <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> + <target name="main"> - <target name="init"> - </target> + <copy + file="${project.resources.directory}/jbossws-cxf-config.xml" + tofile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Compile resource files --> - <target name="main" depends="init"> + <copy + file="${project.resources.directory}/jbossws-cxf-config.xml" + tofile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-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> + <copy + file="${project.resources.directory}/jbossws-cxf-config.xml" + tofile="${project.build.resources.directory}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- 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> + <copy + file="${project.resources.directory}/jbossws-cxf-config.xml" + tofile="${project.build.resources.directory}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Concat jbossws-jboss510/jbossws.beans --> - <echo message="Concat jbossws-jboss510/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss510/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> + <copy + file="${project.resources.directory}/jbossws-cxf-config.xml" + tofile="${project.build.resources.directory}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" + /> - <!-- Concat jbossws-jboss520/jbossws.beans --> - <echo message="Concat jbossws-jboss520/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss520/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 jbossws-jboss600/jbossws.beans --> - <echo message="Concat jbossws-jboss600/jbossws.beans"/> - <concat destfile="${project.build.resources.directory}/jbossws-jboss600/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>