avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosim...@apache.org
Subject cvs commit: avalon-excalibur/monitor build.xml default.properties
Date Sun, 23 Mar 2003 12:11:52 GMT
leosimons    2003/03/23 04:11:52

  Modified:    .        depchecker.xml
               monitor  build.xml default.properties
  Added:       lib      commons-collections-2.1.jar
  Log:
  make montor test target work
  
  Revision  Changes    Path
  1.49      +12 -4     avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/depchecker.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- depchecker.xml	18 Mar 2003 17:28:01 -0000	1.48
  +++ depchecker.xml	23 Mar 2003 12:11:51 -0000	1.49
  @@ -312,6 +312,14 @@
           </ant>
       </target>
   
  +    <target name="checkCommonsCollections">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="proj.jar.name" value="commons-collections-2.1.jar"/>
  +            <property name="path" value="${commons-collections.jar}"/>
  +            <property name="proj.home" value="${basedir}/../lib"/>
  +        </ant>
  +    </target>
  +
       <target name="checkEvent">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
               <property name="proj.jar.name" value="excalibur-event.jar"/>
  @@ -346,13 +354,13 @@
       <target name="checkCompatibility">
         <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
           <property name="proj.jar.name" value="excalibur-compatibility-1.0.jar"/>
  -	<property name="path" value="${excalibur-compatibility.jar}"/>
  -	<property name="proj.home" value="${basedir}/../compatibility"/>
  +	    <property name="path" value="${excalibur-compatibility.jar}"/>
  +	    <property name="proj.home" value="${basedir}/../compatibility"/>
         </ant>
       </target>
       <target name="checkInstrument">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="proj.jar.name" value="excalibur-instrument-0.3.jar"/>
  +            <property name="proj.jar.name" value="excalibur-instrument-1.0.jar"/>
               <property name="path" value="${excalibur-instrument.jar}"/>
               <property name="proj.home" value="${basedir}/../instrument"/>
           </ant>
  
  
  
  1.1                  avalon-excalibur/lib/commons-collections-2.1.jar
  
  	<<Binary file>>
  
  
  1.27      +7 -3      avalon-excalibur/monitor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/monitor/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	20 Feb 2003 14:32:32 -0000	1.26
  +++ build.xml	23 Mar 2003 12:11:52 -0000	1.27
  @@ -31,6 +31,8 @@
       <path id="test.class.path">
           <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${commons-collections.jar}"/>
  +        <pathelement location="${excalibur-i18n.jar}"/>
           <pathelement location="${excalibur-testcase.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
  @@ -57,9 +59,11 @@
           <!-- Need the jar to prevent recursive deps. -->
   
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommonsCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkI18N"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCompatibility"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
       </target>
  @@ -351,10 +355,10 @@
           <fileset dir="${build.docs}">
             <include name="**"/>
           </fileset>
  -      </copy>    
  +      </copy>
   
       </target>
  -    
  +
       <target name="site" depends="docs" description=" Places Docs ready for hosting on
website">
   
         <mkdir dir="../site/dist/docs/${dir-name}"/>
  
  
  
  1.18      +17 -7     avalon-excalibur/monitor/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/monitor/default.properties,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- default.properties	7 Feb 2003 15:46:11 -0000	1.17
  +++ default.properties	23 Mar 2003 12:11:52 -0000	1.18
  @@ -45,9 +45,9 @@
   excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur Testcase, version 1.0 or later -----
  -excalibur-testcase.home=${basedir}/../testcase/dist
  -excalibur-testcase.lib=${excalibur-testcase.home}
  -excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
  +excalibur-testcase.home=${basedir}/../component
  +excalibur-testcase.lib=${excalibur-testcase.home}/build/lib
  +excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.1.jar
   
   # ----- Excalibur component, version 1.0 or later -----
   excalibur-component.home=${basedir}/../component/dist
  @@ -55,9 +55,9 @@
   excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
   
   # ----- Excalibur collections, version 1.0 or later -----
  -excalibur-collections.home=${basedir}/../collections/dist
  -excalibur-collections.lib=${excalibur-collections.home}
  -excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
  +excalibur-compatibility.home=${basedir}/../compatibility/dist
  +excalibur-compatibility.lib=${excalibur-compatibility.home}
  +excalibur-compatibility.jar=${excalibur-compatibility.lib}/excalibur-compatibility-1.0.jar
   
   # ----- Excalibur container, version 1.0 or later -----
   excalibur-container.home=${basedir}/../container/dist
  @@ -67,7 +67,17 @@
   # ----- Excalibur collections, version 1.0 or later -----
   excalibur-instrument.home=${basedir}/../instrument/dist
   excalibur-instrument.lib=${excalibur-instrument.home}
  -excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.3.jar
  +excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-1.0.jar
  +
  +# ----- Excalibur i18n -----
  +excalibur-i18n.home=${basedir}/../i18n/dist
  +excalibur-i18n.lib=${excalibur-i18n.home}
  +excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.jar
  +
  +# ----- Commons Collections -----
  +commons-collections.home=${basedir}/../lib
  +commons-collections.lib=${commons-collections.home}
  +commons-collections.jar=${commons-collections.lib}/commons-collections-2.1.jar
   
   
   # --------------------------------------------------
  
  
  

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


Mime
View raw message