leif 2003/02/17 18:51:07
Modified: fortress build.xml default.properties
instrument-client default.properties
instrument-manager default.properties
Log:
Fix the fortress build to reflect the relocation of Altrmi
Reduced the number of duplicate jars stores in the repository.
Revision Changes Path
1.73 +11 -11 avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- build.xml 7 Feb 2003 16:38:19 -0000 1.72
+++ build.xml 18 Feb 2003 02:51:06 -0000 1.73
@@ -43,11 +43,11 @@
<pathelement location="${build.testclasses}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${util.concurrent.jar}"/>
- <pathelement location="${excalibur-altrmi-common.jar}"/>
- <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
- <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
- <pathelement location="${excalibur-altrmi-client-impl.jar}"/>
- <pathelement location="${excalibur-altrmi-client-interfaces.jar}"/>
+ <pathelement location="${altrmi-common.jar}"/>
+ <pathelement location="${altrmi-server-impl.jar}"/>
+ <pathelement location="${altrmi-server-interfaces.jar}"/>
+ <pathelement location="${altrmi-client-impl.jar}"/>
+ <pathelement location="${altrmi-client-interfaces.jar}"/>
<pathelement location="${excalibur-testcase.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
@@ -71,12 +71,12 @@
</target>
<target name="big-jar" depends="jar,copy-optional-libs" description="Build the
big jar with all dependencies included">
- <copy file="${excalibur-altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-altrmi-common.jar}" todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-altrmi-server-impl.jar}"
todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-altrmi-server-interfaces.jar}"
todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-altrmi-client-impl.jar}"
todir="${build.dir}/tempjars"/>
- <copy file="${excalibur-altrmi-client-interfaces.jar}"
todir="${build.dir}/tempjars"/>
+ <copy file="${altrmi-registry.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${altrmi-common.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${altrmi-server-impl.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${altrmi-server-interfaces.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${altrmi-client-impl.jar}" todir="${build.dir}/tempjars"/>
+ <copy file="${altrmi-client-interfaces.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-i18n.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-instrument.jar}" todir="${build.dir}/tempjars"/>
<copy file="${excalibur-instrument-manager.jar}"
todir="${build.dir}/tempjars"/>
1.62 +8 -8 avalon-excalibur/fortress/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/fortress/default.properties,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- default.properties 18 Feb 2003 02:29:00 -0000 1.61
+++ default.properties 18 Feb 2003 02:51:06 -0000 1.62
@@ -70,14 +70,14 @@
excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.1.jar
# ----- AltRMI -----
-excalibur-altrmi.home=${basedir}/../altrmi/dist
-excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common-0.9.jar
-excalibur-altrmi-registry.jar=${excalibur-altrmi.home}/excalibur-altrmi-registry-0.9.jar
-excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl-0.9.jar
-excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces-0.9.jar
-excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl-0.9.jar
-excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces-0.9.jar
-excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator-0.9.jar
+altrmi.home=${basedir}/../lib
+altrmi-common.jar=${altrmi.home}/altrmi-common-0.9.1.jar
+altrmi-registry.jar=${altrmi.home}/altrmi-registry-0.9.1.jar
+altrmi-server-impl.jar=${altrmi.home}/altrmi-server-impl-0.9.1.jar
+altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-0.9.1.jar
+altrmi-client-impl.jar=${altrmi.home}/altrmi-client-impl-0.9.1.jar
+altrmi-client-interfaces.jar=${altrmi.home}/altrmi-client-interfaces-0.9.1.jar
+altrmi-generator.jar=${altrmi.home}/altrmi-generator-0.9.1.jar
# ----- Avalon Framework, version 4.1 or later -----
avalon-framework.home=${basedir}/../../avalon
1.17 +6 -6 avalon-excalibur/instrument-client/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-client/default.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- default.properties 17 Feb 2003 21:25:44 -0000 1.16
+++ default.properties 18 Feb 2003 02:51:07 -0000 1.17
@@ -30,12 +30,12 @@
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
# ----- AltRMI -----
-altrmi.home=${basedir}
-altrmi-common.jar=${altrmi.home}/lib/altrmi-common-0.9.1.jar
-altrmi-client-impl.jar=${altrmi.home}/lib/altrmi-client-impl-0.9.1.jar
-altrmi-client-interfaces.jar=${altrmi.home}/lib/altrmi-client-interfaces-0.9.1.jar
-altrmi-server-interfaces.jar=${altrmi.home}/lib/altrmi-server-interfaces-0.9.1.jar
-altrmi-generator.jar=${altrmi.home}/lib/altrmi-generator-0.9.1.jar
+altrmi.home=${basedir}/../lib
+altrmi-common.jar=${altrmi.home}/altrmi-common-0.9.1.jar
+altrmi-client-impl.jar=${altrmi.home}/altrmi-client-impl-0.9.1.jar
+altrmi-client-interfaces.jar=${altrmi.home}/altrmi-client-interfaces-0.9.1.jar
+altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-0.9.1.jar
+altrmi-generator.jar=${altrmi.home}/altrmi-generator-0.9.1.jar
# ----- Excalibur instrument-manager -----
excalibur-instrument-manager.home=${basedir}/../instrument-manager/dist
1.15 +4 -4 avalon-excalibur/instrument-manager/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/default.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- default.properties 17 Feb 2003 21:23:09 -0000 1.14
+++ default.properties 18 Feb 2003 02:51:07 -0000 1.15
@@ -22,10 +22,10 @@
avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
# ----- AltRMI -----
-altrmi.home=${basedir}
-altrmi-common.jar=${altrmi.home}/lib/altrmi-common-0.9.1.jar
-altrmi-server-impl.jar=${altrmi.home}/lib/altrmi-server-impl-0.9.1.jar
-altrmi-server-interfaces.jar=${altrmi.home}/lib/altrmi-server-interfaces-0.9.1.jar
+altrmi.home=${basedir}/../lib
+altrmi-common.jar=${altrmi.home}/altrmi-common-0.9.1.jar
+altrmi-server-impl.jar=${altrmi.home}/altrmi-server-impl-0.9.1.jar
+altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-0.9.1.jar
# ----- Excalibur Instrument -----
excalibur-instrument.home=${basedir}/../instrument/dist
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
