hammant 02/05/18 03:52:17
Modified: db build.xml
demo build.xml
ftpserver build.xml
hsql build.xml
httpproxy build.xml
overlord build.xml
xcommander build.xml
Removed: db/lib avalon-framework.jar cornerstone.jar
excalibur-altrmi-client-impl.jar
excalibur-altrmi-client-interfaces.jar
excalibur-altrmi-common.jar
excalibur-altrmi-generator.jar
excalibur-altrmi-server-impl.jar
excalibur-altrmi-server-interfaces.jar
phoenix-client-20020226.jar
demo/lib avalon-framework.jar cornerstone.jar
excalibur-altrmi-client-impl.jar
excalibur-altrmi-client-interfaces.jar
excalibur-altrmi-common.jar
excalibur-altrmi-generator.jar
excalibur-altrmi-server-impl.jar
excalibur-altrmi-server-interfaces.jar
phoenix-client-20020226.jar
enterprise/tools/lib avalon-framework.jar phoenix-client.jar
xerces.jar
ftpserver/lib avalon-framework.jar cornerstone.jar
phoenix-client-20020226.jar
hsql/lib avalon-framework.jar cornerstone.jar
phoenix-client-20020226.jar
httpproxy/lib avalon-framework.jar cornerstone.jar
excalibur-i18n-1.0.jar phoenix-client-20020226.jar
mintc/lib avalon-framework.jar phoenix-client-20020226.jar
overlord/lib avalon-framework.jar cornerstone.jar
excalibur-i18n-1.0.jar phoenix-client-20020226.jar
xcommander/lib avalon-framework.jar cornerstone.jar
phoenix-client-20020226.jar
Log:
libs moved to common place.
Revision Changes Path
1.47 +13 -21 jakarta-avalon-apps/db/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.xml 3 Apr 2002 12:12:52 -0000 1.46
+++ build.xml 18 May 2002 10:52:14 -0000 1.47
@@ -50,6 +50,9 @@
<pathelement path="${java.class.path}" />
<pathelement location="xerces.jar2"/>
<pathelement path="${build.classes}" />
+ <fileset dir="../common/lib">
+ <include name="*.jar" />
+ </fileset>
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -57,9 +60,9 @@
<path id="test.path">
<pathelement path="${build.classes}" />
- <pathelement path="lib/excalibur-altrmi-common.jar" />
- <pathelement path="lib/excalibur-altrmi-client-interfaces.jar" />
- <pathelement path="lib/excalibur-altrmi-client-impl.jar" />
+ <pathelement path="../common/lib/excalibur-altrmi-common.jar" />
+ <pathelement path="../common/lib/excalibur-altrmi-client-interfaces.jar"
/>
+ <pathelement path="../common/lib/excalibur-altrmi-client-impl.jar" />
<pathelement path="build/genclasses" />
</path>
@@ -167,25 +170,14 @@
interfaces="org.apache.avalon.db.services.DatabaseManager"
classgendir="build/genclasses">
<classpath>
- <pathelement location="lib/excalibur-altrmi-client-interfaces.jar"/>
- <pathelement location="lib/excalibur-altrmi-client-impl.jar"/>
- <pathelement location="lib/excalibur-altrmi-common.jar"/>
- <pathelement location="lib/excalibur-altrmi-generator.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-interfaces.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-impl.jar"/>
+ <pathelement location="../common/lib/excalibur-altrmi-common.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-generator.jar"/>
<pathelement path="${build.classes}"/>
</classpath>
</altrmiproxies>
-
- <!--
-
- <classpath>
- <pathelement location="lib/excalibur-altrmi-common.jar"/>
- <pathelement location="lib/excalibur-altrmi-generator.jar"/>
- <pathelement path="build/classes"/>
- <pathelement path="${java.class.path}" />
- </classpath>
-
--->
-
+
<copy todir="${build.classes}">
<fileset dir="${java.dir}">
<exclude name="**/test/**"/>
@@ -260,13 +252,13 @@
<include name="jakarta-regexp.jar"/>
</lib>
- <lib dir="lib/" >
+ <lib dir="../common/lib/" >
<include name="excalibur-altrmi-server-*.jar"/>
<include name="excalibur-altrmi-common.jar"/>
<include name="excalibur-altrmi-generator.jar"/>
</lib>
- <lib dir="lib/" >
+ <lib dir="../common/lib" >
<include name="cornerstone.jar"/>
</lib>
1.51 +15 -15 jakarta-avalon-apps/demo/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/build.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- build.xml 13 Apr 2002 10:45:54 -0000 1.50
+++ build.xml 18 May 2002 10:52:14 -0000 1.51
@@ -46,10 +46,10 @@
<path id="project.class.path">
<pathelement path="${java.class.path}" />
- <pathelement location="../../jakarta-avalon/tools/lib/xerces.jar"/>
<pathelement path="${build.classes}" />
- <pathelement path="../../build/classes" />
-
+ <fileset dir="../common/lib">
+ <include name="*.jar" />
+ </fileset>
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -135,10 +135,10 @@
interfaces="org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer"
classgendir="build/genclasses">
<classpath>
- <pathelement location="lib/excalibur-altrmi-client-interfaces.jar"/>
- <pathelement location="lib/excalibur-altrmi-client-impl.jar"/>
- <pathelement location="lib/excalibur-altrmi-common.jar"/>
- <pathelement location="lib/excalibur-altrmi-generator.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-interfaces.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-impl.jar"/>
+ <pathelement location="../common/lib/excalibur-altrmi-common.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-generator.jar"/>
<pathelement path="${build.classes}"/>
</classpath>
</altrmiproxies>
@@ -189,9 +189,9 @@
</jar>
<mkdir dir="build/temp"/>
- <unzip src="lib/excalibur-altrmi-common.jar" dest="build/temp" />
- <unzip src="lib/excalibur-altrmi-client-interfaces.jar"
dest="build/temp" />
- <unzip src="lib/excalibur-altrmi-client-impl.jar" dest="build/temp" />
+ <unzip src="../common/lib/excalibur-altrmi-common.jar" dest="build/temp"
/>
+ <unzip src="../common/lib/excalibur-altrmi-client-interfaces.jar"
dest="build/temp" />
+ <unzip src="../common/lib/excalibur-altrmi-client-impl.jar"
dest="build/temp" />
<jar jarfile="${build.lib}/avalon-altrmidemo-tester.jar"
compress="false" manifest="${manifest.dir}/AltrmiHelloWorldTest.mf">
<fileset dir="build/genclasses">
@@ -226,7 +226,7 @@
<include name="demo-helloworld.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
@@ -254,7 +254,7 @@
<include name="demo-soaphelloworld.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
@@ -282,7 +282,7 @@
<include name="demo-rmihelloworld.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
@@ -302,11 +302,11 @@
<include name="demo-altrmihelloworld.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="excalibur-altrmi-common.jar"/>
<include name="excalibur-altrmi-server-interfaces.jar"/>
<include name="excalibur-altrmi-server-impl.jar"/>
1.32 +4 -1 jakarta-avalon-apps/ftpserver/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 17 Apr 2002 07:30:56 -0000 1.31
+++ build.xml 18 May 2002 10:52:14 -0000 1.32
@@ -87,6 +87,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}" />
<pathelement path="../../build/classes" />
+ <fileset dir="../common/lib">
+ <include name="*.jar" />
+ </fileset>
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -264,7 +267,7 @@
<include name="${jar.name}.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
1.17 +2 -2 jakarta-avalon-apps/hsql/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 13 May 2002 23:31:02 -0000 1.16
+++ build.xml 18 May 2002 10:52:14 -0000 1.17
@@ -50,7 +50,7 @@
<pathelement location="xerces.jar2"/>
<pathelement path="${build.classes}" />
- <fileset dir="lib">
+ <fileset dir="../common/lib">
<include name="*.jar" />
</fileset>
@@ -166,7 +166,7 @@
<include name="hsqldb.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
1.14 +4 -2 jakarta-avalon-apps/httpproxy/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/httpproxy/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 1 May 2002 02:31:44 -0000 1.13
+++ build.xml 18 May 2002 10:52:14 -0000 1.14
@@ -49,7 +49,9 @@
<pathelement path="${java.class.path}" />
<pathelement location="xerces.jar2"/>
<pathelement path="${build.classes}" />
-
+ <fileset dir="../common/lib">
+ <include name="*.jar" />
+ </fileset>
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -151,7 +153,7 @@
<include name="*.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
1.10 +4 -2 jakarta-avalon-apps/overlord/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 28 Mar 2002 11:48:06 -0000 1.9
+++ build.xml 18 May 2002 10:52:14 -0000 1.10
@@ -50,7 +50,9 @@
<pathelement location="xerces.jar2"/>
<pathelement path="${build.classes}" />
<pathelement path="../../build/classes" />
-
+ <fileset dir="../common/lib">
+ <include name="*.jar" />
+ </fileset>
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -153,7 +155,7 @@
<include name="*.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
1.9 +4 -2 jakarta-avalon-apps/xcommander/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 28 Mar 2002 11:48:38 -0000 1.8
+++ build.xml 18 May 2002 10:52:14 -0000 1.9
@@ -49,7 +49,9 @@
<pathelement path="${java.class.path}" />
<pathelement location="xerces.jar2"/>
<pathelement path="${build.classes}" />
-
+ <fileset dir="../common/lib">
+ <include name="*.jar" />
+ </fileset>
<fileset dir="lib">
<include name="*.jar" />
</fileset>
@@ -151,7 +153,7 @@
<include name="*.jar"/>
</lib>
- <lib dir="lib">
+ <lib dir="../common/lib">
<include name="cornerstone.jar"/>
</lib>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
