[jbossws-commits] JBossWS SVN: r3454 - in branches/jbossws-2.0: integration/jboss40 and 9 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-06-05 11:43:46 -0400 (Tue, 05 Jun 2007) New Revision: 3454 Modified: branches/jbossws-2.0/build/version.properties branches/jbossws-2.0/integration/jboss40/build.xml branches/jbossws-2.0/integration/jboss42/build.xml branches/jbossws-2.0/integration/jboss50/build.xml branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml branches/jbossws-2.0/integration/native/build.xml branches/jbossws-2.0/integration/spi/ant-import/build-release.xml branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml branches/jbossws-2.0/integration/spi/build.xml branches/jbossws-2.0/integration/spi/etc/wsconsume.sh branches/jbossws-2.0/integration/spi/etc/wsprovide.sh branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml branches/jbossws-2.0/jbossws-core/build.xml Log: Migrate API doc changes from trunk Modified: branches/jbossws-2.0/build/version.properties =================================================================== --- branches/jbossws-2.0/build/version.properties 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/build/version.properties 2007-06-05 15:43:46 UTC (rev 3454) @@ -16,6 +16,7 @@ # Thirdparty library versions apache-ant=1.6.5 dom4j=1.6.1 +gnu-getopt=1.0.10 jboss-common-core=2.0.2.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA Modified: branches/jbossws-2.0/integration/jboss40/build.xml =================================================================== --- branches/jbossws-2.0/integration/jboss40/build.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/jboss40/build.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -28,6 +28,7 @@ <property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/> <property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/> <property name="jbws40.output.dir" value="${jbws40.dir}/output"/> + <property name="jbws40.output.apidocs.dir" value="${jbws40.output.dir}/apidocs"/> <property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/> <property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/> <property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/> @@ -126,7 +127,23 @@ </zip> </target> - + + <!-- Generate the JavaDoc --> + <target name="javadoc" depends="init" description="Generate the Javadoc"> + + <mkdir dir="${jbws40.output.apidocs.dir}"/> + <javadoc destdir="${jbws40.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath> + <path refid="jbws40.integration.classpath"/> + </classpath> + <packageset dir="${jbws40.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/wsf/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + </javadoc> + </target> + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> Modified: branches/jbossws-2.0/integration/jboss42/build.xml =================================================================== --- branches/jbossws-2.0/integration/jboss42/build.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/jboss42/build.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -28,6 +28,7 @@ <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> + <property name="jbws42.output.apidocs.dir" value="${jbws42.output.dir}/apidocs"/> <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/> @@ -113,7 +114,23 @@ </zip> </target> - + + <!-- Generate the JavaDoc --> + <target name="javadoc" depends="init" description="Generate the Javadoc"> + + <mkdir dir="${jbws42.output.apidocs.dir}"/> + <javadoc destdir="${jbws42.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath> + <path refid="jbws42.integration.classpath"/> + </classpath> + <packageset dir="${jbws42.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/wsf/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + </javadoc> + </target> + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> Modified: branches/jbossws-2.0/integration/jboss50/build.xml =================================================================== --- branches/jbossws-2.0/integration/jboss50/build.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/jboss50/build.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -28,6 +28,7 @@ <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/> <property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/> <property name="jbws50.output.dir" value="${jbws50.dir}/output"/> + <property name="jbws50.output.apidocs.dir" value="${jbws50.output.dir}/apidocs"/> <property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/> <property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/> <property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/> @@ -112,7 +113,21 @@ </zip> </target> - + + <!-- Generate the JavaDoc --> + <target name="javadoc" depends="init" description="Generate the Javadoc"> + + <mkdir dir="${jbws50.output.apidocs.dir}"/> + <javadoc destdir="${jbws50.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath refid="jbws50.integration.classpath"/> + <packageset dir="${jbws50.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/wsf/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 5.0</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + </javadoc> + </target> + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -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"/> @@ -70,6 +70,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: branches/jbossws-2.0/integration/native/build.xml =================================================================== --- branches/jbossws-2.0/integration/native/build.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/native/build.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -34,6 +34,7 @@ <property name="native.output.classes.dir" value="${native.output.dir}/classes"/> <property name="native.output.etc.dir" value="${native.output.dir}/etc"/> <property name="native.output.lib.dir" value="${native.output.dir}/lib"/> + <property name="native.output.apidocs.dir" value="${native.output.dir}/apidocs"/> <!-- ================================================================== --> <!-- Initialization --> @@ -238,7 +239,50 @@ <metainf dir="${native.resources.dir}/jbossws-native40.sar/META-INF"/> </jar> </target> - + + <target name="javadoc" description="Generate the Javadoc"> + + <mkdir dir="${native.output.apidocs.dir}"/> + <javadoc destdir="${native.output.apidocs.dir}" + author="true" + version="true" + use="true" + windowtitle="JBossWS API ${version.id}" + excludepackagenames="javax.*" + defaultexcludes="yes"> + <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="${spi.dir}/src/main/java"> + <include name="org/jboss/wsf/**"/> + <include name="org/jboss/ws/**"/> + </packageset> + <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> + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> Modified: branches/jbossws-2.0/integration/spi/ant-import/build-release.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/build-release.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/spi/ant-import/build-release.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -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: branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/spi/ant-import/build-thirdparty.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -70,10 +70,11 @@ </target> <target name="thirdparty-classpath" depends="thirdparty-get"> - - <!-- The compile classpath for jbossws spi --> - <path id="thirdparty.classpath"> - <pathelement location="${thirdparty.dir}/activation.jar"/> + + <!-- The compile classpath for jbossws spi --> + <path id="spi.thirdparty.classpath"> + <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/getopt.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> @@ -85,7 +86,8 @@ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> </target> Modified: branches/jbossws-2.0/integration/spi/build.xml =================================================================== --- branches/jbossws-2.0/integration/spi/build.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/spi/build.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -63,7 +63,7 @@ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> <include name="org/jboss/wsf/spi/**"/> <include name="org/jboss/ws/integration/**"/> - <classpath refid="thirdparty.classpath"/> + <classpath refid="spi.thirdparty.classpath"/> </javac> </target> @@ -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> <!-- ================================================================== --> @@ -127,21 +131,13 @@ <mkdir dir="${spi.output.apidocs.dir}"/> <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath refid="thirdparty.classpath"/> + <classpath refid="spi.thirdparty.classpath"/> <packageset dir="${spi.java.dir}" defaultexcludes="yes"> <include name="org/jboss/ws/**"/> <include name="org/jboss/wsf/**"/> </packageset> <doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - <group title="Integration (AS 4.2 backwards compatibility)" packages="org.jboss.ws.integration*"/> - <group title="Annotations" packages="org.jboss.wsf.spi.annotation*"/> - <group title="Deployment" packages="org.jboss.wsf.spi.deployment*"/> - <group title="Invocation" packages="org.jboss.wsf.spi.invocation*"/> - <group title="Management" packages="org.jboss.wsf.spi.management*"/> - <group title="Handler" packages="org.jboss.wsf.spi.handler*"/> - <group title="MetaData" packages="org.jboss.wsf.spi.metadata*"/> - <group title="Tools" packages="org.jboss.wsf.spi.tools*"/> + <tag name="todo" scope="all" description="To do:"/> </javadoc> </target> Modified: branches/jbossws-2.0/integration/spi/etc/wsconsume.sh =================================================================== --- branches/jbossws-2.0/integration/spi/etc/wsconsume.sh 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/spi/etc/wsconsume.sh 2007-06-05 15:43:46 UTC (rev 3454) @@ -55,7 +55,7 @@ ### # Setup the LIBDIR # This script maybe used form within the jbossws distribution -# or instaled under JBOSS_HOME/bin +# or installed under JBOSS_HOME/bin ### PARENT=`cd $DIRNAME/..; pwd` @@ -89,10 +89,10 @@ # shared jaxws libs WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-tools.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-rt.jar" +WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-api.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-impl.jar" WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxb-xjc.jar" -WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/stax-api.jar" # stack specific dependencies if [ "x$JBOSSWS_NATIVE" = "x" ]; then Modified: branches/jbossws-2.0/integration/spi/etc/wsprovide.sh =================================================================== --- branches/jbossws-2.0/integration/spi/etc/wsprovide.sh 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/integration/spi/etc/wsprovide.sh 2007-06-05 15:43:46 UTC (rev 3454) @@ -55,7 +55,7 @@ ### # Setup the LIBDIR # This script maybe used form within the jbossws distribution -# or instaled under JBOSS_HOME/bin +# or installed under JBOSS_HOME/bin ### PARENT=`cd $DIRNAME/..; pwd` Modified: branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/jbossws-core/ant-import/build-thirdparty.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -113,7 +113,8 @@ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/getopt.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> Modified: branches/jbossws-2.0/jbossws-core/build.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/build.xml 2007-06-05 15:26:50 UTC (rev 3453) +++ branches/jbossws-2.0/jbossws-core/build.xml 2007-06-05 15:43:46 UTC (rev 3454) @@ -162,6 +162,8 @@ </fileset> <fileset dir="${core.etc.dir}"> <include name="log4j.properties"/> + <include name="ws*.bat"/> + <include name="ws*.sh"/> </fileset> <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/> <metainf dir="${core.resources.dir}/standard-config"> @@ -205,11 +207,11 @@ <mkdir dir="${core.output.apidocs.dir}"/> <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath refid="core.classpath"/> + <classpath refid="thirdparty.classpath"/> <packageset dir="${core.java.dir}" defaultexcludes="yes"> <include name="org/jboss/ws/**"/> </packageset> - <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle> + <doctitle><![CDATA[<h1>JBossWS Native</h1>]]></doctitle> <tag name="todo" scope="all" description="To do:"/> <group title="Core" packages="org.jboss.ws.core*"/> <group title="Metadata" packages="org.jboss.ws.metadata*"/>