avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-excalibur/xmlutil build.xml default.properties
Date Tue, 18 Mar 2003 17:28:03 GMT
bloritsch    2003/03/18 09:28:03

  Modified:    .        build.xml depchecker.xml
               fortress build.xml default.properties
               xmlutil  build.xml default.properties
  Log:
  make changes so that several components build the distributions
  
  Revision  Changes    Path
  1.204     +1 -8      avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/build.xml,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- build.xml	11 Mar 2003 14:32:41 -0000	1.203
  +++ build.xml	18 Mar 2003 17:28:01 -0000	1.204
  @@ -26,11 +26,6 @@
       <!--  within Excalibur should be listed in the depends list.      -->
       <!--  Do not include test dependent jars in the depends list.     -->
   
  -    <!-- Cache -->
  -    <target name="prj-cache">
  -        <ant dir="cache" target="${subproject-target}"/>
  -    </target>
  -
       <!-- Cli -->
       <target name="prj-compatibility">
         <ant dir="compatibility" target="${subproject-target}"/>
  @@ -154,7 +149,7 @@
           depends="prj-compatibility, prj-loader,
                   prj-naming, prj-threadcontext, 
   		prj-i18n, prj-extension,
  -                prj-cache, prj-configuration, prj-event,
  +                prj-configuration, prj-event,
                   prj-thread, prj-monitor, prj-fortress, prj-datasource,
                   prj-instrument, prj-store, prj-logger, prj-policy,
                   prj-pool, prj-xmlutil, prj-lifecycle,
  @@ -187,8 +182,6 @@
               <pathelement location="instrument/src/test"/>
   	    <pathelement location="compatibility/src/java"/>
   	    <pathelement location="compatibility/src/test"/>
  -            <pathelement location="cache/src/java"/>
  -            <pathelement location="cache/src/test"/>
               <pathelement location="extension/src/java"/>
               <pathelement location="extension/src/test"/>
               <pathelement location="i18n/src/java"/>
  
  
  
  1.48      +1 -8      avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/depchecker.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- depchecker.xml	11 Mar 2003 15:15:22 -0000	1.47
  +++ depchecker.xml	18 Mar 2003 17:28:01 -0000	1.48
  @@ -372,13 +372,6 @@
           </ant>
       </target>
       <target name="checkCollections" depends="checkCompatibility"/>
  -    <target name="checkCache">
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="proj.jar.name" value="excalibur-cache.jar"/>
  -            <property name="path" value="${excalibur-cache.jar}"/>
  -            <property name="proj.home" value="${basedir}/../cache"/>
  -        </ant>
  -    </target>
       <target name="checkComponent">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
               <property name="proj.jar.name" value="excalibur-component.jar"/>
  
  
  
  1.80      +0 -2      avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- build.xml	18 Mar 2003 17:16:30 -0000	1.79
  +++ build.xml	18 Mar 2003 17:28:02 -0000	1.80
  @@ -53,7 +53,6 @@
           <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <pathelement location="${excalibur-datasource.jar}"/>
  -        <pathelement location="${excalibur-cache.jar}"/>
           <pathelement location="${excalibur-monitor.jar}"/>
           <pathelement location="${excalibur-xmlutil.jar}"/>
           <pathelement location="${excalibur-scratchpad.jar}"/>
  @@ -132,7 +131,6 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkDatasource"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCache"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkMonitor"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkXMLUtil"/>
        </target>
  
  
  
  1.70      +0 -5      avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- default.properties	18 Mar 2003 17:16:30 -0000	1.69
  +++ default.properties	18 Mar 2003 17:28:02 -0000	1.70
  @@ -109,11 +109,6 @@
   excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.jar
   excalibur-testcase.jar=${excalibur-component.lib}/excalibur-testcase-1.1.jar
   
  -# ----- Excalibur cache, version 1.0 or later -----
  -excalibur-cache.home=${basedir}/../cache/dist
  -excalibur-cache.lib=${excalibur-cache.home}
  -excalibur-cache.jar=${excalibur-cache.lib}/excalibur-cache-1.0a.jar
  -
   
   # ----- Excalibur Monitor, version 1.0 or later -----
   excalibur-monitor.home=${basedir}/../monitor/dist
  
  
  
  1.35      +0 -2      avalon-excalibur/xmlutil/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	29 Jan 2003 14:07:43 -0000	1.34
  +++ build.xml	18 Mar 2003 17:28:02 -0000	1.35
  @@ -17,7 +17,6 @@
           <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
           <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
  -        <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-sourceresolve.jar}"/>
  @@ -69,7 +68,6 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkSourceResolve"/>
  
  
  
  1.26      +1 -10     avalon-excalibur/xmlutil/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/xmlutil/default.properties,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- default.properties	6 Mar 2003 13:13:44 -0000	1.25
  +++ default.properties	18 Mar 2003 17:28:03 -0000	1.26
  @@ -34,21 +34,12 @@
   excalibur-component.home=${basedir}/../component/dist
   excalibur-component.lib=${excalibur-component.home}
   excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.1.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.jar=${excalibur-component.lib}/excalibur-testcase-1.1.jar
   
   # ----- Excalibur i18n, version 1.0 or later -----
   excalibur-i18n.home=${basedir}/../i18n/dist
   excalibur-i18n.lib=${excalibur-i18n.home}
   excalibur-i18n.jar=${excalibur-i18n.lib}/excalibur-i18n-1.0.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 instrument, version 1.0 or later -----
   excalibur-instrument.home=${basedir}/../instrument/dist
  
  
  

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


Mime
View raw message