rubys       01/08/12 16:42:30

  Modified:    proposal/gump/project jakarta-avalon-cornerstone.xml
                        jakarta-avalon-excalibur.xml
                        jakarta-avalon-logkit.xml
                        jakarta-avalon-phoenix.xml jakarta-avalon.xml
                        jakarta-velocity.xml xml-cocoon2.xml
  Log:
  More simplification/cleanup: eliminating unnecessary id's,
  <property reference="jarpath"> => <depend>
  
  Revision  Changes    Path
  1.14      +10 -18    
jakarta-alexandria/proposal/gump/project/jakarta-avalon-cornerstone.xml
  
  Index: jakarta-avalon-cornerstone.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-cornerstone.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jakarta-avalon-cornerstone.xml    2001/07/20 01:19:33     1.13
  +++ jakarta-avalon-cornerstone.xml    2001/08/12 23:42:30     1.14
  @@ -8,27 +8,19 @@
     <cvs repository="jakarta"/>
   
     <ant target="dist">
  -    <property name="xerces.jar"
  -       reference="jarpath" id="parser" project="xml-xerces"/>
  -    <property name="logkit.jar"
  -       reference="jarpath" id="logkit" project="jakarta-avalon-logkit"/>
  -    <property name="avalon-framework.jar"
  -       reference="jarpath" id="avalon-framework" project="jakarta-avalon"/>
  -    <property name="avalon-excalibur.jar"
  -       reference="jarpath" id="avalon-excalibur" project="jakarta-avalon"/>
  -    <property name="avalon-scratchpad.jar"
  -       reference="jarpath" id="avalon-scratchpad" project="jakarta-avalon"/>
  -    <property name="phoenix-client.jar"
  -       reference="jarpath" id="client" project="jakarta-avalon-phoenix"/>
  +    <depend property="xerces.jar"           project="xml-xerces"/>
  +    <depend property="logkit.jar"           project="jakarta-avalon-logkit"/>
  +    <depend property="avalon-framework.jar" project="jakarta-avalon"/>
  +    <depend property="phoenix-client.jar"   project="jakarta-avalon-phoenix"/>
  +    <depend property="testlet.jar"          project="jakarta-avalon-testlet"/>
  +
  +    <depend property="avalon-excalibur.jar" 
  +      project="jakarta-avalon-excalibur" id="avalon-excalibur"/>
  +    <depend property="avalon-scratchpad.jar" 
  +      project="jakarta-avalon-excalibur" id="avalon-scratchpad"/>
     </ant>
   
     <depend project="jakarta-ant"/>
  -  <depend project="xml-xerces"/>
  -  <depend project="jakarta-avalon"/>
  -  <depend project="jakarta-avalon-excalibur"/>
  -  <depend project="jakarta-avalon-logkit"/>
  -  <depend project="jakarta-avalon-testlet"/>
  -  <depend project="jakarta-avalon-phoenix"/>
     <option project="jsse"/>
     <depend project="xml-stylebook2"/>
     <depend project="xml-xalan2"/>
  
  
  
  1.10      +4 -10     
jakarta-alexandria/proposal/gump/project/jakarta-avalon-excalibur.xml
  
  Index: jakarta-avalon-excalibur.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-excalibur.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jakarta-avalon-excalibur.xml      2001/08/03 11:00:43     1.9
  +++ jakarta-avalon-excalibur.xml      2001/08/12 23:42:30     1.10
  @@ -8,19 +8,13 @@
     <cvs repository="jakarta"/>
   
     <ant target="dist">
  -    <property name="xerces.jar"
  -       reference="jarpath" id="parser" project="xml-xerces"/>
  -    <property name="logkit.jar"
  -       reference="jarpath" id="logkit" project="jakarta-avalon-logkit"/>
  -    <property name="framework.jar"
  -       reference="jarpath" id="avalon-framework" project="jakarta-avalon"/>
  +    <depend property="xerces.jar"    project="xml-xerces"/>
  +    <depend property="framework.jar" project="jakarta-avalon"/>
  +    <depend property="logkit.jar"    project="jakarta-avalon-logkit"/>
  +    <depend property="testlet.jar"   project="jakarta-avalon-testlet"/>
     </ant>
   
     <depend project="jakarta-ant"/>
  -  <depend project="xml-xerces"/>
  -  <depend project="jakarta-avalon"/>
  -  <depend project="jakarta-avalon-logkit"/>
  -  <depend project="jakarta-avalon-testlet"/>
     <depend project="xml-xalan2"/>
     <depend project="kawa"/>
     <option project="jdbc"/>
  
  
  
  1.16      +2 -2      
