You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by br...@apache.org on 2005/05/20 21:19:52 UTC
svn commit: r171144 - in /incubator/beehive/trunk: ant/ controls/test/
samples/controls-blank/ samples/controls-db/
samples/controls-webservices-blank/ system-controls/samples/ejb/
system-controls/samples/webservice/amazon/
system-controls/samples/webservice/google/
system-controls/samples/webservice/wsm_samples_client/
system-controls/samples/webservice/xmlbeans/ system-controls/src/ejb/
system-controls/src/jdbc/ system-controls/src/jms/
system-controls/test/src/jdbc/controls/
system-controls/test/src/jdbc/junitTests/
system-controls/test/src/webservice/
Author: bryanche
Date: Fri May 20 12:19:50 2005
New Revision: 171144
URL: http://svn.apache.org/viewcvs?rev=171144&view=rev
Log:
Add control-jar taskdef to beehive-tools.xml and remove it from all the
other control build files. This will allow control developers to import
beehive-tools.xml rather than having to redefine this taskdef over and
over in their build files.
drt: pass
run.test.dist: pass
This addresses jira BEEHIVE-561
Modified:
incubator/beehive/trunk/ant/beehive-tools.xml
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/samples/controls-blank/build.xml
incubator/beehive/trunk/samples/controls-db/build-svn.xml
incubator/beehive/trunk/samples/controls-db/build.xml
incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml
incubator/beehive/trunk/samples/controls-webservices-blank/build.xml
incubator/beehive/trunk/system-controls/samples/ejb/build.xml
incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml
incubator/beehive/trunk/system-controls/samples/webservice/google/build.xml
incubator/beehive/trunk/system-controls/samples/webservice/wsm_samples_client/build.xml
incubator/beehive/trunk/system-controls/samples/webservice/xmlbeans/build.xml
incubator/beehive/trunk/system-controls/src/ejb/build.xml
incubator/beehive/trunk/system-controls/src/jdbc/build.xml
incubator/beehive/trunk/system-controls/src/jms/build.xml
incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml
incubator/beehive/trunk/system-controls/test/src/jdbc/junitTests/build.xml
incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
Modified: incubator/beehive/trunk/ant/beehive-tools.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/ant/beehive-tools.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/ant/beehive-tools.xml (original)
+++ incubator/beehive/trunk/ant/beehive-tools.xml Fri May 20 12:19:50 2005
@@ -158,6 +158,12 @@
</sequential>
</macrodef>
+
+ <!-- create a jar of a control -->
+ <taskdef name="control-jar"
+ classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
+ classpathref="controls.dependency.path" onerror="report" />
+
<target name="usage" description="Print the usage for this Ant build file.">
<echo>
The beehive-tools.xml file contains Ant macros which can be used
Modified: incubator/beehive/trunk/controls/test/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Fri May 20 12:19:50 2005
@@ -6,6 +6,7 @@
<import file="../../beehive-imports.xml"/>
<import file="../../ant/axis-import.xml"/>
+ <import file="../../ant/beehive-tools.xml"/>
<property file="${beehive.home}/controls/test/common/path.properties"/>
@@ -13,9 +14,6 @@
classpathref="controls.dependency.path" onerror="report" />
<taskdef name="assemble" classname="org.apache.beehive.controls.runtime.assembly.AssembleTask"
classpathref="controls.dependency.path" onerror="report" />
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path" onerror="report" />
<taskdef name="mantis"
classname="org.apache.beehive.test.tools.mantis.MantisTask"
classpathref="mantis.classpath"/>
Modified: incubator/beehive/trunk/samples/controls-blank/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-blank/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-blank/build.xml Fri May 20 12:19:50 2005
@@ -35,12 +35,6 @@
<path refid="controls.dependency.path"/>
</path>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- onerror="report">
- <classpath><path refid="controls.dependency.path"/></classpath>
- </taskdef>
-
<target name="clean" description="Delete all generated files">
<delete dir="${build.dir}"/>
<delete file="velocity.log"/>
Modified: incubator/beehive/trunk/samples/controls-db/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-db/build-svn.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-db/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/controls-db/build-svn.xml Fri May 20 12:19:50 2005
@@ -3,6 +3,7 @@
<project name="controls-db" default="usage" basedir=".">
<import file="../../beehive-imports.xml"/>
+ <import file="../../ant/beehive-tools.xml"/>
<property name="source.dir" value="${basedir}/src"/>
<property name="build.dir" value="${basedir}/build"/>
@@ -21,10 +22,6 @@
classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpathref="controls.dependency.path"
onerror="report" />
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path"
- onerror="report" />
<target name="usage">
<echo message=""/>
Modified: incubator/beehive/trunk/samples/controls-db/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-db/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-db/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-db/build.xml Fri May 20 12:19:50 2005
@@ -2,6 +2,8 @@
<project name="controls-db" default="usage" basedir=".">
+ <import file="${beehive.home}/ant/beehive-tools.xml"/>
+
<property environment="os"/>
<property name="source.dir" value="${basedir}/src"/>
@@ -26,10 +28,6 @@
classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpathref="controls.classpath"
onerror="report" />
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.classpath"
- onerror="report" />
<target name="usage">
<echo message=""/>
Modified: incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml Fri May 20 12:19:50 2005
@@ -79,12 +79,6 @@
<pathelement path="${junit.build.dir}" />
</path>
- <taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask" onerror="report">
- <classpath>
- <path refid="controls.dependency.path" />
- </classpath>
- </taskdef>
-
<target name="clean" description="Delete all generated files">
<delete dir="${build.dir}" />
<delete file="velocity.log" />
Modified: incubator/beehive/trunk/samples/controls-webservices-blank/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-webservices-blank/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-webservices-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-webservices-blank/build.xml Fri May 20 12:19:50 2005
@@ -60,12 +60,6 @@
<pathelement path="${junit.build.dir}" />
</path>
- <taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask" onerror="report">
- <classpath>
- <path refid="controls.dependency.path" />
- </classpath>
- </taskdef>
-
<target name="clean" description="Delete all generated files">
<delete dir="${build.dir}" />
<delete file="velocity.log" />
Modified: incubator/beehive/trunk/system-controls/samples/ejb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/ejb/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/ejb/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/ejb/build.xml Fri May 20 12:19:50 2005
@@ -28,12 +28,6 @@
classpathref="build.classpath"
onerror="report"/>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- onerror="report"
- classpathref="build.classpath"/>
-
-
<target name="clean" description="Deletes all generated files">
<delete dir="${sample.build.dir}"/>
<delete file="velocity.log"/>
Modified: incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml Fri May 20 12:19:50 2005
@@ -74,9 +74,6 @@
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpath="${controls.jar}" onerror="report"/>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpath="${controls.jar}" onerror="report"/>
<!-- XMLBean build -->
<taskdef name="xmlbeanbuild"
Modified: incubator/beehive/trunk/system-controls/samples/webservice/google/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/webservice/google/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/webservice/google/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/webservice/google/build.xml Fri May 20 12:19:50 2005
@@ -59,9 +59,6 @@
</path>
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask" classpath="${controls.jar}" onerror="report" />
- <taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask" classpath="${controls.jar}" onerror="report" />
-
-
<target name="clean" description="Deletes all generated files">
<delete dir="${build.dir}" />
Modified: incubator/beehive/trunk/system-controls/samples/webservice/wsm_samples_client/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/webservice/wsm_samples_client/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/webservice/wsm_samples_client/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/webservice/wsm_samples_client/build.xml Fri May 20 12:19:50 2005
@@ -61,9 +61,6 @@
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpathref="apt.task.classpath" onerror="report"/>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path" onerror="report"/>
<!-- XMLBean build -->
<taskdef name="xmlbeanbuild"
Modified: incubator/beehive/trunk/system-controls/samples/webservice/xmlbeans/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/webservice/xmlbeans/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/webservice/xmlbeans/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/webservice/xmlbeans/build.xml Fri May 20 12:19:50 2005
@@ -64,9 +64,6 @@
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpath="${controls.jar}" onerror="report"/>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpath="${controls.jar}" onerror="report"/>
<!-- XMLBean build -->
<taskdef name="xmlbeanbuild"
Modified: incubator/beehive/trunk/system-controls/src/ejb/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/ejb/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/ejb/build.xml (original)
+++ incubator/beehive/trunk/system-controls/src/ejb/build.xml Fri May 20 12:19:50 2005
@@ -16,11 +16,6 @@
<path refid="tools.dependency.path"/>
</path>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- onerror="report"
- classpathref="module.classpath"/>
-
<!-- =================================================================== -->
<!-- clean - cleans the EJB Control -->
<!-- =================================================================== -->
Modified: incubator/beehive/trunk/system-controls/src/jdbc/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/jdbc/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/jdbc/build.xml (original)
+++ incubator/beehive/trunk/system-controls/src/jdbc/build.xml Fri May 20 12:19:50 2005
@@ -5,10 +5,6 @@
<import file="../../systemcontrols-imports.xml"/>
<property environment="os"/>
- <!-- taskdefs -->
- <taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path" onerror="report"/>
-
<!-- build locations -->
<property name="module.name" value="jdbc-control"/>
<property name="module.dir" location="${src.dir}/jdbc"/>
Modified: incubator/beehive/trunk/system-controls/src/jms/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/src/jms/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/src/jms/build.xml (original)
+++ incubator/beehive/trunk/system-controls/src/jms/build.xml Fri May 20 12:19:50 2005
@@ -15,11 +15,6 @@
<path refid="xbean.dependency.path"/>
</path>
- <taskdef name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- onerror="report"
- classpathref="module.classpath"/>
-
<!-- =================================================================== -->
<!-- clean - cleans the Jdbc Control -->
<!-- =================================================================== -->
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/controls/build.xml Fri May 20 12:19:50 2005
@@ -6,9 +6,6 @@
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpathref="controls.dependency.path" onerror="report"/>
- <taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path" onerror="report"/>
-
<property name="module.name" value="controls"/>
<property name="module.dir" location="${test.src.dir}/jdbc/${module.name}"/>
<property name="module.classes.dir" location="${test.classes.dir}/${module.name}"/>
Modified: incubator/beehive/trunk/system-controls/test/src/jdbc/junitTests/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/jdbc/junitTests/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/jdbc/junitTests/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/jdbc/junitTests/build.xml Fri May 20 12:19:50 2005
@@ -6,9 +6,6 @@
<taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
classpathref="controls.dependency.path" onerror="report"/>
- <taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path" onerror="report"/>
-
<property name="module.name" value="junitTests"/>
<property name="module.dir" location="${test.src.dir}/jdbc/${module.name}"/>
<property name="module.gensrc.dir" location="${test.classes.dir}/${module.name}-generated-src"/>
Modified: incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/build.xml?rev=171144&r1=171143&r2=171144&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/build.xml Fri May 20 12:19:50 2005
@@ -86,12 +86,6 @@
classpathref="apt.task.classpath"
onerror="report"/>
- <taskdef
- name="control-jar"
- classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask"
- classpathref="controls.dependency.path"
- onerror="report"/>
-
<!-- ========================================= -->
<!-- drt -->
<!-- ========================================= -->
@@ -383,4 +377,4 @@
</xmlbeanbuild>
</target>
-</project>
\ No newline at end of file
+</project>