hlship 2004/08/10 07:25:26
Modified: examples/src/descriptor/META-INF panorama.mail.xml
panorama.discussions.xml
. status.xml
library build.xml
hivebuild dependency.xml jar-module.xml
dependency.properties
framework build.xml
examples build.xml
Log:
Improvements to HiveBuild to properly handle changing versions or useages of
artifacts.
Revision Changes Path
1.2 +12 -8
jakarta-hivemind/examples/src/descriptor/META-INF/panorama.mail.xml
Index: panorama.mail.xml
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/examples/src/descriptor/META-INF/panorama.mail.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panorama.mail.xml 3 Aug 2004 14:02:14 -0000 1.1
+++ panorama.mail.xml 10 Aug 2004 14:25:08 -0000 1.2
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,11 +15,15 @@
limitations under the License.
-->
-<module id="panorama.mail"
- version="1.0.0">Panorama Mail module -- demonstrates use of a
startup service.<contribution configuration-id="panorama.startup.Startup">
- <task executable="service:MailStartup"; id="mail" title="Mail"/>
- </contribution>
- <service-point id="MailStartup"
interface="com.panorama.startup.Executable">
- <create-instance class="com.panorama.mail.MailStartup"/>
- </service-point>
+<module id="panorama.mail" version="1.0.0">
+
+ Panorama Mail module -- demonstrates use of a startup service.
+
+ <contribution configuration-id="panorama.startup.Startup">
+ <task executable="service:MailStartup"; id="mail" title="Mail"/>
+ </contribution>
+
+ <service-point id="MailStartup"
interface="com.panorama.startup.Executable">
+ <create-instance class="com.panorama.mail.MailStartup"/>
+ </service-point>
</module>
1.2 +10 -7
jakarta-hivemind/examples/src/descriptor/META-INF/panorama.discussions.xml
Index: panorama.discussions.xml
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/examples/src/descriptor/META-INF/panorama.discussions.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- panorama.discussions.xml 3 Aug 2004 14:02:14 -0000 1.1
+++ panorama.discussions.xml 10 Aug 2004 14:25:08 -0000 1.2
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,10 +15,13 @@
limitations under the License.
-->
-<module id="panorama.discussions"
- version="1.0.0">Panorama Discussions module -- demonstrates the use
of a static method startup task.<contribution
configuration-id="panorama.startup.Startup">
- <static-task after="mail"
- class="com.panorama.discussions.DiscussionsStartup"
- id="discussions" title="Discussions"/>
- </contribution>
+<module id="panorama.discussions" version="1.0.0">
+
+ Panorama Discussions module -- demonstrates the use of a static method
startup task.
+
+ <contribution configuration-id="panorama.startup.Startup">
+ <static-task after="mail"
+ class="com.panorama.discussions.DiscussionsStartup"
+ id="discussions" title="Discussions"/>
+ </contribution>
</module>
1.42 +3 -0 jakarta-hivemind/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/status.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- status.xml 10 Aug 2004 13:19:47 -0000 1.41
+++ status.xml 10 Aug 2004 14:25:08 -0000 1.42
@@ -50,6 +50,9 @@
<action type="fix" dev="HLS" fixes-bug="HIVEMIND-29" due-to="Michael
Frericks">
SmartTranslator should differentiate between blank strings and null
input
</action>
+ <action type="update" dev="HLS">
+ Improvements to HiveBuild to properly handle changing versions or
useages of artifacts.
+ </action>
</release>
<release version="1.0-beta-2" date="Aug 1 2004">
1.11 +10 -10 jakarta-hivemind/library/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/library/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 1 Aug 2004 17:40:36 -0000 1.10
+++ build.xml 10 Aug 2004 14:25:11 -0000 1.11
@@ -28,23 +28,23 @@
<!-- Not compiled with compatibility to JDK 1.3
- <ibiblio-dependency jar="geronimo-spec-ejb-1.0-M1.jar"
group-id="geronimo-spec"/ -->
+ <ibiblio-dependency artfiact="geronimo-spec-ejb"
version="1.0-M1" group="geronimo-spec"/ -->
<!-- Dammit, just need access to javax.ejb -->
- <ibiblio-dependency jar="jboss-j2ee-3.2.1.jar" group-id="jboss"/>
+ <ibiblio-dependency artifact="jboss-j2ee" version="3.2.1" group="jboss"/>
- <ibiblio-dependency jar="spring-full-1.0.1.jar"
group-id="springframework"/>
- <ibiblio-dependency jar="commons-logging-1.0.3.jar"
group-id="commons-logging"/>
+ <ibiblio-dependency artifact="spring-full" version="1.0.1"
group="springframework"/>
+ <ibiblio-dependency artifact="commons-logging" version="1.0.3"
group="commons-logging"/>
- <ibiblio-dependency jar="log4j-1.2.7.jar" group-id="log4j"
use="test"/>
- <ibiblio-dependency jar="javassist-2.6.jar" group-id="jboss"
use="test"/>
- <ibiblio-dependency jar="servletapi-2.3.jar"
group-id="servletapi" use="test"/>
- <ibiblio-dependency jar="oro-2.0.6.jar" group-id="oro"
use="test"/>
- <ibiblio-dependency jar="easymock-1.1.jar" group-id="easymock"
use="test"/>
+ <ibiblio-dependency artifact="log4j" version="1.2.7"
group="log4j" use="test"/>
+ <ibiblio-dependency artifact="javassist" version="2.6"
group="jboss" use="test"/>
+ <ibiblio-dependency artifact="servletapi" version="2.3"
group="servletapi" use="test"/>
+ <ibiblio-dependency artifact="oro" version="2.0.6" group="oro"
use="test"/>
+ <ibiblio-dependency artifact="easymock" version="1.1"
group="easymock" use="test"/>
- <project-dependency name="hivemind"/>
+ <project-dependency artifact="hivemind"/>
<default-compile/>
</target>
1.5 +41 -23 jakarta-hivemind/hivebuild/dependency.xml
Index: dependency.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dependency.xml 4 Aug 2004 15:27:24 -0000 1.4
+++ dependency.xml 10 Aug 2004 14:25:16 -0000 1.5
@@ -68,37 +68,55 @@
</target>
- <macrodef name="safe-copy">
- <attribute name="file" description="File to copy."/>
- <attribute name="dir" description="Directory to copy to."/>
-
- <sequential>
- <mkdir dir="@{dir}"/>
- <copy file="@{file}" todir="@{dir}"/>
- </sequential>
- </macrodef>
+ <macrodef name="module-lib-copy">
+ <attribute name="fromdir" description="Source directory to copy from."/>
+ <attribute name="artifact" description="Name of artifact JAR to copy."/>
+ <attribute name="version" description="Version of artifact JAR to
copy."/>
+ <attribute name="use" description="Subdirectory to copy to."/>
+
+ <sequential>
+ <mkdir dir="${module.lib.dir}/@{use}"/>
+ <copy file="@{fromdir}/@[EMAIL PROTECTED]"
todir="${module.lib.dir}/@{use}"/>
+
+ <!-- Delete versions in the wrong directory, or out of date versions.
-->
+
+ <delete>
+ <fileset dir="${module.lib.dir}">
+ <exclude name="@{use}/@[EMAIL PROTECTED]"/>
+ <include name="**/@{artifact}-*.jar"/>
+ </fileset>
+ </delete>
+
+ </sequential>
+ </macrodef>
+
<!-- macro for downloading a JAR from maven's repository on ibiblio. -->
<macrodef name="ibiblio-dependency">
- <attribute name="jar" description="The name of the JAR to
download."/>
- <attribute name="group-id" description="The Maven group-id
containing the JAR."/>
- <attribute name="use" default="compile" description="Useage of
the dependency: compile, test or run."/>
+ <attribute name="artifact" description="The name of the JAR
artfiact to download."/>
+ <attribute name="version" description="The version number of the
artifact to download."/>
+ <attribute name="group" description="The Maven group-id
containing the JAR."/>
+ <attribute name="use" default="compile" description="Useage of
the dependency: compile, test or run. Subdirectory to place the artiface in."/>
<sequential>
<mkdir dir="${external.lib.dir}"/>
<antcall target="-display-download-warning"/>
+
+ <property name="jar" value=""/>
<grab-file
- dest="${external.lib.dir}/@{jar}"
-
src="${maven.ibiblio.url}/@{group-id}/jars/@{jar}"
-
md5="${maven.ibiblio.url}/@{group-id}/jars/@{jar}.md5"
+ dest="${external.lib.dir}/@[EMAIL PROTECTED]"
+ src="${maven.ibiblio.url}/@{group}/jars/@[EMAIL
PROTECTED]"
+ md5="${maven.ibiblio.url}/@{group}/jars/@[EMAIL
PROTECTED]"
/>
- <safe-copy
- file="${external.lib.dir}/@{jar}"
- dir="${module.lib.dir}/@{use}"/>
+ <module-lib-copy
+ fromdir="${external.lib.dir}"
+ artifact="@{artifact}"
+ version="@{version}"
+ use="@{use}"/>
</sequential>
</macrodef>
@@ -134,15 +152,15 @@
with the project's version. -->
<macrodef name="project-dependency">
- <attribute name="name" description="The name of the dependency
(the part before the version number)."/>
+ <attribute name="artifact" description="The name of the
dependency (the part before the version number)."/>
<attribute name="version" default="${project.version}"
description="The version number."/>
- <attribute name="extension" default="jar" description="The
extension to use; default is 'jar'."/>
<attribute name="use" default="compile" description="Useage of
the dependency: compile, test or run."/>
<sequential>
- <safe-copy
- file="${project.target.dir}/@[EMAIL
PROTECTED]@{extension}"
- dir="${module.lib.dir}/@{use}"/>
+ <module-lib-copy fromdir="${project.target.dir}"
+ artifact="@{artifact}"
+ version="@{version}"
+ use="@{use}"/>
</sequential>
</macrodef>
1.6 +1 -1 jakarta-hivemind/hivebuild/jar-module.xml
Index: jar-module.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jar-module.xml 29 Jul 2004 13:18:26 -0000 1.5
+++ jar-module.xml 10 Aug 2004 14:25:16 -0000 1.6
@@ -141,7 +141,7 @@
description="Reference to a path used to compile unit
tests."/>
<sequential>
- <ibiblio-dependency jar="junit-3.8.1.jar" group-id="junit" use="test"/>
+ <ibiblio-dependency artifact="junit" version="3.8.1" group="junit"
use="test"/>
<mkdir dir="${test.classes.dir}"/>
1.3 +1 -1 jakarta-hivemind/hivebuild/dependency.properties
Index: dependency.properties
===================================================================
RCS file: /home/cvs/jakarta-hivemind/hivebuild/dependency.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dependency.properties 4 Aug 2004 15:27:24 -0000 1.2
+++ dependency.properties 10 Aug 2004 14:25:16 -0000 1.3
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hivebuild.src.dir=${hivebuild.dir}/src
+hivebuild.src.dir=${hivebuild.dir}/src/java
hivebuild.classes.dir=${hivebuild.dir}/target/classes
1.12 +7 -8 jakarta-hivemind/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 3 Aug 2004 14:02:17 -0000 1.11
+++ build.xml 10 Aug 2004 14:25:16 -0000 1.12
@@ -23,14 +23,13 @@
<import file="${hivebuild.dir}/clover-report.xml"/>
<target name="compile">
- <ibiblio-dependency jar="commons-logging-1.0.3.jar"
- group-id="commons-logging"/>
- <ibiblio-dependency jar="javassist-2.6.jar" group-id="jboss"/>
- <ibiblio-dependency jar="servletapi-2.3.jar"
group-id="servletapi"/>
- <ibiblio-dependency jar="oro-2.0.6.jar" group-id="oro"/>
- <ibiblio-dependency jar="log4j-1.2.7.jar" group-id="log4j"/>
- <ibiblio-dependency jar="easymock-1.1.jar" group-id="easymock"/>
- <ibiblio-dependency jar="junit-3.8.1.jar" group-id="junit"/>
+ <ibiblio-dependency artifact="commons-logging" version="1.0.3"
group="commons-logging"/>
+ <ibiblio-dependency artifact="javassist" version="2.6"
group="jboss"/>
+ <ibiblio-dependency artifact="servletapi" version="2.3"
group="servletapi"/>
+ <ibiblio-dependency artifact="oro" version="2.0.6" group="oro"/>
+ <ibiblio-dependency artifact="log4j" version="1.2.7"
group="log4j"/>
+ <ibiblio-dependency artifact="easymock" version="1.1"
group="easymock"/>
+ <ibiblio-dependency artifact="junit" version="3.8.1"
group="junit"/>
<default-compile/>
</target>
1.7 +15 -8 jakarta-hivemind/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/examples/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 9 Aug 2004 01:10:37 -0000 1.6
+++ build.xml 10 Aug 2004 14:25:21 -0000 1.7
@@ -28,6 +28,7 @@
<fileset dir="${module.lib.dir}" includes="**/*.jar"/>
<pathelement location="${conf.src.dir}"/>
</path>
+
<path id="hivedoc.classpath">
<path refid="hivedoc.taskdef.classpath"/>
<fileset dir="${descriptor.src.dir}/META-INF">
@@ -35,6 +36,7 @@
<include name="examples.xml"/>
</fileset>
</path>
+
<path id="runtime.classpath">
<fileset dir="${module.lib.dir}">
<include name="compile/*.jar"/>
@@ -49,19 +51,24 @@
<fileset dir="${ant.home}/lib" includes="*.jar"/>
</path>
+
<property name="hivedoc.output.dir"
location="${module.docs.target.dir}/hivedocs"/>
<import file="${hivebuild.dir}/hivedoc-report.xml"/>
+
<target name="compile">
- <ibiblio-dependency jar="geronimo-spec-ejb-1.0-M1.jar"
group-id="geronimo-spec"/>
- <ibiblio-dependency jar="spring-full-1.0.1.jar"
group-id="springframework"/>
- <ibiblio-dependency jar="commons-logging-1.0.3.jar"
group-id="commons-logging"/>
- <ibiblio-dependency jar="log4j-1.2.7.jar" group-id="log4j" use="run"/>
- <ibiblio-dependency jar="javassist-2.6.jar" group-id="jboss" use="run"/>
- <ibiblio-dependency jar="oro-2.0.6.jar" group-id="oro" use="run"/>
- <ibiblio-dependency jar="easymock-1.1.jar" group-id="easymock"
use="test"/>
- <project-dependency name="hivemind"/>
+ <ibiblio-dependency artifact="geronimo-spec-ejb" version="1.0-M1"
group="geronimo-spec"/>
+ <ibiblio-dependency artifact="spring-full" version="1.0.1"
group="springframework"/>
+ <ibiblio-dependency artifact="commons-logging" version="1.0.3"
group="commons-logging"/>
+ <ibiblio-dependency artifact="log4j" version="1.2.7" group="log4j"
use="run"/>
+ <ibiblio-dependency artifact="javassist" version="2.6" group="jboss"
use="run"/>
+ <ibiblio-dependency artifact="oro" version="2.0.6" group="oro"
use="run"/>
+ <ibiblio-dependency artifact="easymock" version="1.1" group="easymock"
use="test"/>
+
+ <project-dependency artifact="hivemind"/>
+
<default-compile/>
</target>
+
<target name="run-reports">
<javadoc-report/>
<hivedoc-report doc-path-id="hivedoc.classpath"
taskdef-path-id="hivedoc.taskdef.classpath"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
