[jbossws-commits] JBossWS SVN: r4088 - common and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 06:36:03 -0400 (Thu, 02 Aug 2007) New Revision: 4088 Added: common/ common/trunk/ common/trunk/src/main/java/org/jboss/wsf/common/ common/trunk/src/main/java/org/jboss/wsf/test/ Removed: common/trunk/ common/trunk/ant-import/macros-deploy-spi.xml common/trunk/src/main/java/org/jboss/wsf/spi/ Modified: common/trunk/.project common/trunk/ant-import/build-release.xml common/trunk/ant-import/build-setup.xml common/trunk/ant-import/build-thirdparty.xml common/trunk/build.xml common/trunk/src/main/etc/component-info.xml common/trunk/version.properties Log: Initial import Copied: common (from rev 4077, spi) Copied: common/trunk (from rev 4087, spi/trunk) Modified: common/trunk/.project =================================================================== --- spi/trunk/.project 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/.project 2007-08-02 10:36:03 UTC (rev 4088) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>spi</name> + <name>common</name> <comment></comment> <projects> </projects> Modified: common/trunk/ant-import/build-release.xml =================================================================== --- spi/trunk/ant-import/build-release.xml 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/ant-import/build-release.xml 2007-08-02 10:36:03 UTC (rev 4088) @@ -17,18 +17,18 @@ <target name="release" depends="jars" description="Release to jboss.local.repository"> - <!-- jboss/jbossws-spi --> + <!-- jboss/jbossws-common --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true"> - <fileset dir="${spi.output.lib.dir}"> - <include name="jbossws-spi.jar"/> - <include name="jbossws-spi-src.zip"/> + <mkdir dir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib"/> + <copy todir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib" overwrite="true"> + <fileset dir="${common.output.lib.dir}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-common-src.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"> + <copy tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/component-info.xml" file="${common.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="${spi.dir}/version.properties"/> + <filtersfile file="${common.dir}/version.properties"/> </filterset> </copy> Modified: common/trunk/ant-import/build-setup.xml =================================================================== --- spi/trunk/ant-import/build-setup.xml 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/ant-import/build-setup.xml 2007-08-02 10:36:03 UTC (rev 4088) @@ -17,14 +17,14 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="spi.dir" value="${basedir}"/> + <property name="common.dir" value="${basedir}"/> <!-- Check if ant.properties is available --> - <available property="ant.properties.available" file="${spi.dir}/ant.properties"/> + <available property="ant.properties.available" file="${common.dir}/ant.properties"/> <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> - <property file="${spi.dir}/ant.properties"/> - <property file="${spi.dir}/version.properties"/> + <property file="${common.dir}/ant.properties"/> + <property file="${common.dir}/version.properties"/> <!-- JDK Detection --> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> Modified: common/trunk/ant-import/build-thirdparty.xml =================================================================== --- spi/trunk/ant-import/build-thirdparty.xml 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/ant-import/build-thirdparty.xml 2007-08-02 10:36:03 UTC (rev 4088) @@ -21,8 +21,8 @@ <target name="thirdparty-init" depends="prepare"> - <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/> - <checksum file="${spi.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <property name="thirdparty.dir" value="${common.dir}/thirdparty"/> + <checksum file="${common.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <condition property="force.thirdparty"> <or> <not> @@ -50,6 +50,7 @@ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer-src.zip" dest="${thirdparty.dir}/jboss-microcontainer-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> @@ -57,13 +58,13 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <checksum file="${spi.dir}/version.properties" fileext=".md5"/> + <checksum file="${common.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get"> - <!-- The compile classpath for jbossws spi --> - <path id="spi.thirdparty.classpath"> + <!-- The compile classpath for jbossws common --> + <path id="common.thirdparty.classpath"> <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/getopt.jar"/> @@ -73,6 +74,7 @@ <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> Deleted: common/trunk/ant-import/macros-deploy-spi.xml =================================================================== --- spi/trunk/ant-import/macros-deploy-spi.xml 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/ant-import/macros-deploy-spi.xml 2007-08-02 10:36:03 UTC (rev 4088) @@ -1,69 +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> - - <macrodef name="macro-deploy-spi"> - <attribute name="spilibs"/> - <attribute name="thirdpartylibs"/> - <attribute name="jbosshome"/> - <sequential> - - <!-- BIN SCRIPTS --> - <unzip dest="@{jbosshome}/bin" src=&quot;(a){spilibs}/jbossws-spi-scripts.zip&quot;/&gt; - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - - <!-- CLIENT JARS--> - <copy todir="@{jbosshome}/client"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - - <!-- SERVER JARS--> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-spi"> - <attribute name="jbosshome"/> - <sequential> - <delete> - <!-- BIN SCRIPTS --> - <fileset dir="@{jbosshome}/bin"> - <include name="wsconsume.*"/> - <include name="wsprovide.*"/> - </fileset> - - <!-- CLIENT JARS--> - <fileset dir="@{jbosshome}/client"> - <include name="jbossws-spi.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - - <!-- SERVER JARS--> - <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; - <include name="jbossws-spi.jar"/> - </fileset> - </delete> - </sequential> - </macrodef> - -</project> \ No newline at end of file Modified: common/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/build.xml 2007-08-02 10:36:03 UTC (rev 4088) @@ -21,15 +21,15 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="spi.src.dir" value="${spi.dir}/src/main"/> - <property name="spi.etc.dir" value="${spi.src.dir}/etc"/> - <property name="spi.java.dir" value="${spi.src.dir}/java"/> - <property name="spi.resources.dir" value="${spi.src.dir}/resources"/> - <property name="spi.output.dir" value="${spi.dir}/output"/> - <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/> - <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/> - <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/> - <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/> + <property name="common.src.dir" value="${common.dir}/src/main"/> + <property name="common.etc.dir" value="${common.src.dir}/etc"/> + <property name="common.java.dir" value="${common.src.dir}/java"/> + <property name="common.resources.dir" value="${common.src.dir}/resources"/> + <property name="common.output.dir" value="${common.dir}/output"/> + <property name="common.output.apidocs.dir" value="${common.output.dir}/apidocs"/> + <property name="common.output.etc.dir" value="${common.output.dir}/etc"/> + <property name="common.output.classes.dir" value="${common.output.dir}/classes"/> + <property name="common.output.lib.dir" value="${common.output.dir}/lib"/> <!-- ================================================================== --> <!-- Initialization --> @@ -56,20 +56,20 @@ <!-- Compile java sources --> <target name="compile-classes" depends="init"> - <!-- Compile spi classes with jdk1.5 --> - <mkdir dir="${spi.output.classes.dir}"/> - <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <!-- Compile common classes with jdk1.5 --> + <mkdir dir="${common.output.classes.dir}"/> + <javac srcdir="${common.java.dir}" sourcepath="" destdir="${common.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> <include name="org/jboss/wsf/**"/> - <classpath refid="spi.thirdparty.classpath"/> + <classpath refid="common.thirdparty.classpath"/> </javac> </target> <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> - <mkdir dir="${spi.output.etc.dir}"/> - <copy todir="${spi.output.etc.dir}" filtering="yes"> - <fileset dir="${spi.etc.dir}"> + <mkdir dir="${common.output.etc.dir}"/> + <copy todir="${common.output.etc.dir}" filtering="yes"> + <fileset dir="${common.etc.dir}"> <include name="default.mf"/> </fileset> <filterset> @@ -77,7 +77,7 @@ <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${spi.dir}/version.properties"/> + <filtersfile file="${common.dir}/version.properties"/> </filterset> </copy> </target> @@ -97,17 +97,17 @@ --> <target name="module-jars"> - <!-- Build jbossws-spi.jar --> - <mkdir dir="${spi.output.lib.dir}"/> - <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf"> - <fileset dir="${spi.output.classes.dir}"> + <!-- Build jbossws-common.jar --> + <mkdir dir="${common.output.lib.dir}"/> + <jar jarfile="${common.output.lib.dir}/jbossws-common.jar" manifest="${common.output.etc.dir}/default.mf"> + <fileset dir="${common.output.classes.dir}"> <include name="org/jboss/wsf/**"/> </fileset> </jar> - <!-- Build jbossws-spi-src.zip --> - <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > - <fileset dir="${spi.java.dir}"/> + <!-- Build jbossws-common-src.zip --> + <zip zipfile="${common.output.lib.dir}/jbossws-common-src.zip" > + <fileset dir="${common.java.dir}"/> </zip> </target> @@ -119,10 +119,10 @@ <!-- Generate the JavaDoc --> <target name="javadoc" depends="init" description="Generate the Javadoc"> - <mkdir dir="${spi.output.apidocs.dir}"/> - <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath refid="spi.thirdparty.classpath"/> - <packageset dir="${spi.java.dir}" defaultexcludes="yes"> + <mkdir dir="${common.output.apidocs.dir}"/> + <javadoc destdir="${common.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath refid="common.thirdparty.classpath"/> + <packageset dir="${common.java.dir}" defaultexcludes="yes"> <include name="org/jboss/ws/**"/> <include name="org/jboss/wsf/**"/> </packageset> @@ -132,11 +132,11 @@ </target> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${spi.output.dir}"/> + <delete dir="${common.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${spi.dir}/thirdparty"/> + <delete dir="${common.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Modified: common/trunk/src/main/etc/component-info.xml =================================================================== --- spi/trunk/src/main/etc/component-info.xml 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/src/main/etc/component-info.xml 2007-08-02 10:36:03 UTC (rev 4088) @@ -1,14 +1,14 @@ -<project name="jboss/jbossws-spi"> +<project name="jboss/jbossws-common"> - <component id="jboss/jbossws-spi" + <component id="jboss/jbossws-common" description="JBossWS SPI" version=&quot;@repository.id(a)&quot; licenseType="lgpl"> - <artifact id="jbossws-spi.jar"/> + <artifact id="jbossws-common.jar"/> <export> - <include input="jbossws-spi.jar"/> + <include input="jbossws-common.jar"/> </export> </component> Copied: common/trunk/src/main/java/org/jboss/wsf/common (from rev 4087, trunk/integration/spi/src/main/java/org/jboss/wsf/common) Copied: common/trunk/src/main/java/org/jboss/wsf/test (from rev 4087, trunk/integration/spi/src/main/java/org/jboss/wsf/test) Modified: common/trunk/version.properties =================================================================== --- spi/trunk/version.properties 2007-08-02 10:14:28 UTC (rev 4087) +++ common/trunk/version.properties 2007-08-02 10:36:03 UTC (rev 4088) @@ -23,6 +23,7 @@ jboss-javaee=5.0.0-SNAPSHOT jboss-jbossxb=1.0.0.GA-brew jboss-microcontainer=2.0.0.Beta3 +jbossws-spi=2.0.1.CR1 sun-jaf=1.1 sun-jaxb=2.1.4 sun-jaxrpc=1.1