Author: thomas.diesler(a)jboss.com Date: 2007-11-28 06:04:41 -0500 (Wed, 28 Nov 2007) New Revision: 5124 Added: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/ Removed: stack/cxf/trunk/ant-import/macros-deploy-xfire.xml stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/ stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml stack/cxf/trunk/src/main/resources/jbossws-xfire.jar/ Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/build-release.xml stack/cxf/trunk/ant-import/build-testsuite.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/bin-dist-build.xml stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml stack/cxf/trunk/src/main/etc/bin-dist-build.xml stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml stack/cxf/trunk/src/main/etc/component-info50.xml stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory Log: Rename xfire to cxf Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - <property name="bindist.dir" value="${xfire.output.dir}/jbossws-cxf-${version.id}"/> + <property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> @@ -35,27 +35,27 @@ <mkdir dir="${bindist.tools.dir}"/> <!-- root --> - <copy tofile="${bindist.dir}/ant.properties" file="${xfire.distro.dir}/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties" file="${cxf.distro.dir}/ant.properties.example"> <filterset> - <filtersfile file="${xfire.dir}/ant.properties"/> + <filtersfile file="${cxf.dir}/ant.properties"/> </filterset> </copy> - <copy tofile="${bindist.dir}/version.properties" file="${xfire.dir}/version.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${xfire.distro.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${xfire.distro.dir}/bin-dist-deploy.xml"/> + <copy tofile="${bindist.dir}/version.properties" file="${cxf.dir}/version.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${cxf.distro.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${cxf.distro.dir}/bin-dist-deploy.xml"/> <!-- build --> <copy todir="${bindist.build.dir}"> - <fileset dir="${xfire.dir}/ant-import"> + <fileset dir="${cxf.dir}/ant-import"> <include name="macros-deploy-framework.xml"/> - <include name="macros-deploy-xfire.xml"/> + <include name="macros-deploy-cxf.xml"/> </fileset> </copy> <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> <copy todir="${bindist.bin.dir}"> - <fileset dir="${xfire.dir}/src/main/etc"> + <fileset dir="${cxf.dir}/src/main/etc"> <include name="*.sh"/> <include name="*.bat"/> </fileset> @@ -65,22 +65,22 @@ <!-- docs --> <copy todir="${bindist.docs.dir}" > - <fileset dir="${xfire.output.dir}"> + <fileset dir="${cxf.output.dir}"> <include name="apidocs/**"/> </fileset> </copy> <copy todir="${bindist.docs.dir}" filtering="yes"> - <fileset dir="${xfire.distro.dir}"> + <fileset dir="${cxf.distro.dir}"> <include name="Install.txt"/> <include name="ReleaseNotes.txt"/> </fileset> <filterset> - <filtersfile file="${xfire.dir}/version.properties"/> + <filtersfile file="${cxf.dir}/version.properties"/> </filterset> </copy> <copy todir="${bindist.docs.dir}"> - <fileset dir="${xfire.etc.dir}"> + <fileset dir="${cxf.etc.dir}"> <include name="JBossORG-EULA.txt"/> </fileset> </copy> @@ -93,11 +93,11 @@ <include name="jbossws-framework-scripts.zip"/> <include name="jbossws-spi.jar"/> </fileset> - <fileset dir="${xfire.dir}/output/lib"> + <fileset dir="${cxf.dir}/output/lib"> <include name="jbossws-context.war"/> - <include name="jbossws-xfire.jar"/> - <include name="jbossws-xfire42.sar"/> - <include name="jbossws-xfire50.sar"/> + <include name="jbossws-cxf.jar"/> + <include name="jbossws-cxf42.sar"/> + <include name="jbossws-cxf50.sar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="juddi-service.sar"/> @@ -121,26 +121,26 @@ <!-- tests --> <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${xfire.dir}/src/test-framework"/> - <fileset dir="${xfire.dir}/src/test"> + <fileset dir="${cxf.dir}/src/test-framework"/> + <fileset dir="${cxf.dir}/src/test"> <include name="resources/test-excludes-*.txt"/> </fileset> </copy> <!-- build tools --> <copy todir="${bindist.tools.dir}" overwrite="true"> - <fileset dir="${xfire.dir}/tools/ant"/> + <fileset dir="${cxf.dir}/tools/ant"/> </copy> <copy todir="${bindist.dir}" overwrite="true"> - <fileset dir="${xfire.dir}"> + <fileset dir="${cxf.dir}"> <include name="build.bat"/> <include name="build.sh"/> </fileset> </copy> <chmod file="${bindist.dir}/build.sh" perm="+x"/> - <zip destfile="${xfire.output.dir}/jbossws-cxf-${version.id}.zip"> - <fileset dir="${xfire.output.dir}" includes="jbossws-cxf-${version.id}/**"/> + <zip destfile="${cxf.output.dir}/jbossws-cxf-${version.id}.zip"> + <fileset dir="${cxf.output.dir}" includes="jbossws-cxf-${version.id}/**"/> </zip> </target> Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -13,44 +13,44 @@ <project> - <import file="${int.xfire.dir}/ant-import/macros-deploy-framework.xml"/> - <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> + <import file="${int.cxf.dir}/ant-import/macros-deploy-framework.xml"/> + <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> <!-- ================================================================== --> <!-- Deployment --> <!-- ================================================================== --> <!-- Deploy to jboss50 --> - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/xfire to jboss50"> - <macro-deploy-xfire500 - stacklibs="${int.xfire.dir}/output/lib" - thirdpartylibs="${int.xfire.dir}/thirdparty"/> + <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> + <macro-deploy-cxf500 + stacklibs="${int.cxf.dir}/output/lib" + thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-framework - thirdpartylibs="${int.xfire.dir}/thirdparty" + thirdpartylibs="${int.cxf.dir}/thirdparty" jbosshome="${jboss500.home}"/> </target> <!-- Remove from jboss50 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <macro-undeploy-xfire500/> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50"> + <macro-undeploy-cxf500/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> <!-- Deploy to jboss42 --> - <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/xfire to jboss42"> - <macro-deploy-xfire422 - stacklibs="${int.xfire.dir}/output/lib" - thirdpartylibs="${int.xfire.dir}/thirdparty"/> + <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> + <macro-deploy-cxf422 + stacklibs="${int.cxf.dir}/output/lib" + thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-framework - thirdpartylibs="${int.xfire.dir}/thirdparty" + thirdpartylibs="${int.cxf.dir}/thirdparty" jbosshome="${jboss422.home}"/> </target> <!-- Remove from jboss42 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/xfire from jboss42"> - <macro-undeploy-xfire422/> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42"> + <macro-undeploy-cxf422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> Modified: stack/cxf/trunk/ant-import/build-release.xml =================================================================== --- stack/cxf/trunk/ant-import/build-release.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/ant-import/build-release.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -17,16 +17,16 @@ <target name="release" depends="jars" description="Release to jboss.local.repository"> - <!-- jboss/jbossws-xfire50 --> + <!-- jboss/jbossws-cxf50 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-xfire50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-xfire50/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.xfire.dir}/output/lib"> - <include name="jbossws-xfire50.sar"/> - <include name="jbossws-xfire50-deployer.zip"/> + <mkdir dir="${jboss.repository.dir}/jbossws-cxf50/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-cxf50/${repository.id}/lib" overwrite="true"> + <fileset dir="${int.cxf.dir}/output/lib"> + <include name="jbossws-cxf50.sar"/> + <include name="jbossws-cxf50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-xfire50/${repository.id}/component-info.xml" file="${xfire.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-cxf50/${repository.id}/component-info.xml" file="${cxf.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -10,12 +10,12 @@ <project> - <property name="tests.output.dir" value="${int.xfire.dir}/output/tests"/> + <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> - <import file="${int.xfire.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/> <!-- Define excludesfile --> - <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> <!-- ================================================================== --> <!-- Initialization --> @@ -24,28 +24,28 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.xfire.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/cxf-${cxf.version}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/cxf-${cxf.version}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/wstx.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.xfire.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.xfire.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> </path> </target> @@ -55,8 +55,8 @@ <!-- ================================================================== --> <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${int.xfire.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.xfire.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> @@ -65,12 +65,12 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.xfire.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${int.xfire.dir}/src/test"/> + <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.xfire.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -13,7 +13,7 @@ <project> - <property file="${int.xfire.dir}/version.properties"/> + <property file="${int.cxf.dir}/version.properties"/> <!-- ========= --> <!-- Libraries --> @@ -24,11 +24,11 @@ <target name="thirdparty-init" depends="prepare"> - <property name="apache.cxf.dir" value="${xfire.dir}/apache-cxf"/> + <property name="apache.cxf.dir" value="${cxf.dir}/apache-cxf"/> <available property="apache.cxf.available" file="${apache.cxf.dir}"/> - <property name="thirdparty.dir" value="${int.xfire.dir}/thirdparty"/> - <checksum file="${int.xfire.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <property name="thirdparty.dir" value="${int.cxf.dir}/thirdparty"/> + <checksum file="${int.cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty.get"> <or> <not> @@ -67,11 +67,11 @@ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <checksum file="${int.xfire.dir}/version.properties" fileext=".md5"/> + <checksum file="${int.cxf.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get"> - <path id="xfire.integration.classpath"> + <path id="cxf.integration.classpath"> <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> @@ -96,7 +96,7 @@ <!-- SVN checkout the Apache CXF sources --> <target name="cxf-checkout" depends="thirdparty-init" unless="apache.cxf.available"> - <exec dir="${xfire.dir}" executable="svn" failonerror="true"> + <exec dir="${cxf.dir}" executable="svn" failonerror="true"> <arg value="checkout"/> <arg value="-r${cxf.svn.rev}"/> <arg value="${cxf.svn.url}"/> Copied: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml (from rev 5112, stack/cxf/trunk/ant-import/macros-deploy-xfire.xml) =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml (rev 0) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- --> +<!-- ====================================================================== --> + +<!-- $Id$ --> + +<project> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- Deploy to jboss50 --> + <macrodef name="macro-deploy-cxf500"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss500.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + </copy> + + <!-- BOOTSTRAP JARS --> + <copy todir="${jboss500.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!--SERVER JARS --> + <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <!-- Undeploy from jboss50 --> + <macrodef name="macro-undeploy-cxf500"> + <sequential> + <delete> + + <!-- CLIENT JARS --> + <fileset dir="${jboss500.home}/client"> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + + <!-- BOOTSTRAP JARS --> + <fileset dir="${jboss500.home}/lib"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + + <!--SERVER JARS --> + <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> + <include name="jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="saaj-api-${cxf.saaj}.jar"/> + </fileset> + </delete> + + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-cxf422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss422.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + </copy> + + <!-- BOOTSTRAP JARS --> + <copy todir="${jboss422.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!--SERVER JARS --> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <!-- Remove jbossws/cxf from jboss42 --> + <macrodef name="macro-undeploy-cxf422"> + <sequential> + <delete> + <!-- CLIENT JARS --> + <fileset dir="${jboss422.home}/client"> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> Deleted: stack/cxf/trunk/ant-import/macros-deploy-xfire.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/ant-import/macros-deploy-xfire.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -1,134 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ====================================================================== --> -<!-- --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- --> -<!-- ====================================================================== --> - -<!-- $Id$ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <!-- Deploy to jboss50 --> - <macrodef name="macro-deploy-xfire500"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - - <!-- CLIENT JARS --> - <copy todir="${jboss500.home}/client" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - </copy> - - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss500.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - - <!--SERVER JARS --> - <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - </fileset> - </copy> - - <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire50.sar&quot;/&gt; - <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - </sequential> - </macrodef> - - <!-- Undeploy from jboss50 --> - <macrodef name="macro-undeploy-xfire500"> - <sequential> - <delete> - - <!-- CLIENT JARS --> - <fileset dir="${jboss500.home}/client"> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - </fileset> - - <!-- BOOTSTRAP JARS --> - <fileset dir="${jboss500.home}/lib"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - - <!--SERVER JARS --> - <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - </fileset> - </delete> - - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-xfire422"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - - <!-- CLIENT JARS --> - <copy todir="${jboss422.home}/client" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - </copy> - - <!-- BOOTSTRAP JARS --> - <copy todir="${jboss422.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - - <!--SERVER JARS --> - <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire42.sar&quot;/&gt; - <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - </sequential> - </macrodef> - - <!-- Remove jbossws/xfire from jboss42 --> - <macrodef name="macro-undeploy-xfire422"> - <sequential> - <delete> - <!-- CLIENT JARS --> - <fileset dir="${jboss422.home}/client"> - <include name="jbossws-spi.jar"/> - </fileset> - </delete> - - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> - </sequential> - </macrodef> - -</project> Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/build.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -13,7 +13,7 @@ <project default="main" basedir="." name="JBossWS-CXF"> - <property name="int.xfire.dir" value="${basedir}"/> + <property name="int.cxf.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> @@ -26,24 +26,24 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="xfire.dir" value="${int.xfire.dir}"/> - <property name="xfire.src.dir" value="${xfire.dir}/src/main"/> - <property name="xfire.etc.dir" value="${xfire.src.dir}/etc"/> - <property name="xfire.distro.dir" value="${xfire.src.dir}/distro"/> - <property name="xfire.java.dir" value="${xfire.src.dir}/java"/> - <property name="xfire.resources.dir" value="${xfire.src.dir}/resources"/> - <property name="xfire.output.dir" value="${xfire.dir}/output"/> - <property name="xfire.output.apidocs.dir" value="${xfire.output.dir}/apidocs"/> - <property name="xfire.output.classes.dir" value="${xfire.output.dir}/classes"/> - <property name="xfire.output.etc.dir" value="${xfire.output.dir}/etc"/> - <property name="xfire.output.lib.dir" value="${xfire.output.dir}/lib"/> + <property name="cxf.dir" value="${int.cxf.dir}"/> + <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> + <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> + <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> + <property name="cxf.java.dir" value="${cxf.src.dir}/java"/> + <property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/> + <property name="cxf.output.dir" value="${cxf.dir}/output"/> + <property name="cxf.output.apidocs.dir" value="${cxf.output.dir}/apidocs"/> + <property name="cxf.output.classes.dir" value="${cxf.output.dir}/classes"/> + <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> + <property name="cxf.output.lib.dir" value="${cxf.output.dir}/lib"/> <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> <target name="init" depends="prepare,thirdparty"> - <mkdir dir="${xfire.output.apidocs.dir}"/> + <mkdir dir="${cxf.output.apidocs.dir}"/> </target> <!-- ================================================================== --> @@ -61,21 +61,21 @@ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> <!-- Compile java sources --> - <target name="compile-classes" depends="compile-classes-xfire"/> - <target name="compile-classes-xfire" depends="init"> - <mkdir dir="${xfire.output.classes.dir}"/> - <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <target name="compile-classes" depends="compile-classes-cxf"/> + <target name="compile-classes-cxf" depends="init"> + <mkdir dir="${cxf.output.classes.dir}"/> + <javac srcdir="${cxf.java.dir}" sourcepath="" destdir="${cxf.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsf/stack/xfire/**"/> - <classpath refid="xfire.integration.classpath"/> + <include name="org/jboss/wsf/stack/cxf/**"/> + <classpath refid="cxf.integration.classpath"/> </javac> </target> <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> - <mkdir dir="${xfire.output.etc.dir}"/> - <copy todir="${xfire.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${xfire.etc.dir}"> + <mkdir dir="${cxf.output.etc.dir}"/> + <copy todir="${cxf.output.etc.dir}" filtering="yes" overwrite="true"> + <fileset dir="${cxf.etc.dir}"> <include name="component-info.xml"/> <include name="default.mf"/> </fileset> @@ -83,8 +83,8 @@ <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-xfire-${version.id}"/> - <filtersfile file="${int.xfire.dir}/version.properties"/> + <filter token="implementation.version" value="jbossws-cxf-${version.id}"/> + <filtersfile file="${int.cxf.dir}/version.properties"/> </filterset> </copy> </target> @@ -101,49 +101,49 @@ <target name="jars-common" depends="compile"> - <!-- Build jbossws-xfire.jar --> - <mkdir dir="${xfire.output.lib.dir}"/> - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire.jar" manifest="${xfire.output.etc.dir}/default.mf"> - <fileset dir="${xfire.output.classes.dir}"> - <include name="org/jboss/wsf/stack/xfire/**"/> + <!-- Build jbossws-cxf.jar --> + <mkdir dir="${cxf.output.lib.dir}"/> + <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf.jar" manifest="${cxf.output.etc.dir}/default.mf"> + <fileset dir="${cxf.output.classes.dir}"> + <include name="org/jboss/wsf/stack/cxf/**"/> </fileset> - <metainf dir="${xfire.resources.dir}/jbossws-xfire.jar/META-INF"/> + <metainf dir="${cxf.resources.dir}/jbossws-cxf.jar/META-INF"/> </jar> <!-- Build jbossws-context.war --> - <war warfile="${xfire.output.lib.dir}/jbossws-context.war" webxml="${xfire.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${xfire.resources.dir}/jbossws-context.war"> + <war warfile="${cxf.output.lib.dir}/jbossws-context.war" webxml="${cxf.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${cxf.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${xfire.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${cxf.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <!-- Build jbossws-xfire-src.zip --> - <zip zipfile="${xfire.output.lib.dir}/jbossws-xfire-src.zip" > - <fileset dir="${xfire.java.dir}"/> + <!-- Build jbossws-cxf-src.zip --> + <zip zipfile="${cxf.output.lib.dir}/jbossws-cxf-src.zip" > + <fileset dir="${cxf.java.dir}"/> </zip> </target> <target name="jars-jboss50" depends="jars-common" if="jboss500.home"> <!-- Concat jbossws-beans.xml --> - <concat destfile="${xfire.output.lib.dir}/jbossws-xfire50/jbossws-beans.xml"> + <concat destfile="${cxf.output.lib.dir}/jbossws-cxf50/jbossws-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; </header> - <fileset file="${xfire.resources.dir}/jbossws-xfire-config.xml"/> + <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> <!-- Build jbosswsri.sar --> - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> + <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf50.sar" manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${xfire.output.lib.dir}"> + <fileset dir="${cxf.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> @@ -169,10 +169,10 @@ <include name="wsdl4j.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${xfire.output.lib.dir}"> - <include name="jbossws-xfire.jar"/> + <fileset dir="${cxf.output.lib.dir}"> + <include name="jbossws-cxf.jar"/> </fileset> - <metainf dir="${xfire.output.lib.dir}/jbossws-xfire50"> + <metainf dir="${cxf.output.lib.dir}/jbossws-cxf50"> <include name="jbossws-beans.xml"/> </metainf> </jar> @@ -181,27 +181,27 @@ <target name="jars-jboss42" depends="jars-common" if="jboss422.home"> - <unzip dest="${xfire.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> <!-- Concat jboss-beans.xml --> - <concat destfile="${xfire.output.lib.dir}/jbossws-xfire42/jbossws.beans/META-INF/jboss-beans.xml"> + <concat destfile="${cxf.output.lib.dir}/jbossws-cxf42/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; </header> - <fileset file="${xfire.resources.dir}/jbossws-xfire-config.xml"/> - <fileset file="${xfire.output.dir}/resources/jbossws-jboss42-config.xml"/> + <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> + <fileset file="${cxf.output.dir}/resources/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> &lt;/deployment&gt; </footer> </concat> - <!-- Build jbossws-xfire42.sar --> - <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire42.sar" manifest="${xfire.output.etc.dir}/default.mf"> - <fileset dir="${xfire.output.lib.dir}"> + <!-- Build jbossws-cxf42.sar --> + <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf42.sar" manifest="${cxf.output.etc.dir}/default.mf"> + <fileset dir="${cxf.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${xfire.output.lib.dir}"> - <include name="jbossws-xfire.jar"/> + <fileset dir="${cxf.output.lib.dir}"> + <include name="jbossws-cxf.jar"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="cxf-${cxf.version}.jar"/> @@ -225,10 +225,10 @@ <include name="wsdl4j.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${xfire.output.lib.dir}/jbossws-xfire42"> + <fileset dir="${cxf.output.lib.dir}/jbossws-cxf42"> <include name="jbossws.beans/**"/> </fileset> - <metainf dir="${xfire.output.dir}/resources/jbossws-jboss42.sar/META-INF"> + <metainf dir="${cxf.output.dir}/resources/jbossws-jboss42.sar/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -237,22 +237,22 @@ <!-- Generate the JavaDoc --> <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> - <!-- expand the xfire sources --> - <mkdir dir="${xfire.output.dir}/thirdparty-sources"/> - <unzip src="${thirdparty.dir}/xfire-distribution-sources.jar" dest="${xfire.output.dir}/thirdparty-sources"/> + <!-- expand the cxf sources --> + <mkdir dir="${cxf.output.dir}/thirdparty-sources"/> + <unzip src="${thirdparty.dir}/cxf-distribution-sources.jar" dest="${cxf.output.dir}/thirdparty-sources"/> - <javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> + <javadoc destdir="${cxf.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> <classpath> - <pathelement path="${xfire.integration.classpath}"/> + <pathelement path="${cxf.integration.classpath}"/> </classpath> - <packageset dir="${xfire.java.dir}" defaultexcludes="yes"> + <packageset dir="${cxf.java.dir}" defaultexcludes="yes"> <include name="org/jboss/wsf/**"/> </packageset> - <packageset dir="${xfire.output.dir}/thirdparty-sources" defaultexcludes="yes"> + <packageset dir="${cxf.output.dir}/thirdparty-sources" defaultexcludes="yes"> <include name="org/codehaus/**"/> </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration XFire</h1>]]></doctitle> + <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration CXF</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:"/> <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/--> <group title="Stack integration" packages="org.jboss.wsf.stack*"/> @@ -267,11 +267,11 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${xfire.output.dir}"/> + <delete dir="${cxf.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.xfire.dir}/thirdparty"/> + <delete dir="${int.cxf.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -11,7 +11,7 @@ <!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> -<project default="main" basedir="." name="JBossWS-xfire"> +<project default="main" basedir="." name="JBossWS-cxf"> <!-- ================================================================== --> <!-- Setup --> @@ -57,7 +57,7 @@ <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/macros-deploy-framework.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> + <import file="${basedir}/build/macros-deploy-cxf.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> <!-- ================================================================== --> Modified: stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -17,9 +17,9 @@ <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws/xfire to jboss50 --> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/xfire to jboss50"> - <macro-deploy-xfire500 + <!-- Deploy jbossws/cxf to jboss50 --> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/cxf to jboss50"> + <macro-deploy-cxf500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework @@ -32,15 +32,15 @@ thirdpartylibs="${lib.dir}"/> </target> - <!-- Remove jbossws/xfire from jboss50 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <macro-undeploy-xfire500/> + <!-- Remove jbossws/cxf from jboss50 --> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50"> + <macro-undeploy-cxf500/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> - <!-- Deploy jbossws/xfire to jboss42 --> - <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/xfire to jboss42"> - <macro-deploy-xfire422 + <!-- Deploy jbossws/cxf to jboss42 --> + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/cxf to jboss42"> + <macro-deploy-cxf422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework @@ -53,9 +53,9 @@ thirdpartylibs="${lib.dir}"/> </target> - <!-- Remove jbossws/xfire from jboss42 --> - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/xfire from jboss42"> - <macro-undeploy-xfire422/> + <!-- Remove jbossws/cxf from jboss42 --> + <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/cxf from jboss42"> + <macro-undeploy-cxf422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> Modified: stack/cxf/trunk/src/main/etc/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/etc/bin-dist-build.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/etc/bin-dist-build.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -11,7 +11,7 @@ <!-- $Id$ --> -<project default="main" basedir="." name="JBossWS-XFire"> +<project default="main" basedir="." name="JBossWS-CXF"> <!-- ================================================================== --> <!-- Setup --> @@ -55,7 +55,7 @@ <import file="${basedir}/build/macros-deploy-spi.xml"/> <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> + <import file="${basedir}/build/macros-deploy-cxf.xml"/> <!-- ================================================================== --> <!-- Initialization --> Modified: stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/etc/bin-dist-deploy.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -17,11 +17,11 @@ <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws/xfire to jboss50 --> - <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/xfire to jboss50"> + <!-- Deploy jbossws/cxf to jboss50 --> + <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> <macro-undeploy-native50/> <macro-undeploy-sunri50/> - <macro-deploy-xfire500 + <macro-deploy-cxf500 spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" @@ -33,17 +33,17 @@ jbosshome="${jboss500.home}"/> </target> - <!-- Remove jbossws/xfire from jboss50 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <macro-undeploy-xfire500/> + <!-- Remove jbossws/cxf from jboss50 --> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50"> + <macro-undeploy-cxf500/> <macro-undeploy-spi jbosshome="${jboss500.home}"/> </target> - <!-- Deploy jbossws/xfire to jboss42 --> - <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/xfire to jboss42"> + <!-- Deploy jbossws/cxf to jboss42 --> + <target name="deploy-jboss422" depends="undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> <macro-undeploy-native42/> <macro-undeploy-sunri42/> - <macro-deploy-xfire422 + <macro-deploy-cxf422 spilibs="${lib.dir}" jbosslibs="${lib.dir}" stacklibs="${lib.dir}" @@ -55,9 +55,9 @@ jbosshome="${jboss422.home}"/> </target> - <!-- Remove jbossws/xfire from jboss42 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/xfire from jboss42"> - <macro-undeploy-xfire422/> + <!-- Remove jbossws/cxf from jboss42 --> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42"> + <macro-undeploy-cxf422/> <macro-undeploy-spi jbosshome="${jboss422.home}"/> </target> Modified: stack/cxf/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/cxf/trunk/src/main/etc/component-info50.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/etc/component-info50.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -1,12 +1,12 @@ -<project name="jboss/jbossws-xfire50"> +<project name="jboss/jbossws-cxf50"> - <component id="jboss/jbossws-xfire50" + <component id="jboss/jbossws-cxf50" description="JBossWS an implementation of J2EE Web Services" version=&quot;@repository.id(a)&quot; licenseType="lgpl"> - <artifact id="jbossws-xfire50.sar"/> - <artifact id="jbossws-xfire50-deployer.zip"/> + <artifact id="jbossws-cxf50.sar"/> + <artifact id="jbossws-cxf50-deployer.zip"/> <import componentref="jboss/microcontainer"> <compatible version="@jboss-microcontainer@"/> Copied: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf (from rev 5123, stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire) Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id: XFireServicesDeployer.java 3802 2007-07-05 16:44:32Z thomas.diesler(a)jboss.com $ @@ -28,9 +28,9 @@ import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.stack.xfire.metadata.services.DDBean; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; -import org.jboss.wsf.stack.xfire.metadata.services.DDEndpoint; +import org.jboss.wsf.stack.cxf.metadata.services.DDBean; +import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; +import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; import java.util.HashMap; import java.util.Map; Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.spi.management.EndpointRegistry; Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/EndpointServlet.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment; Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/InvokerEJB3.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/InvokerJSE.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; import org.jboss.wsf.spi.invocation.RequestHandlerFactory; import org.jboss.wsf.spi.invocation.RequestHandler; Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/WebAppResolver.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire; +package org.jboss.wsf.stack.cxf; import org.jboss.wsf.spi.management.EndpointResolver; import org.jboss.wsf.spi.deployment.Endpoint; Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBean.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire.metadata.services; +package org.jboss.wsf.stack.cxf.metadata.services; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDBeans.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire.metadata.services; +package org.jboss.wsf.stack.cxf.metadata.services; //$Id$ Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2007-11-28 11:04:41 UTC (rev 5124) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.wsf.stack.xfire.metadata.services; +package org.jboss.wsf.stack.cxf.metadata.services; //$Id$ Copied: stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml (from rev 5123, stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml) =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml (rev 0) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf-config.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -0,0 +1,95 @@ + + <!-- An abstraction of server configuration aspects. --> + <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + + If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + </bean> + + <!-- 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> + </bean> + + <!-- + The stack specific deployment aspects + --> + <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties</property> + <property name="contextProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry> + </map> + </property> + </bean> + + <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect"> + <property name="requires">EndpointAddress</property> + <property name="provides">StackDescriptor</property> + <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> + <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> + </bean> + + <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler</property> + <property name="provides">StackEndpointHandler</property> + </bean> + + <!-- Deployment aspect installers --> + + <!-- Phase 2 --> + <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFContextPropertiesDeploymentAspect"/> + <inject bean="WSCXFDescriptorDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <!-- Phase 2 --> + <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPostJSE</depends> + </bean> + + <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFContextPropertiesDeploymentAspect"/> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + <inject bean="WSCXFDescriptorDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerEJB</depends> + </bean> + Copied: stack/cxf/trunk/src/main/resources/jbossws-cxf.jar (from rev 5123, stack/cxf/trunk/src/main/resources/jbossws-xfire.jar) Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-11-28 11:04:41 UTC (rev 5124) @@ -1 +1 @@ -org.jboss.wsf.stack.xfire.RequestHandlerFactoryImpl \ No newline at end of file +org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl \ No newline at end of file Modified: stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/resources/jbossws-cxf.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-11-28 11:04:41 UTC (rev 5124) @@ -1 +1 @@ -org.jboss.wsf.stack.xfire.EndpointRegistryFactoryImpl \ No newline at end of file +org.jboss.wsf.stack.cxf.EndpointRegistryFactoryImpl \ No newline at end of file Deleted: stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml =================================================================== --- stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-11-27 14:50:19 UTC (rev 5123) +++ stack/cxf/trunk/src/main/resources/jbossws-xfire-config.xml 2007-11-28 11:04:41 UTC (rev 5124) @@ -1,95 +0,0 @@ - - <!-- An abstraction of server configuration aspects. --> - <bean name="WSServerConfig" class="org.jboss.wsf.stack.xfire.CXFServerConfig"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - - <!-- - The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> - element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. - - If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - - If 'webServiceHost' is not set, JBossWS uses requesters protocol host and port when rewriting the <soap:address>. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - - <!-- - Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. - Otherwise the ports will be identified by querying the list of installed connectors. - If multiple connectors are found the port of the first connector is used. - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - --> - </bean> - - <!-- 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> - </bean> - - <!-- - The stack specific deployment aspects - --> - <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.xfire.CXFServletExt</value></entry> - </map> - </property> - </bean> - - <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.xfire.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress</property> - <property name="provides">StackDescriptor</property> - <property name="invokerEJB3">org.jboss.wsf.stack.xfire.InvokerEJB3</property> - <property name="invokerJSE">org.jboss.wsf.stack.xfire.InvokerJSE</property> - </bean> - - <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <!-- Deployment aspect installers --> - - <!-- Phase 2 --> - <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - <inject bean="WSCXFDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - - <!-- Phase 2 --> - <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> - </bean> - - <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> - <inject bean="WSCXFDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> -