You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/07/27 15:37:23 UTC
svn commit: r426073 - in /beehive/wsm/trunk: build.xml
src/beehive-jsr181.pom src/beehive-wsdltypes.pom src/beehive-wsm-axis.pom
src/beehive-wsm.pom
Author: ekoneil
Date: Thu Jul 27 06:37:23 2006
New Revision: 426073
URL: http://svn.apache.org/viewvc?rev=426073&view=rev
Log:
Fixup WSM's use of Maven2. Spent some time reading about repositories and installing files, and the new build.xml file is much simpler. The .pom and .jar files are added to the local Maven repo directly from src/ and build/ directories without having to stage them all together into build/maven2.
Test: WSM pass
Modified:
beehive/wsm/trunk/build.xml
beehive/wsm/trunk/src/beehive-jsr181.pom
beehive/wsm/trunk/src/beehive-wsdltypes.pom
beehive/wsm/trunk/src/beehive-wsm-axis.pom
beehive/wsm/trunk/src/beehive-wsm.pom
Modified: beehive/wsm/trunk/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build.xml?rev=426073&r1=426072&r2=426073&view=diff
==============================================================================
--- beehive/wsm/trunk/build.xml (original)
+++ beehive/wsm/trunk/build.xml Thu Jul 27 06:37:23 2006
@@ -167,50 +167,6 @@
<echo message="--------------------------------------------------"/>
<echo message="--------------------------------------------------"/>
- <echo message="| Generating AnnoBeans for JSR 181 annotations |"/>
- <echo message="--------------------------------------------------"/>
-<!--
- <taskdef name="annogen" classname="org.codehaus.annogen.generate.AnnogenTask" classpathref="core.classpath"/>
-
- <mkdir dir="${api.annogen.dir}"/>
- <annogen outputdir="${api.annogen.dir}"
- classpathref="core.classpath"
- srcdir="${api.dir}"
- implementAnnotationTypes="true"/>
--->
- <!--
- Due to a bug in annogen, inner class references are not processed correctly into annogen beans.
- They appear with a package.class$innerclass instaed of package.class.innerclass.
- These are string replaced here.
- -->
-<!--
- <replace dir="${api.annogen.dir}" token="$" value=".">
- <include name="**/*.java"/>
- </replace>
-
- <mkdir dir="${api.annogen.classes}"/>
- <javac destdir="${api.annogen.classes}" classpathref="core.classpath" debug="${debug}">
- <src path="${api.annogen.dir}"/>
- </javac>
-
- <jar jarfile="${jsr181-annogen.jar}">
- <fileset dir="${api.annogen.classes}"/>
- <manifest>
- <attribute name="Extension-Name" value="JSR 181 API Annogen Library"/>
- <attribute name="Specification-Title" value="Annogen Beans for Web Services Metadata for the Java Platform"/>
- <attribute name="Implementation-Title" value="Beehive WSM"/>
- <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
- <attribute name="Implementation-Version" value="${beehive.version}"/>
- <attribute name="Beehive-Version" value="${beehive.version}"/>
- </manifest>
- </jar>
--->
-
- <echo message="-------------------------------------------------------"/>
- <echo message="| Generating AnnoBeans for JSR 181 annotations ending |"/>
- <echo message="-------------------------------------------------------"/>
-
- <echo message="--------------------------------------------------"/>
<echo message="| WSM Core build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -292,8 +248,10 @@
</target>
<target name="install" description="Install the JARs in a local Maven repository">
- <antcall target="m2.stage"/>
- <antcall target="m2.install"/>
+ <m2-install-jar resource="beehive-wsm"/>
+ <m2-install-jar resource="beehive-wsdltypes"/>
+ <m2-install-jar resource="beehive-jsr181"/>
+ <m2-install-jar resource="beehive-wsm-axis"/>
</target>
<target name="build.dist" description="Build a WSM distribution">
@@ -322,97 +280,6 @@
</copy>
</target>
- <target name="m2.stage">
- <mkdir dir="${build.m2.dir}"/>
-
- <!-- jsr181 -->
- <copy todir="${build.m2.dir}/beehive-jsr181/${wsm.version}">
- <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/>
- <fileset dir="build/jars">
- <include name="beehive-jsr181.jar"/>
- </fileset>
- </copy>
- <filter token="wsm.version" value="${wsm.version}"/>
- <copy todir="${build.m2.dir}/beehive-jsr181/${wsm.version}" filtering="true">
- <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/>
- <fileset dir="src" includes="beehive-jsr181.pom"/>
- </copy>
- <jar destfile="${build.m2.dir}/beehive-jsr181/${wsm.version}/beehive-jsr181-${wsm.version}-sources.jar">
- <fileset dir="src/api"/>
- </jar>
-
- <!-- jsr181 annogen -->
-<!--
- <copy todir="${build.m2.dir}/beehive-jsr181-annogen/${wsm.version}">
- <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/>
- <fileset dir="build/jars">
- <include name="beehive-jsr181-annogen.jar"/>
- </fileset>
- </copy>
- <filter token="wsm.version" value="${wsm.version}"/>
- <copy todir="${build.m2.dir}/beehive-jsr181-annogen/${wsm.version}" filtering="true">
- <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/>
- <fileset dir="src" includes="beehive-jsr181-annogen.pom"/>
- </copy>
- <jar destfile="${build.m2.dir}/beehive-jsr181-annogen/${wsm.version}/beehive-jsr181-annogen-${wsm.version}-sources.jar">
- <fileset dir="src/api-annogen"/>
- </jar>
--->
-
- <!-- wsm core -->
- <copy todir="${build.m2.dir}/beehive-wsm/${wsm.version}">
- <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/>
- <fileset dir="build/jars">
- <include name="beehive-wsm.jar"/>
- </fileset>
- </copy>
- <filter token="wsm.version" value="${wsm.version}"/>
- <copy todir="${build.m2.dir}/beehive-wsm/${wsm.version}" filtering="true">
- <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/>
- <fileset dir="src" includes="beehive-wsm.pom"/>
- </copy>
- <jar destfile="${build.m2.dir}/beehive-wsm/${wsm.version}/beehive-wsm-${wsm.version}-sources.jar">
- <fileset dir="src/core"/>
- </jar>
-
- <!-- wsm axis -->
- <copy todir="${build.m2.dir}/beehive-wsm-axis/${wsm.version}">
- <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/>
- <fileset dir="build/jars">
- <include name="beehive-wsm-axis.jar"/>
- </fileset>
- </copy>
- <filter token="wsm.version" value="${wsm.version}"/>
- <copy todir="${build.m2.dir}/beehive-wsm-axis/${wsm.version}" filtering="true">
- <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/>
- <fileset dir="src" includes="beehive-wsm-axis.pom"/>
- </copy>
- <jar destfile="${build.m2.dir}/beehive-wsm-axis/${wsm.version}/beehive-wsm-axis-${wsm.version}-sources.jar">
- <fileset dir="src/axis"/>
- </jar>
-
- <!-- wsm wsdltypes -->
- <copy todir="${build.m2.dir}/beehive-wsdltypes/${wsm.version}">
- <mapper type="glob" from="*.jar" to="*-${wsm.version}.jar"/>
- <fileset dir="build/jars">
- <include name="beehive-wsdltypes.jar"/>
- </fileset>
- </copy>
- <filter token="wsm.version" value="${wsm.version}"/>
- <copy todir="${build.m2.dir}/beehive-wsdltypes/${wsm.version}" filtering="true">
- <mapper type="glob" from="*.pom" to="*-${wsm.version}.pom"/>
- <fileset dir="src" includes="beehive-wsdltypes.pom"/>
- </copy>
- </target>
-
- <target name="m2.install">
- <m2-install-jar resource="beehive-wsm"/>
- <m2-install-jar resource="beehive-wsdltypes"/>
- <m2-install-jar resource="beehive-jsr181"/>
- <m2-install-jar resource="beehive-jsr181-annogen"/>
- <m2-install-jar resource="beehive-wsm-axis"/>
- </target>
-
<!-- ==================================================================== -->
<!-- deploy.webservice.runtime -->
<!-- ==================================================================== -->
@@ -477,7 +344,7 @@
</condition>
<exec executable="${_cmd}" failonerror="true">
- <arg line="install:install-file -Dfile=${build.m2.dir}/@{resource}/${wsm.version}/@{resource}-${wsm.version}.jar -DgroupId=${wsm.groupid} -DartifactId=@{resource} -Dversion=${wsm.version} -Dpackaging=jar"/>
+ <arg line="install:install-file -Dfile=build/jars/@{resource}.jar -DgroupId=${wsm.groupid} -DartifactId=@{resource} -Dversion=${wsm.version} -Dpackaging=jar -DpomFile=src/@{resource}.pom"/>
</exec>
</sequential>
</macrodef>
Modified: beehive/wsm/trunk/src/beehive-jsr181.pom
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-jsr181.pom?rev=426073&r1=426072&r2=426073&view=diff
==============================================================================
--- beehive/wsm/trunk/src/beehive-jsr181.pom (original)
+++ beehive/wsm/trunk/src/beehive-jsr181.pom Thu Jul 27 06:37:23 2006
@@ -22,7 +22,7 @@
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-jsr181</artifactId>
<name>beehive-jsr181</name>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
<dependencies>
</dependencies>
</project>
Modified: beehive/wsm/trunk/src/beehive-wsdltypes.pom
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsdltypes.pom?rev=426073&r1=426072&r2=426073&view=diff
==============================================================================
--- beehive/wsm/trunk/src/beehive-wsdltypes.pom (original)
+++ beehive/wsm/trunk/src/beehive-wsdltypes.pom Thu Jul 27 06:37:23 2006
@@ -22,7 +22,7 @@
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-wsdltypes</artifactId>
<name>beehive-wsdltypes</name>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
<dependencies>
<dependency>
<groupId>annogen</groupId>
Modified: beehive/wsm/trunk/src/beehive-wsm-axis.pom
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsm-axis.pom?rev=426073&r1=426072&r2=426073&view=diff
==============================================================================
--- beehive/wsm/trunk/src/beehive-wsm-axis.pom (original)
+++ beehive/wsm/trunk/src/beehive-wsm-axis.pom Thu Jul 27 06:37:23 2006
@@ -23,7 +23,7 @@
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-wsm-axis</artifactId>
<name>beehive-wsm-axis</name>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
<dependencies>
<dependency>
<groupId>axis</groupId>
@@ -33,17 +33,22 @@
<dependency>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-wsm</artifactId>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
</dependency>
<dependency>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-jsr181</artifactId>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
</dependency>
<dependency>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-wsdltypes</artifactId>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
</dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>0.1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: beehive/wsm/trunk/src/beehive-wsm.pom
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/src/beehive-wsm.pom?rev=426073&r1=426072&r2=426073&view=diff
==============================================================================
--- beehive/wsm/trunk/src/beehive-wsm.pom (original)
+++ beehive/wsm/trunk/src/beehive-wsm.pom Thu Jul 27 06:37:23 2006
@@ -22,17 +22,17 @@
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-wsdltypes</artifactId>
<name>beehive-wsdltypes</name>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
<dependencies>
<dependency>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-jsr181</artifactId>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
</dependency>
<dependency>
<groupId>org.apache.beehive</groupId>
<artifactId>beehive-wsdltypes</artifactId>
- <version>@wsm.version@</version>
+ <version>1.0-SNAPSNOT</version>
</dependency>
<dependency>
<groupId>annogen</groupId>