leif 2003/10/01 00:45:54
Modified: instrument-client build.xml default.properties
Log:
Update the location of the framework jar now that it have been split into api
and impl jars.
Revision Changes Path
1.43 +6 -3 avalon-excalibur/instrument-client/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-client/build.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build.xml 31 May 2003 15:48:19 -0000 1.42
+++ build.xml 1 Oct 2003 07:45:54 -0000 1.43
@@ -13,7 +13,8 @@
<!-- Classpath for product -->
<path id="project.class.path">
<pathelement location="${build.classes}"/>
- <pathelement location="${avalon-framework.jar}"/>
+ <pathelement location="${avalon-framework-api.jar}"/>
+ <pathelement location="${avalon-framework-impl.jar}"/>
<pathelement location="${altrmi-common.jar}"/>
<pathelement location="${altrmi-client-impl.jar}"/>
<pathelement location="${altrmi-client-interfaces.jar}"/>
@@ -38,7 +39,8 @@
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFrameworkAPI"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFrameworkImpl"/>
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrumentManagerInterfaces"/>
</target>
@@ -278,7 +280,8 @@
<copy file="${xalan.jar}" todir="${dist.lib.dir}"
preservelastmodified="yes"/>
<!-- Avalong Framework Jar -->
- <copy file="${avalon-framework.jar}" todir="${dist.lib.dir}"
preservelastmodified="yes"/>
+ <copy file="${avalon-framework-api.jar}" todir="${dist.lib.dir}"
preservelastmodified="yes"/>
+ <copy file="${avalon-framework-impl.jar}" todir="${dist.lib.dir}"
preservelastmodified="yes"/>
<!-- Instrument Manager Jars -->
<copy file="${excalibur-instrument-manager-interfaces.jar}"
todir="${dist.lib.dir}" preservelastmodified="yes"/>
1.22 +7 -20 avalon-excalibur/instrument-client/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-client/default.properties,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- default.properties 24 Jul 2003 16:14:49 -0000 1.21
+++ default.properties 1 Oct 2003 07:45:54 -0000 1.22
@@ -8,13 +8,18 @@
name=excalibur-instrument-client
Name=Excalibur Instrument Client
dir-name=instrument-client
-version=0.3
-package-version=0.3
+version=0.4
+package-version=0.4
year=2000-2002
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
+# ----- Avalon Framework, version 4.1 or later -----
+# ----- AltRMI -----
+# ----- Excalibur Instrument Manager -----
+# defined in ../libraries.properties
+
# ----- Xerces -----
xerces.jar=${basedir}/../lib/xerces-2.0.1.jar
@@ -23,24 +28,6 @@
# ----- Xalan -----
xalan.jar=${basedir}/../lib/xalan-2.3.1.jar
-
-# ----- Avalon Framework, version 4.1 or later -----
-avalon-framework.home=${basedir}/../../avalon
-avalon-framework.lib=${avalon-framework.home}/target/lib
-avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
-
-# ----- AltRMI -----
-altrmi.home=${basedir}/../lib
-altrmi.version=0.9.6
-altrmi-common.jar=${altrmi.home}/altrmi-common-${altrmi.version}.jar
-altrmi-client-impl.jar=${altrmi.home}/altrmi-client-impl-${altrmi.version}.jar
-altrmi-client-interfaces.jar=${altrmi.home}/altrmi-client-interfaces-${altrmi.version}.jar
-altrmi-server-interfaces.jar=${altrmi.home}/altrmi-server-interfaces-${altrmi.version}.jar
-altrmi-generator.jar=${altrmi.home}/altrmi-generator-${altrmi.version}.jar
-
-# ----- Excalibur instrument-manager -----
-excalibur-instrument-manager.home=${basedir}/../instrument-manager/dist
-excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-1.0.jar
# --------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
