avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/instrument ant.properties.sample build.xml default.properties
Date Tue, 06 Aug 2002 16:29:03 GMT
leif        2002/08/06 09:29:03

  Modified:    instrument ant.properties.sample build.xml
                        default.properties
  Log:
  Merge the ICM into the ECM.
  
  Revision  Changes    Path
  1.4       +13 -6     jakarta-avalon-excalibur/instrument/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	22 Apr 2002 03:45:49 -0000	1.3
  +++ ant.properties.sample	6 Aug 2002 16:29:02 -0000	1.4
  @@ -25,16 +25,23 @@
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
  +# ----- Avalon Framework, version 4.1 or later -----
  +avalon-framework.home=${basedir}/../../jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
  +# ----- Altrmi -----
  +excalibur-altrmi.home=${basedir}/../altrmi/dist
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
  +excalibur-altrmi-client-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-impl.jar
  +excalibur-altrmi-client-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-client-interfaces.jar
  +excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
  -
  -# ----- Avalon Framework, version 4.1 or later -----
  -avalon-framework.home=${basedir}/../../jakarta-avalon
  -avalon-framework.lib=${avalon-framework.home}/build/lib
  -avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- JUnit Unit Test Suite, version 3.7 or later. -----
   #  Not needed if junit.jar is in $ANT_HOME/lib 
  
  
  
  1.38      +0 -8      jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml	5 Aug 2002 07:33:41 -0000	1.37
  +++ build.xml	6 Aug 2002 16:29:02 -0000	1.38
  @@ -22,10 +22,6 @@
           <pathelement location="${excalibur-altrmi-client-impl.jar}"/>
           <pathelement location="${excalibur-altrmi-client-interfaces.jar}"/>
           <pathelement location="${excalibur-altrmi-generator.jar}"/>
  -        <pathelement location="${excalibur-collections.jar}"/>
  -        <pathelement location="${excalibur-component.jar}"/>
  -        <pathelement location="${excalibur-logger.jar}"/>
  -        <pathelement location="${excalibur-pool.jar}"/>
           <pathelement path="${java.class.path}"/>
       </path>
   
  @@ -66,10 +62,6 @@
       <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"/>
  -        <!-- Want this in here, but it causes a circular dependencies.  The workaround
now
  -             is to call this build twice from the main build file.
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
  -        -->
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmiServer"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmiCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkAltrmiClient"/>
  
  
  
  1.14      +0 -21     jakarta-avalon-excalibur/instrument/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/default.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- default.properties	3 Aug 2002 15:00:37 -0000	1.13
  +++ default.properties	6 Aug 2002 16:29:03 -0000	1.14
  @@ -28,27 +28,6 @@
   avalon-framework.lib=${avalon-framework.home}/build/lib
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
  -# ----- Logkit -----
  -logkit.home=${basedir}/../../jakarta-avalon-logkit
  -logkit.lib=${logkit.home}/build/lib
  -logkit.jar=${logkit.lib}/logkit.jar
  -
  -# ----- Excalibur Component -----
  -excalibur-component.home=${basedir}/../component/dist
  -excalibur-component.jar=${excalibur-component.home}/excalibur-component-1.0.jar
  -
  -# ----- Excalibur Logger -----
  -excalibur-logger.home=${basedir}/../logger/dist
  -excalibur-logger.jar=${excalibur-logger.home}/excalibur-logger-1.0.jar
  -
  -# ----- Excalibur Pool -----
  -excalibur-pool.home=${basedir}/../pool/dist
  -excalibur-pool.jar=${excalibur-pool.home}/excalibur-pool-1.0.jar
  -
  -# ----- Excalibur Collections -----
  -excalibur-collections.home=${basedir}/../collections/dist
  -excalibur-collections.jar=${excalibur-collections.home}/excalibur-collections-1.0.jar
  -
   # ----- Altrmi -----
   excalibur-altrmi.home=${basedir}/../altrmi/dist
   excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message