Author: jsong
Date: Tue Feb 1 07:55:44 2005
New Revision: 149410
URL: http://svn.apache.org/viewcvs?view=rev&rev=149410
Log:
Update build.xml and distribution.xml to build some useful controls for
controlhaus as part of the distribution.
Code contributed by Mike Foster and Jeremiah Johnson.
This update should resolve JIRA-BEEHIVE-204.
Modified:
incubator/beehive/trunk/build.xml
incubator/beehive/trunk/distribution.xml
Modified: incubator/beehive/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/build.xml?view=diff&r1=149409&r2=149410
==============================================================================
--- incubator/beehive/trunk/build.xml (original)
+++ incubator/beehive/trunk/build.xml Tue Feb 1 07:55:44 2005
@@ -166,6 +166,9 @@
<!-- Distribution targets -->
<!-- -->
<!-- ============================================= -->
+ <target name="clean.dist">
+ <ant antfile="distribution.xml" target="clean.dist"
inheritAll="false"/>
+ </target>
<target name="build.dist">
<ant antfile="distribution.xml" target="build.dist"
inheritAll="false"/>
</target>
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=149409&r2=149410
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Tue Feb 1 07:55:44 2005
@@ -24,9 +24,147 @@
<mkdir dir="${dist.dir}"/>
<antcall target="build.dist.core"/>
+ <antcall target="build.system.controls"/>
<antcall target="build.dist.samples"/>
<antcall target="build.dist.docs"/>
</target>
+ <target name="build.system.controls" description="gets controls from
controlhaus">
+ <!-- this pulls down the most generally useful controls from
+ controlhaus.org, and builds them into the distribution -->
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- EJB Control -->
+ <!-- -->
+ <!-- ============================================= -->
+ <available property="ejb.control.exists"
file="controlhaus/ejb/trunk/build.xml"/>
+ <antcall target="ejb.svn.update"/>
+ <antcall target="ejb.svn.checkout"/>
+
+ <ant dir="controlhaus/ejb/trunk" target="clean" inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+ <ant dir="controlhaus/ejb/trunk" target="build" inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+
+ <copy file="controlhaus/ejb/trunk/build/ejb-control.jar"
todir="${dist.dir}/lib/controls"/>
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- JDBC Control -->
+ <!-- -->
+ <!-- ============================================= -->
+ <available property="jdbc.control.exists"
file="controlhaus/jdbc/trunk/build.xml"/>
+ <antcall target="jdbc.svn.update"/>
+ <antcall target="jdbc.svn.checkout"/>
+
+ <ant dir="controlhaus/jdbc/trunk" target="download-dependencies"
inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+ <ant dir="controlhaus/jdbc/trunk" target="clean" inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+ <ant dir="controlhaus/jdbc/trunk" target="build" inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+
+ <copy file="controlhaus/jdbc/trunk/build/dist/jdbc-control.jar"
todir="${dist.dir}/lib/controls"/>
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- JMS Control -->
+ <!-- -->
+ <!-- ============================================= -->
+ <available property="jms.control.exists"
file="controlhaus/jms/trunk/build.xml"/>
+ <antcall target="jms.svn.update"/>
+ <antcall target="jms.svn.checkout"/>
+
+ <ant dir="controlhaus/jms/trunk" target="clean" inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+ <ant dir="controlhaus/jms/trunk" target="build" inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+
+ <copy file="controlhaus/jms/trunk/build/jms-control.jar"
todir="${dist.dir}/lib/controls"/>
+
+ <!-- ============================================= -->
+ <!-- -->
+ <!-- Webservice Control -->
+ <!-- -->
+ <!-- ============================================= -->
+ <available property="webservice.control.exists"
file="controlhaus/webservice/trunk/build.xml"/>
+ <antcall target="webservice.svn.update"/>
+ <antcall target="webservice.svn.checkout"/>
+
+ <ant dir="controlhaus/webservice/trunk" target="clean"
inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+ <ant dir="controlhaus/webservice/trunk" target="build"
inheritAll="false">
+ <property name="beehive.home" value="${dist.dir}"/>
+ </ant>
+
+ <ant dir="controlhaus/webservice/trunk" target="jar"
inheritAll="false">
+
+ <copy
file="controlhaus/webservice/trunk/build/jars/webservice-control.jar"
todir="${dist.dir}/lib/controls"/>
+
+ <copy file="controlhaus/webservice/trunk/build/jars/servicecontrol.jar"
todir="${dist.dir}/lib/controls"/>
+
+ </target>
+
+ <!-- EJB Control svn targets -->
+ <target name="ejb.svn.update" if="ejb.control.exists">
+ <exec executable="svn" dir="${beehive.home}/controlhaus/ejb/trunk">
+ <arg line="update"/>
+ </exec>
+ </target>
+ <target name="ejb.svn.checkout" unless="ejb.control.exists">
+ <mkdir dir="${beehive.home}/controlhaus/ejb"/>
+ <exec executable="svn" dir="${beehive.home}/controlhaus/ejb">
+ <arg line="checkout http://svn.controlhaus.org/ejb/trunk"/>
+ </exec>
+ </target>
+
+ <!-- JDBC Control svn targets -->
+ <target name="jdbc.svn.update" if="jdbc.exists">
+ <exec executable="svn" dir="${beehive.home}/controlhaus/jdbc/trunk">
+ <arg line="update"/>
+ </exec>
+ </target>
+ <target name="jdbc.svn.checkout" unless="jdbc.exists">
+ <mkdir dir="${beehive.home}/controlhaus/jdbc"/>
+ <exec executable="svn" dir="${beehive.home}/controlhaus/jdbc">
+ <arg line="checkout http://svn.controlhaus.org/jdbc/trunk"/>
+ </exec>
+ </target>
+
+ <!-- JMS Control svn targets -->
+ <target name="jms.svn.update" if="jms.exists">
+ <exec executable="svn" dir="${beehive.home}/controlhaus/jms/trunk">
+ <arg line="update"/>
+ </exec>
+ </target>
+ <target name="jms.svn.checkout" unless="jms.exists">
+ <mkdir dir="${beehive.home}/controlhaus/jms"/>
+ <exec executable="svn" dir="${beehive.home}/controlhaus/jms">
+ <arg line="checkout http://svn.controlhaus.org/jms/trunk"/>
+ </exec>
+ </target>
+
+ <!-- Webservice Control svn targets -->
+ <target name="webservice.svn.update" if="webservice.exists">
+ <exec executable="svn"
dir="${beehive.home}/controlhaus/webservice/trunk">
+ <arg line="update"/>
+ </exec>
+ </target>
+ <target name="webservice.svn.checkout" unless="webservice.exists">
+ <mkdir dir="${beehive.home}/controlhaus/webservice"/>
+ <exec executable="svn" dir="${beehive.home}/controlhaus/webservice">
+ <arg line="checkout http://svn.controlhaus.org/webservice/trunk"/>
+ </exec>
+ </target>
+
<!-- target for buliding libraries. required property: lib.dir -->
<target name="build.lib">