jakarta-alexandria/proposal/gump/project/jakarta-avalon-logkit.xml
  
  Index: jakarta-avalon-logkit.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-logkit.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jakarta-avalon-logkit.xml 2001/07/28 00:20:39     1.15
  +++ jakarta-avalon-logkit.xml 2001/08/12 23:42:30     1.16
  @@ -15,7 +15,7 @@
     <option project="jakarta-servletapi-4"/>
   
     <home nested="build/lib"/>
  -  <jar name="logkit.jar" id="logkit"/>
  +  <jar name="logkit.jar"/>
   
     <project name="dist-avalon-logkit">
       <ant target="jar"/>
  @@ -29,6 +29,6 @@
       <depend project="xml-xalan2"/>
   
       <home nested="build/lib"/>
  -    <jar name="logkit.jar" id="logkit"/>
  +    <jar name="logkit.jar"/>
     </project>
   </project>
  
  
  
  1.14      +9 -15     
jakarta-alexandria/proposal/gump/project/jakarta-avalon-phoenix.xml
  
  Index: jakarta-avalon-phoenix.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon-phoenix.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jakarta-avalon-phoenix.xml        2001/07/20 01:19:33     1.13
  +++ jakarta-avalon-phoenix.xml        2001/08/12 23:42:30     1.14
  @@ -8,28 +8,22 @@
     <cvs repository="jakarta"/>
   
     <ant target="dist">
  -    <property name="logkit.jar"
  -       reference="jarpath" id="logkit" project="jakarta-avalon-logkit"/>
  -    <property name="avalon-framework.jar"
  -       reference="jarpath" id="avalon-framework" project="jakarta-avalon"/>
  -    <property name="avalon-excalibur.jar"
  -       reference="jarpath" id="avalon-excalibur" project="jakarta-avalon"/>
  -    <property name="avalon-scratchpad.jar"
  -       reference="jarpath" id="avalon-scratchpad" project="jakarta-avalon"/>
  -    <property name="xerces.jar"
  -       reference="jarpath" id="parser" project="xml-xerces"/>
  +    <depend property="xerces.jar"           project="xml-xerces"/>
  +    <depend property="logkit.jar"           project="jakarta-avalon-logkit"/>
  +    <depend property="avalon-framework.jar" project="jakarta-avalon"/>
  +
  +    <depend property="avalon-excalibur.jar" 
  +      project="jakarta-avalon-excalibur" id="avalon-excalibur"/>
  +    <depend property="avalon-scratchpad.jar" 
  +      project="jakarta-avalon-excalibur" id="avalon-scratchpad"/>
     </ant>
   
     <depend project="jakarta-ant"/>
  -  <depend project="xml-xerces"/>
  -  <depend project="jakarta-avalon"/>
  -  <depend project="jakarta-avalon-excalibur"/>
  -  <depend project="jakarta-avalon-logkit"/>
     <depend project="xml-stylebook2"/>
     <depend project="xml-xalan2"/>
     <depend project="jmx"/>
   
     <home nested="build/lib"/>
  -  <jar name="phoenix-client.jar" id="client"/>
  +  <jar name="phoenix-client.jar"/>
   
   </project>
  
  
  
  1.22      +4 -8      jakarta-alexandria/proposal/gump/project/jakarta-avalon.xml
  
  Index: jakarta-avalon.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-avalon.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jakarta-avalon.xml        2001/07/20 02:16:50     1.21
  +++ jakarta-avalon.xml        2001/08/12 23:42:30     1.22
  @@ -8,20 +8,16 @@
     <cvs repository="jakarta"/>
   
     <ant target="dist">
  -    <property name="xerces.jar"
  -       reference="jarpath" id="parser" project="xml-xerces"/>
  -    <property name="logkit.jar"
  -       reference="jarpath" id="logkit" project="jakarta-avalon-logkit"/>
  +    <depend property="xerces.jar"  project="xml-xerces"/>
  +    <depend property="logkit.jar"  project="jakarta-avalon-logkit"/>
  +    <depend property="testlet.jar" project="jakarta-avalon-testlet"/>
     </ant>
   
     <depend project="jakarta-ant"/>
  -  <depend project="jakarta-avalon-logkit"/>
  -  <depend project="jakarta-avalon-testlet"/>
  -  <depend project="xml-xerces"/>
     <depend project="xml-stylebook2"/>
   
     <home nested="build/lib"/>
  -  <jar name="avalon-framework.jar" id="avalon-framework"/>
  +  <jar name="avalon-framework.jar"/>
   
     <project name="jakarta-avalon-exceptionutil">
       <depend project="jakarta-ant"/>
  
  
  
  1.25      +3 -7      jakarta-alexandria/proposal/gump/project/jakarta-velocity.xml
  
  Index: jakarta-velocity.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-velocity.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- jakarta-velocity.xml      2001/08/10 02:56:52     1.24
  +++ jakarta-velocity.xml      2001/08/12 23:42:30     1.25
  @@ -8,10 +8,8 @@
     <cvs  repository="jakarta"/>
   
     <ant basedir="build" target="dist">
  -    <property name="log.jar"
  -       reference="jarpath" id="logkit" project="jakarta-avalon-logkit"/>
  -    <property name="oro.jar"
  -       reference="jarpath" id="oro" project="jakarta-oro"/>
  +    <depend property="log.jar" project="jakarta-avalon-logkit"/>
  +    <depend property="oro.jar" project="jakarta-oro"/>
       <property name="version" value="gump"/>
     </ant>
   
  @@ -19,16 +17,14 @@
     <depend project="xml-xerces"/>
     <depend project="jakarta-servletapi"/>
     <depend project="jdom"/>
  -  <depend project="jakarta-oro"/>
     <depend project="werken.xpath"/>
     <depend project="javaclass"/>
     <depend project="junit"/>
  -  <depend project="jakarta-avalon-logkit"/>
     <depend project="jakarta-log4j"/>
     <depend project="commons-collections"/>
   
     <home nested="bin"/>
  -  <jar name="velocity-gump.jar" id="velocity"/>
  +  <jar name="velocity-gump.jar"/>
   
     <project name="jakarta-velocity-test">
       <ant basedir="build" buildfile="testcases.xml"/>
  
  
  
  1.16      +2 -6      jakarta-alexandria/proposal/gump/project/xml-cocoon2.xml
  
  Index: xml-cocoon2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/xml-cocoon2.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- xml-cocoon2.xml   2001/07/20 11:20:37     1.15
  +++ xml-cocoon2.xml   2001/08/12 23:42:30     1.16
  @@ -8,10 +8,8 @@
     <cvs repository="xml"/>
   
     <ant target="dist">
  -    <property name="logkit.jar"
  -       reference="jarpath" id="logkit" project="jakarta-avalon-logkit"/>
  -    <property name="avalonapi.jar"
  -       reference="jarpath" id="avalonapi" project="jakarta-avalon"/>
  +    <depend property="logkit.jar"    project="dist-avalon-logkit"/>
  +    <depend property="avalonapi.jar" project="jakarta-avalon"/>
     </ant>
   
     <depend project="jakarta-ant"/>
  @@ -19,8 +17,6 @@
     <depend project="xml-xalan2"/>
     <depend project="xml-batik"/>
     <option project="jakarta-servletapi-4"/>
  -  <depend project="dist-avalon-logkit"/>
  -  <depend project="jakarta-avalon"/>
     <depend project="jakarta-avalon-excalibur"/>
     <option project="xml-fop"/>
     <depend project="jakarta-regexp"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to