Author: heiko.braun(a)jboss.com Date: 2008-03-13 08:45:49 -0400 (Thu, 13 Mar 2008) New Revision: 5958 Added: spi/trunk/src/main/etc/pom.xml spi/trunk/tools/ spi/trunk/tools/mvn/ spi/trunk/tools/mvn/maven-ant-tasks-2.0.8.jar Modified: spi/trunk/ant-import/build-release.xml spi/trunk/ant.properties.example spi/trunk/build.xml Log: Enable maven publishing Modified: spi/trunk/ant-import/build-release.xml =================================================================== --- spi/trunk/ant-import/build-release.xml 2008-03-13 12:41:00 UTC (rev 5957) +++ spi/trunk/ant-import/build-release.xml 2008-03-13 12:45:49 UTC (rev 5958) @@ -31,7 +31,8 @@ <filtersfile file="${spi.dir}/version.properties"/> </filterset> </copy> - + + <antcall target="mvn.publish.remote"/> </target> </project> Modified: spi/trunk/ant.properties.example =================================================================== --- spi/trunk/ant.properties.example 2008-03-13 12:41:00 UTC (rev 5957) +++ spi/trunk/ant.properties.example 2008-03-13 12:45:49 UTC (rev 5958) @@ -10,6 +10,9 @@ # JBossWS Release jboss.local.repository=/home/tdiesler/svn/jboss.local.repository +# See http://wiki.jboss.org/wiki/Wiki.jsp?page=MavenReleaseRepository +jboss.local.maven.repository=/home/hbraun/dev/prj/repository.jboss.org/maven2 + # Force thirdparty HTTP get #force.thirdparty.get=true Modified: spi/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2008-03-13 12:41:00 UTC (rev 5957) +++ spi/trunk/build.xml 2008-03-13 12:45:49 UTC (rev 5958) @@ -11,119 +11,127 @@ <!-- $Id$ --> -<project name="JBossWS-SPI" default="main" basedir="."> - - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${basedir}/ant-import/build-testsuite.xml"/> - - <!-- ================================================================== --> - <!-- 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.java.dir" value="${spi.src.dir}/java"/> - <property name="spi.output.dir" value="${spi.dir}/output"/> +<project name="JBossWS-SPI" default="main" basedir="." xmlns:artifact="urn:maven-artifact-ant"> - <property name="spi.test.dir" value="${spi.dir}/src/test"/> - <property name="spi.test.java.dir" value="${spi.test.dir}/java"/> - <property name="spi.test.resources.dir" value="${spi.test.dir}/resources"/> - <property name="spi.test.output.dir" value="${spi.output.dir}/test"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/build-testsuite.xml"/> - <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"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="init" depends="prepare,thirdparty-classpath"> - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <target name="compile" depends="init,compile-classes,compile-etc" - description="Compile all source files."/> - - <!-- 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}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> - <include name="org/jboss/wsf/**"/> - <classpath refid="spi.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" overwrite="true"> - <fileset dir="${spi.etc.dir}"> - <include name="default.mf"/> - </fileset> - <filterset> - <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-${version.id}"/> - <filtersfile file="${spi.dir}/version.properties"/> - </filterset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - - <!-- - | Build all jar files. - --> - <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}"> - <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}"/> - </zip> + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> - </target> + <path id="maven-ant-tasks.classpath" path="tools/mvn/maven-ant-tasks-2.0.8.jar" /> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="urn:maven-artifact-ant" + classpathref="maven-ant-tasks.classpath" /> - <!-- ================================================================== --> - <!-- Documentation --> - <!-- ================================================================== --> + <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.java.dir" value="${spi.src.dir}/java"/> + <property name="spi.output.dir" value="${spi.dir}/output"/> + <property name="spi.test.dir" value="${spi.dir}/src/test"/> + <property name="spi.test.java.dir" value="${spi.test.dir}/java"/> + <property name="spi.test.resources.dir" value="${spi.test.dir}/resources"/> + <property name="spi.test.output.dir" value="${spi.output.dir}/test"/> + + <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"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="init" depends="prepare,thirdparty-classpath"> + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <!-- + | Compile everything. + | + | This target should depend on other compile-* targets for each + | different type of compile that needs to be performed, short of + | documentation compiles. + --> + + <target name="compile" depends="init,compile-classes,compile-etc" + description="Compile all source files."/> + + <!-- 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}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5"> + <include name="org/jboss/wsf/**"/> + <include name="org/jboss/integration/**"/> + <classpath refid="spi.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" overwrite="true"> + <fileset dir="${spi.etc.dir}"> + <include name="default.mf"/> + <include name="pom.xml"/> + </fileset> + <filterset> + <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-${version.id}"/> + <filtersfile file="${spi.dir}/version.properties"/> + </filterset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Archives --> + <!-- ================================================================== --> + + <!-- + | Build all jar files. + --> + <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + </target> + + <!-- + | Build all jar files. + --> + <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}"> + <include name="org/jboss/wsf/**"/> + <include name="org/jboss/integration/**"/> + </fileset> + </jar> + + <!-- Build jbossws-spi-src.zip --> + <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" > + <fileset dir="${spi.java.dir}"/> + </zip> + + </target> + + <!-- ================================================================== --> + <!-- Documentation --> + <!-- ================================================================== --> + <!-- Generate the JavaDoc --> <target name="javadoc" depends="init" description="Generate the Javadoc"> @@ -135,23 +143,42 @@ <include name="org/jboss/wsf/**"/> </packageset> <doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> + <tag name="todo" scope="all" description="To do:"/> </javadoc> </target> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${spi.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${spi.dir}/thirdparty"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${spi.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + <delete dir="${spi.dir}/thirdparty"/> + </target> + + <target name="main" description="Executes the default target (most)." depends="most"/> + + <target name="most" description="Builds almost everything." depends="jars"/> + + <target name="all" description="Create a distribution zip file" depends="main"> + </target> + + <!-- ================================================================== --> + <!-- Publish maven artifacts --> + <!-- ================================================================== --> + + <target name="mvn.install.local" depends="compile-etc" description="Publish jbossws-spi.jar to ~/m2/ (local maven repo)"> + <artifact:pom id="maven.project" file="${spi.output.etc.dir}/pom.xml" /> + <artifact:install file="${spi.output.lib.dir}/jbossws-spi.jar"> + <pom refid="maven.project"/> + </artifact:install> + </target> + + <target name="mvn.install.remote" depends="compile-etc" description="Publish jbossws-spi.jar to a svn checkout of repository.jboss.org/maven2"> + <artifact:pom id="maven.project" file="${spi.output.etc.dir}/pom.xml" /> + <artifact:deploy file="${spi.output.lib.dir}/jbossws-spi.jar"> + <remoteRepository url="file://${jboss.local.maven.repository}"/> + <pom refid="maven.project"/> + </artifact:deploy> + </target> + </project> Added: spi/trunk/src/main/etc/pom.xml =================================================================== --- spi/trunk/src/main/etc/pom.xml (rev 0) +++ spi/trunk/src/main/etc/pom.xml 2008-03-13 12:45:49 UTC (rev 5958) @@ -0,0 +1,6 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version&gt;@repository.id(a)&lt;/version&gt; +</project> Added: spi/trunk/tools/mvn/maven-ant-tasks-2.0.8.jar =================================================================== (Binary files differ) Property changes on: spi/trunk/tools/mvn/maven-ant-tasks-2.0.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream