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/03/31 18:48:30 UTC
svn commit: r390454 - in /beehive/trunk: ./ maven/ system-controls/
system-controls/src/ejb/ system-controls/src/jdbc/ system-controls/src/jms/
Author: ekoneil
Date: Fri Mar 31 08:48:29 2006
New Revision: 390454
URL: http://svn.apache.org/viewcvs?rev=390454&view=rev
Log:
Fixup some Maven2 support and add the ability to install the current SNAPSHOT JARs into the a local Maven repository.
BB: self
Test: Beehive test pass
Added:
beehive/trunk/system-controls/src/ejb/beehive-ejb-control.pom
- copied unchanged from r390148, beehive/trunk/system-controls/src/ejb/beehive-control-ejb.pom
beehive/trunk/system-controls/src/jdbc/beehive-jdbc-control.pom
- copied unchanged from r390148, beehive/trunk/system-controls/src/jdbc/beehive-control-jdbc.pom
beehive/trunk/system-controls/src/jms/beehive-jms-control.pom
- copied unchanged from r390148, beehive/trunk/system-controls/src/jms/beehive-control-jms.pom
Removed:
beehive/trunk/system-controls/src/ejb/beehive-control-ejb.pom
beehive/trunk/system-controls/src/jdbc/beehive-control-jdbc.pom
beehive/trunk/system-controls/src/jms/beehive-control-jms.pom
Modified:
beehive/trunk/beehive-imports.xml
beehive/trunk/maven/build.xml
beehive/trunk/system-controls/build.xml
Modified: beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/beehive-imports.xml?rev=390454&r1=390453&r2=390454&view=diff
==============================================================================
--- beehive/trunk/beehive-imports.xml (original)
+++ beehive/trunk/beehive-imports.xml Fri Mar 31 08:48:29 2006
@@ -29,7 +29,7 @@
<property name="ant.dir" location="${os.ANT_HOME}"/>
<property name="forrest.dir" location="${os.FORREST_HOME}"/>
- <property name="beehive.version" value="1.0.2-SNAPSHOT"/>
+ <property name="beehive.version" value="1.1-SNAPSHOT"/>
<property name="dist.base.name" value="apache-beehive-"/>
<property name="dist.name" value="${dist.base.name}${beehive.version}"/>
Modified: beehive/trunk/maven/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/maven/build.xml?rev=390454&r1=390453&r2=390454&view=diff
==============================================================================
--- beehive/trunk/maven/build.xml (original)
+++ beehive/trunk/maven/build.xml Fri Mar 31 08:48:29 2006
@@ -26,6 +26,7 @@
<import file="../beehive-imports.xml"/>
<property name="_maven.dir" location="${beehive.home}/build/maven/"/>
+ <property name="_maven.groupid" location="org.apache.beehive"/>
<target name="build.m2">
<!-- copy all of the Maven POMs -->
@@ -46,6 +47,26 @@
<delete dir="${build.m2.dir}"/>
</target>
+ <target name="install.m2" description="Install the Beehive JARs into a local Maven2 repository">
+ <m2-install-jar resource="beehive-controls"/>
+ <m2-install-jar resource="beehive-netui-compiler"/>
+ <m2-install-jar resource="beehive-netui-core"/>
+ <m2-install-jar resource="beehive-netui-tags"/>
+ <m2-install-jar resource="beehive-jdbc-control"/>
+ <m2-install-jar resource="beehive-jms-control"/>
+ <m2-install-jar resource="beehive-ejb-control"/>
+ </target>
+
+ <macrodef name="m2-install-jar" description="Install a resource in a Maven 2 repository">
+ <attribute name="resource"/>
+ <sequential>
+ <property name="root.dir" location="${_maven.dir}/m2/org/apache/beehive"/>
+ <exec executable="mvn" failonerror="true">
+ <arg line="install:install-file -Dfile=${root.dir}/@{resource}/${beehive.version}/@{resource}-${beehive.version}.jar -DgroupId=${_maven.groupid} -DartifactId=@{resource} -Dversion=${beehive.version} -Dpackaging=jar"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
<target name="build.m1">
<!-- copy POMs -->
<copy todir="${build.m1.dir}/poms/tmp" failonerror="true" flatten="true">
@@ -54,9 +75,9 @@
<include name="netui/src/compiler-apt/beehive-netui-complier.pom"/>
<include name="netui/src/pageflow/beehive-netui-core.pom"/>
<include name="netui/src/tags-html/beehive-netui-tags.pom"/>
- <include name="system-controls/src/ejb/beehive-control-ejb.pom"/>
- <include name="system-controls/src/jdbc/beehive-control-jdbc.pom"/>
- <include name="system-controls/src/jms/beehive-control-jms.pom"/>
+ <include name="system-controls/src/ejb/beehive-ejb-control.pom"/>
+ <include name="system-controls/src/jdbc/beehive-jdbc-control.pom"/>
+ <include name="system-controls/src/jms/beehive-jms-control.pom"/>
</fileset>
</copy>
<copy todir="${build.m1.dir}/poms">
Modified: beehive/trunk/system-controls/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/system-controls/build.xml?rev=390454&r1=390453&r2=390454&view=diff
==============================================================================
--- beehive/trunk/system-controls/build.xml (original)
+++ beehive/trunk/system-controls/build.xml Fri Mar 31 08:48:29 2006
@@ -72,48 +72,48 @@
<target name="deploy.m2">
<!-- beehive-control-ejb -->
- <copy todir="${build.m2.dir}/beehive-control-ejb/${beehive.version}">
+ <copy todir="${build.m2.dir}/beehive-ejb-control/${beehive.version}">
<mapper type="glob" from="*.jar" to="*-${beehive.version}.jar"/>
<fileset dir="build/jars">
<include name="beehive-ejb-control.jar"/>
</fileset>
</copy>
<filter token="beehive.version" value="${beehive.version}"/>
- <copy todir="${build.m2.dir}/beehive-control-ejb/${beehive.version}" filtering="true">
+ <copy todir="${build.m2.dir}/beehive-ejb-control/${beehive.version}" filtering="true">
<mapper type="glob" from="*.pom" to="*-${beehive.version}.pom"/>
- <fileset dir="src/ejb" includes="beehive-control-ejb.pom"/>
+ <fileset dir="src/ejb" includes="beehive-ejb-control.pom"/>
</copy>
- <jar destfile="${build.m2.dir}/beehive-control-ejb/${beehive.version}/beehive-control-ejb-${beehive.version}-sources.jar">
+ <jar destfile="${build.m2.dir}/beehive-ejb-control/${beehive.version}/beehive-ejb-control-${beehive.version}-sources.jar">
<fileset dir="src/ejb"/>
</jar>
- <!-- beehive-control-jms -->
- <copy todir="${build.m2.dir}/beehive-control-jms/${beehive.version}">
+ <!-- beehive-jms-control -->
+ <copy todir="${build.m2.dir}/beehive-jms-control/${beehive.version}">
<mapper type="glob" from="*.jar" to="*-${beehive.version}.jar"/>
<fileset dir="build/jars">
<include name="beehive-jms-control.jar"/>
</fileset>
</copy>
<filter token="beehive.version" value="${beehive.version}"/>
- <copy todir="${build.m2.dir}/beehive-control-jms/${beehive.version}" filtering="true">
+ <copy todir="${build.m2.dir}/beehive-jms-control/${beehive.version}" filtering="true">
<mapper type="glob" from="*.pom" to="*-${beehive.version}.pom"/>
- <fileset dir="src/jms" includes="beehive-control-jms.pom"/>
+ <fileset dir="src/jms" includes="beehive-jms-control.pom"/>
</copy>
- <jar destfile="${build.m2.dir}/beehive-control-jms/${beehive.version}/beehive-control-jms-${beehive.version}-sources.jar">
+ <jar destfile="${build.m2.dir}/beehive-jms-control/${beehive.version}/beehive-jms-control-${beehive.version}-sources.jar">
<fileset dir="src/jms"/>
</jar>
- <!-- beehive-control-jdbc -->
- <copy todir="${build.m2.dir}/beehive-control-jdbc/${beehive.version}">
+ <!-- beehive-jdbc-control -->
+ <copy todir="${build.m2.dir}/beehive-jdbc-control/${beehive.version}">
<mapper type="glob" from="*.jar" to="*-${beehive.version}.jar"/>
<fileset dir="build/jars">
<include name="beehive-jdbc-control.jar"/>
</fileset>
</copy>
<filter token="beehive.version" value="${beehive.version}"/>
- <copy todir="${build.m2.dir}/beehive-control-jdbc/${beehive.version}" filtering="true">
+ <copy todir="${build.m2.dir}/beehive-jdbc-control/${beehive.version}" filtering="true">
<mapper type="glob" from="*.pom" to="*-${beehive.version}.pom"/>
- <fileset dir="src/jdbc" includes="beehive-control-jdbc.pom"/>
+ <fileset dir="src/jdbc" includes="beehive-jdbc-control.pom"/>
</copy>
- <jar destfile="${build.m2.dir}/beehive-control-jdbc/${beehive.version}/beehive-control-jdbc-${beehive.version}-sources.jar">
+ <jar destfile="${build.m2.dir}/beehive-jdbc-control/${beehive.version}/beehive-jdbc-control-${beehive.version}-sources.jar">
<fileset dir="src/jdbc"/>
</jar>
</target>