[jbossws-commits] JBossWS SVN: r3450 - in trunk/integration: native/ant-import and 7 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-06-05 11:04:03 -0400 (Tue, 05 Jun 2007) New Revision: 3450 Modified: trunk/integration/native/ant-import/build-bin-dist.xml trunk/integration/native/build.xml trunk/integration/spi/ant-import/build-release.xml trunk/integration/spi/build.xml trunk/integration/spi/src/main/etc/component-info.xml trunk/integration/sunri/ant-import/build-bin-dist.xml trunk/integration/sunri/build.xml trunk/integration/xfire/ant-import/build-bin-dist.xml trunk/integration/xfire/build.xml Log: Build disttribution javadoc that include container, stack and spi docs Modified: trunk/integration/native/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -17,7 +17,7 @@ <!-- Binary distribution JBossWS/XFire --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="jars" description="Build the binary distribution"> + <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> @@ -76,6 +76,10 @@ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> <!-- docs --> + <zip destfile="${bindist.docs.dir}/apidocs-${version.id}.zip"> + <fileset dir="${native.output.dir}/apidocs"/> + </zip> + <copy todir="${bindist.docs.dir}"> <fileset dir="${build.dir}/etc"> <include name="JBossORG-EULA.txt"/> Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/native/build.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -247,19 +247,39 @@ author="true" version="true" use="true" - windowtitle="JBossWS API" + windowtitle="JBossWS API ${version.id}" excludepackagenames="javax.*" defaultexcludes="yes"> - <classpath refid="native.integration.classpath"/> - <!--packageset dir="${native.java.dir}"> + <classpath> + <pathelement path="${native.integration.classpath}"/> + <fileset dir="${spi.dir}/thirdparty"> + <include name="**/*.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="**/*.jar"/> + </fileset> + </classpath> + + <packageset dir="${native.java.dir}"> <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> - </packageset--> - <packageset dir="${core.dir}/src/main/java"> + </packageset> + <packageset dir="${spi.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - Stack integration Native </h1>]]></doctitle> + <packageset dir="${core.dir}/src/main/java"> + <include name="org/jboss/ws/**"/> + </packageset> + <packageset dir="${int.jboss50.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Native </h1>]]></doctitle> + <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*"/> + <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> + <group title="Container integration" packages="org.jboss.wsf.container*"/> </javadoc> </target> Modified: trunk/integration/spi/ant-import/build-release.xml =================================================================== --- trunk/integration/spi/ant-import/build-release.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/spi/ant-import/build-release.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -24,7 +24,8 @@ <fileset dir="${spi.output.lib.dir}"> <include name="jbossws-spi.jar"/> <include name="jbossws-integration-src.zip"/> - </fileset> + <include name="jbossws-spi-scripts.zip"/> + </fileset> </copy> <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> Modified: trunk/integration/spi/build.xml =================================================================== --- trunk/integration/spi/build.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/spi/build.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -115,7 +115,11 @@ <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > <fileset dir="${spi.java.dir}"/> </zip> - + + <!-- Build jbossws-spi-scripts.zip --> + <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" > + <fileset dir="${spi.dir}/etc"/> + </zip> </target> <!-- ================================================================== --> Modified: trunk/integration/spi/src/main/etc/component-info.xml =================================================================== --- trunk/integration/spi/src/main/etc/component-info.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/spi/src/main/etc/component-info.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -1,16 +1,30 @@ <project name="jboss/jbossws-spi"> - - <component id="jboss/jbossws-spi" - description="JBossWS SPI" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-spi.jar"/> - <export> - <include input="jbossws-spi.jar"/> - </export> - - </component> - + <component id="jboss/jbossws-spi" + description="JBossWS SPI" + version=&quot;@repository.id(a)&quot; + licenseType="lgpl"> + + <artifact id="jbossws-spi.jar"/> + <artifact id="jbossws-spi-scripts.zip"/> + + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + + <import componentref="sun-jaxws"> + <compatible version="@sun-jaxws@"/> + </import> + + <import componentref="woodstox"> + <compatible version="@woodstox@"/> + </import> + + <export> + <include input="jbossws-spi.jar"/> + <include input="jbossws-spi-scripts.zip"/> + </export> + + </component> + </project> Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -17,7 +17,7 @@ <!-- Binary distribution JBossWS/SunRI --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="jars" description="Build the binary distribution"> + <target name="build-bin-dist" depends="jars,javadoc" description="Build the binary distribution"> <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> @@ -79,6 +79,11 @@ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> <!-- docs --> + + <zip destfile="${bindist.docs.dir}/apidocs-${version.id}.zip"> + <fileset dir="${sunri.output.dir}/apidocs"/> + </zip> + <copy todir="${bindist.docs.dir}"> <fileset dir="${build.dir}/etc"> <include name="JBossORG-EULA.txt"/> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/sunri/build.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -240,21 +240,39 @@ </target> <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc"> <mkdir dir="${sunri.output.apidocs.dir}"/> - <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <path refid="sunri50.integration.classpath"/> - <path refid="sunri.integration.classpath"/> + <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath> + <pathelement path="${sunri50.integration.classpath}"/> + <pathelement path="${sunri.integration.classpath}"/> + <fileset dir="${spi.dir}/thirdparty"> + <include name="**/*.jar"/> + </fileset> </classpath> - <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/wsf/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - Stack integration Sun-RI</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> + + <packageset dir="${sunri.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/wsf/**"/> + </packageset> + + <packageset dir="${spi.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> + <include name="org/jboss/ws/**"/> + </packageset> + <packageset dir="${int.jboss50.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> + </packageset> + + <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</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*"/> + <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> + <group title="Container integration" packages="org.jboss.wsf.container*"/> + </javadoc> - </target> + </target> <!-- ================================================================== --> <!-- Miscellaneous --> Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml =================================================================== --- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -17,7 +17,7 @@ <!-- Binary distribution JBossWS/XFire --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="jars" description="Build the binary distribution"> + <target name="build-bin-dist" depends="jars,javadoc" description="Build the binary distribution"> <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> @@ -81,6 +81,10 @@ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> <!-- 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"> <include name="JBossORG-EULA.txt"/> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-06-05 15:03:22 UTC (rev 3449) +++ trunk/integration/xfire/build.xml 2007-06-05 15:04:03 UTC (rev 3450) @@ -229,15 +229,32 @@ <target name="javadoc" depends="init" description="Generate the Javadoc"> <mkdir dir="${xfire.output.apidocs.dir}"/> - <javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> <classpath> - <path refid="xfire.integration.classpath"/> - <path refid="xfire50.integration.classpath"/> + <pathelement path="${xfire.integration.classpath}"/> + <pathelement path="${xfire50.integration.classpath}"/> + <fileset dir="${spi.dir}/thirdparty"> + <include name="**/*.jar"/> + </fileset> </classpath> <packageset dir="${xfire.java.dir}" defaultexcludes="yes"> <include name="org/jboss/wsf/**"/> </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - Stack integration XFire</h1>]]></doctitle> + <packageset dir="${spi.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> + <include name="org/jboss/ws/**"/> + </packageset> + <packageset dir="${int.jboss50.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration XFire</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*"/> + <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> + <group title="Container integration" packages="org.jboss.wsf.container*"/> + + <tag name="todo" scope="all" description="To do:"/> </javadoc> </target>