Author: thomas.diesler(a)jboss.com Date: 2008-04-12 06:38:42 -0400 (Sat, 12 Apr 2008) New Revision: 6371 Added: common/trunk/pom.xml Removed: common/trunk/ant-import/ common/trunk/src/main/etc/default.mf common/trunk/version.properties Modified: common/trunk/ common/trunk/.classpath common/trunk/ant.properties.example common/trunk/build.xml common/trunk/src/main/etc/component-info.xml Log: Switch to maven build Property changes on: common/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties version.properties.md5 output* thirdparty + ant.properties version.properties.md5 output* thirdparty target Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/.classpath 2008-04-12 10:38:42 UTC (rev 6371) @@ -3,17 +3,7 @@ <classpathentry kind="src" path="src/main/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"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> - <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="thirdparty/ant.jar"/> - <classpathentry kind="output" path="output/eclipse"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> + <classpathentry kind="output" path="target/eclipse"/> </classpath> Modified: common/trunk/ant.properties.example =================================================================== --- common/trunk/ant.properties.example 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/ant.properties.example 2008-04-12 10:38:42 UTC (rev 6371) @@ -3,18 +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 - -# 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: common/trunk/build.xml =================================================================== --- common/trunk/build.xml 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/build.xml 2008-04-12 10:38:42 UTC (rev 6371) @@ -12,140 +12,70 @@ <!-- $Id$ --> <project name="JBossWS-Common" default="main" basedir="."> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <property name="common.dir" value="${basedir}"/> + <property name="common.etc.dir" value="${common.dir}/src/main/etc"/> + <property name="common.target.dir" value="${common.dir}/target"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <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="${common.dir}/ant.properties"/> + + <xmlproperty file="${common.dir}/pom.xml"/> + <property name="version.id" value="${project.version}"/> + <property name="repository.id" value="${project.version}"/> + + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + </target> + + <!-- ================================================================== --> + <!-- Installation --> + <!-- ================================================================== --> - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <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 --> - <!-- ================================================================== --> - - <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 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/**"/> - <include name="org/jboss/ws/**"/> - <classpath refid="common.thirdparty.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${common.output.etc.dir}"/> - <copy todir="${common.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${common.etc.dir}"> - <include name="default.mf"/> - </fileset> + <!-- Install to jboss.local.repository --> + <target name="install" depends="init" description="Install to jboss.local.repository"> + + <!-- Check if the target jar is available --> + <available property="jbossws.common.jar.available" file="${common.target.dir}/jbossws-common-${version.id}.jar"/> + <fail message="Cannot find jbossws-common-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.common.jar.available"/> + + <!-- Check if the source jar is available --> + <available property="jbossws.common.sources.jar.available" file="${common.target.dir}/jbossws-common-${version.id}-sources.jar"/> + <fail message="Cannot find jbossws-common-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.common.sources.jar.available"/> + + <!-- jboss/jbossws-common --> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib"/> + <copy file="${common.target.dir}/jbossws-common-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common.jar" overwrite="true"/> + <copy file="${common.target.dir}/jbossws-common-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common-src.jar" 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> - <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="${common.dir}/version.properties"/> </filterset> </copy> - </target> + </target> <!-- ================================================================== --> - <!-- Archives --> + <!-- Miscellaneous --> <!-- ================================================================== --> - - <!-- - | 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-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/**"/> - <include name="org/jboss/ws/**"/> - </fileset> - </jar> - - <!-- Build jbossws-common-src.zip --> - <zip zipfile="${common.output.lib.dir}/jbossws-common-src.zip" > - <fileset dir="${common.java.dir}"/> - </zip> + <target name="clean" depends="init" description="Cleans up most generated files."> + <delete dir="${common.target.dir}"/> </target> - - <!-- ================================================================== --> - <!-- Documentation --> - <!-- ================================================================== --> - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="main" description="Executes the default target (install)." depends="install"/> - <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> - <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="${common.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${common.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> - </project> Added: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml (rev 0) +++ common/trunk/pom.xml 2008-04-12 10:38:42 UTC (rev 6371) @@ -0,0 +1,103 @@ +<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.ws</groupId> + <artifactId>jbossws-common</artifactId> + <packaging>jar</packaging> + <version>3.0.0-SNAPSHOT</version> + <name>JBoss Web Services - Common</name> + <organization> + <name>JBoss, a division of Red Hat</name> + <url>http://www.jboss.org</url> + </organization> + <url>http://maven.apache.org</url> + + <!-- Properties --> + <properties> + <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> + </properties> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.0.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws-spi}</version> + </dependency> + </dependencies> + + <!-- Parent --> + <parent> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + + <!-- Plugins --> + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <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: common/trunk/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: common/trunk/src/main/etc/component-info.xml =================================================================== --- common/trunk/src/main/etc/component-info.xml 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/src/main/etc/component-info.xml 2008-04-12 10:38:42 UTC (rev 6371) @@ -2,14 +2,14 @@ <component id="jboss/jbossws-common" description="JBossWS Common" - version=&quot;@repository.id(a)&quot; + version="${version}" licenseType="lgpl"> <artifact id="jbossws-common.jar"/> <artifact id="jbossws-common-src.zip"/> <import componentref="jboss/jbossws-spi"> - <compatible version="@jbossws-spi@"/> + <compatible version="${jbossws-spi}"/> </import> <export> Deleted: common/trunk/src/main/etc/default.mf =================================================================== --- common/trunk/src/main/etc/default.mf 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/src/main/etc/default.mf 2008-04-12 10:38:42 UTC (rev 6371) @@ -1,10 +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@ Deleted: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2008-04-12 10:09:58 UTC (rev 6370) +++ common/trunk/version.properties 2008-04-12 10:38:42 UTC (rev 6371) @@ -1,27 +0,0 @@ - -# $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=2.0.5.DEV -repository.id=snapshot - -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Thirdparty library versions -jbossws-spi=1.0.2.GA - -jboss-common-core=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-javaee=5.0.0.Beta3Update1 -jboss-microcontainer=2.0.0.Beta3 -apache-ant=1.6.5 -junit=3.8.1 -sun-jaf=1.1 -sun-jaxb=2.1.4 -sun-jaxrpc=1.1 -sun-jaxws=2.1.1