[jbossws-commits] JBossWS SVN: r6359 - in spi/trunk: src/main/etc and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-11 11:12:57 -0400 (Fri, 11 Apr 2008) New Revision: 6359 Added: spi/trunk/pom.xml Removed: spi/trunk/ant-import/ spi/trunk/src/main/etc/default.mf spi/trunk/src/main/etc/pom.xml spi/trunk/tools/ Modified: spi/trunk/ spi/trunk/.classpath spi/trunk/ant.properties.example spi/trunk/build.xml spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java spi/trunk/version.properties Log: Migrate to maven build Property changes on: spi/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties version.properties.md5 output* thirdparty + ant.properties version.properties.md5 output* thirdparty target Modified: spi/trunk/.classpath =================================================================== --- spi/trunk/.classpath 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/.classpath 2008-04-11 15:12:57 UTC (rev 6359) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> @@ -19,5 +20,5 @@ <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry kind="output" path="output/eclipse"/> + <classpathentry kind="output" path="target/eclipse"/> </classpath> Modified: spi/trunk/ant.properties.example =================================================================== --- spi/trunk/ant.properties.example 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/ant.properties.example 2008-04-11 15:12:57 UTC (rev 6359) @@ -3,21 +3,5 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - -# 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 - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no +# JBossWS local repository +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository \ No newline at end of file Modified: spi/trunk/build.xml =================================================================== --- spi/trunk/build.xml 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/build.xml 2008-04-11 15:12:57 UTC (rev 6359) @@ -11,174 +11,53 @@ <!-- $Id$ --> -<project name="JBossWS-SPI" default="main" basedir="." xmlns:artifact="urn:maven-artifact-ant"> +<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 --> <!-- ================================================================== --> - <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" /> + <property name="spi.dir" value="${basedir}"/> + <property name="spi.etc.dir" value="${spi.dir}/src/main/etc"/> + <property name="spi.target.dir" value="${spi.dir}/target"/> - <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> + <target name="init"> + + <!-- Check if ant.properties is available --> + <available property="ant.properties.available" file="${basedir}/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"/> + + </target> <!-- ================================================================== --> - <!-- Compile --> + <!-- Installation --> <!-- ================================================================== --> + + <!-- Release to jboss.local.repository --> + <target name="install" depends="init" description="Install to jboss.local.repository"> - <!-- - | 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> + <!-- Check if ant.properties is available --> + <available property="jbossws.spi.jar.available" file="${spi.target.dir}/jbossws-spi-${version.id}.jar"/> + <fail message="Cannot find jbossws-spi-${version.id}.jar. Did you run 'mvn package'?" unless="ant.properties.available"/> + + <!-- jboss/jbossws-spi --> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib"/> + <copy file="${spi.target.dir}/jbossws-spi-${version.id}.jar" todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true"/> + <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${spi.dir}/version.properties"/> + </filterset> + </copy> </target> + + <target name="main" description="Executes the default target (most)." depends="install"/> - <!-- 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"> - - <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"> - <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:"/> - </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> - - <!-- ================================================================== --> - <!-- 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/pom.xml =================================================================== --- spi/trunk/pom.xml (rev 0) +++ spi/trunk/pom.xml 2008-04-11 15:12:57 UTC (rev 6359) @@ -0,0 +1,121 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.wsf</groupId> + <artifactId>jbossws-spi</artifactId> + <packaging>jar</packaging> + <version>3.0.0-SNAPSHOT</version> + <name>JBoss Web Services - SPI</name> + <organization> + <name>JBoss, a division of Red Hat</name> + <url>http://www.jboss.org</url> + </organization> + <url>http://maven.apache.org</url> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + <version>1.0.13</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>sun-jaxws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1.1</version> + </dependency> + </dependencies> + + <!-- Plugins --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <!-- Repositories --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Releases Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/1</url> + <layout>legacy</layout> + </repository> + </repositories> +</project> Property changes on: spi/trunk/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: spi/trunk/src/main/etc/default.mf =================================================================== --- spi/trunk/src/main/etc/default.mf 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/src/main/etc/default.mf 2008-04-11 15:12:57 UTC (rev 6359) @@ -1,11 +0,0 @@ -Manifest-Version: 1.2 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (build=(a)build.id@) -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ -Class-Path: getopt.jar \ No newline at end of file Deleted: spi/trunk/src/main/etc/pom.xml =================================================================== --- spi/trunk/src/main/etc/pom.xml 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/src/main/etc/pom.xml 2008-04-11 15:12:57 UTC (rev 6359) @@ -1,6 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version&gt;@repository.id(a)&lt;/version&gt; -</project> Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntConsumeTestCase.java 2008-04-11 15:12:57 UTC (rev 6359) @@ -21,6 +21,8 @@ */ package org.jboss.test.wsf.spi.tools; +import java.io.File; + /** * Test the WSConsumeTask. * This test needs to be executed in 'SPI_HOME/output/tests', @@ -44,7 +46,13 @@ "org.jboss.test.wsf.spi.tools.CmdConsumeTrackerFactory" ); - configureProject("resources/smoke/tools/consume-test.xml"); + // maven style + if (new File("src/test/resources/smoke/tools/consume-test.xml").exists()) + configureProject("src/test/resources/smoke/tools/consume-test.xml"); + + // ant style + else if (new File("resources/smoke/tools/consume-test.xml").exists()) + configureProject("resources/smoke/tools/consume-test.xml"); } public void testPlainInvocation() Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/AntProvideTestCase.java 2008-04-11 15:12:57 UTC (rev 6359) @@ -21,6 +21,8 @@ */ package org.jboss.test.wsf.spi.tools; +import java.io.File; + /** * @author Heiko.Braun(a)jboss.com * @version $Revision$ @@ -40,7 +42,13 @@ "org.jboss.test.wsf.spi.tools.CmdProvideTrackerFactory" ); - configureProject("resources/smoke/tools/provide-test.xml"); + // maven style + if (new File("src/test/resources/smoke/tools/provide-test.xml").exists()) + configureProject("src/test/resources/smoke/tools/provide-test.xml"); + + // ant style + else if (new File("resources/smoke/tools/provide-test.xml").exists()) + configureProject("resources/smoke/tools/provide-test.xml"); } public void testPlainInvocation() Modified: spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java =================================================================== --- spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/src/test/java/org/jboss/test/wsf/spi/tools/CmdConsumeTracker.java 2008-04-11 15:12:57 UTC (rev 6359) @@ -36,58 +36,75 @@ { public static String LAST_EVENT = ""; + @Override public void setBindingFiles(List<File> bindingFiles) { LAST_EVENT += "setBindingFiles"; } + @Override public void setCatalog(File catalog) { LAST_EVENT += "setCatalog"; } + @Override public void setOutputDirectory(File directory) { LAST_EVENT += "setOutputDirectory"; } + @Override public void setSourceDirectory(File directory) { LAST_EVENT += "setSourceDirectory"; } + @Override public void setGenerateSource(boolean generateSource) { LAST_EVENT += "setGenerateSource"; } + @Override public void setTargetPackage(String targetPackage) { LAST_EVENT += "setTargetPackage"; } + @Override public void setWsdlLocation(String wsdlLocation) { LAST_EVENT += "setWsdlLocation"; } + @Override public void setMessageStream(PrintStream messageStream) { LAST_EVENT += "setMessageStream"; } + @Override public void setAdditionalCompilerClassPath(List<String> classPath) { LAST_EVENT += "setAdditionalCompilerClassPath"; } + @Override public void setTarget(String target) { LAST_EVENT += "setTarget"; } + @Override public void consume(URL wsdl) { LAST_EVENT += "consume"; } + + @Override + public void setExtension(boolean extension) + { + LAST_EVENT += "setExtension"; + } } Modified: spi/trunk/version.properties =================================================================== --- spi/trunk/version.properties 2008-04-11 14:57:24 UTC (rev 6358) +++ spi/trunk/version.properties 2008-04-11 15:12:57 UTC (rev 6359) @@ -1,31 +1,5 @@ # $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-3.0 - -version.id=1.0.3.DEV +version.id=3.0.0-SNAPSHOT repository.id=snapshot - -implementation.title=JBoss Web Services - SPI -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# 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 -jboss-javaee=5.0.0.Beta3Update1 -jboss-jbossxb=1.0.0.GA -jboss-microcontainer=2.0.0.Beta3 -sun-jaf=1.1 -sun-jaxb=2.1.4 -sun-jaxrpc=1.1 -sun-jaxws=2.1.1 -sun-servlet=2.5 -junit=3.8.1