Author: thomas.diesler(a)jboss.com Date: 2007-07-25 01:56:07 -0400 (Wed, 25 Jul 2007) New Revision: 3985 Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/etc/bin-dist-build.xml Log: CXF distro Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-07-24 23:06:45 UTC (rev 3984) +++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-07-25 05:56:07 UTC (rev 3985) @@ -21,7 +21,6 @@ <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> - <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> <property name="bindist.dir" value="${xfire.output.dir}/jbossws-xfire-${version.id}"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> @@ -34,7 +33,7 @@ <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> <mkdir dir="${bindist.bin.dir}"/> - <mkdir dir="${bindist.lib.dir}/client"/> + <mkdir dir="${bindist.lib.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> <mkdir dir="${bindist.tools.dir}"/> @@ -82,10 +81,11 @@ </copy> <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> - <!-- docs --> + <!-- docs <zip destfile="${bindist.docs.dir}/apidocs-${version.id}.zip"> <fileset dir="${xfire.output.dir}/apidocs"/> </zip> + --> <copy todir="${bindist.docs.dir}"> <fileset dir="${build.dir}/etc"> @@ -118,14 +118,6 @@ <fileset dir="${int.xfire.dir}/thirdparty"/> </copy> - <!-- - Cannot use XFire client - [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap - --> - <copy todir="${bindist.lib.dir}/client" overwrite="true"> - <fileset dir="${int.sunri.dir}/thirdparty"/> - </copy> - <!-- tests --> <copy todir="${bindist.tests.dir}" overwrite="true"> <fileset dir="${testsuite.dir}/src"/> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-24 23:06:45 UTC (rev 3984) +++ trunk/integration/xfire/build.xml 2007-07-25 05:56:07 UTC (rev 3985) @@ -243,7 +243,7 @@ </target> <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> <mkdir dir="${xfire.output.apidocs.dir}"/> Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-07-24 23:06:45 UTC (rev 3984) +++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-07-25 05:56:07 UTC (rev 3985) @@ -78,44 +78,23 @@ <target name="tests-init" depends="prepare,tests-classpath"> - <!-- - Cannot use XFire client - [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap - --> - <path id="sunri.classpath"> - <pathelement location="${thirdparty.dir}/client/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/client/http.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/client/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/client/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/client/resolver.jar"/> - <pathelement location="${thirdparty.dir}/client/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/client/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/client/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/client/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/client/streambuffer.jar"/> - <pathelement location="${thirdparty.dir}/client/wstx.jar"/> - </path> - - <path id="xfire.classpath"> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jdom.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/xfire-all.jar"/> - <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> - </path> - <path id="ws.stack.classpath"> - <path refid="sunri.classpath"/> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + <pathelement location="${lib.dir}/cxf-incubator.jar"/> + <pathelement location="${lib.dir}/geronimo-javamail.jar"/> + <pathelement location="${lib.dir}/geronimo-ws-metadata.jar"/> + <pathelement location="${lib.dir}/jaxws-api.jar"/> + <pathelement location="${lib.dir}/jdom.jar"/> + <pathelement location="${lib.dir}/neethi.jar"/> + <pathelement location="${lib.dir}/resolver.jar"/> + <pathelement location="${lib.dir}/saaj-api.jar"/> + <pathelement location="${lib.dir}/saaj-impl.jar"/> + <pathelement location="${lib.dir}/wsdl4j.jar"/> + <pathelement location="${lib.dir}/wstx.jar"/> + <pathelement location="${lib.dir}/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> </path> </target>