avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/xmlutil build.xml
Date Sun, 21 Jul 2002 09:15:52 GMT
jefft       2002/07/21 02:15:52

  Modified:    .        NEW_PROJECTS.txt
               altrmi   build.xml
               baxter   build.xml
               fortress build.xml
               instrument-client build.xml
               logger   build.xml
               xmlbundle build.xml
               xmlutil  build.xml
  Log:
  Rename depchecker property 'name' to 'proj.jar.name', to avoid a bug in Ant
  1.5, which would result in jars with names like
  excalibur-threadcontext.jar-1.0.jar
  
  Revision  Changes    Path
  1.2       +4 -4      jakarta-avalon-excalibur/NEW_PROJECTS.txt
  
  Index: NEW_PROJECTS.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/NEW_PROJECTS.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NEW_PROJECTS.txt	3 May 2002 12:19:48 -0000	1.1
  +++ NEW_PROJECTS.txt	21 Jul 2002 09:15:51 -0000	1.2
  @@ -241,14 +241,14 @@
        </target>
   +    <target name="checkJoust">
   +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -+            <property name="name" value="excalibur-joust.jar"/>
  ++            <property name="proj.jar.name" value="excalibur-joust.jar"/>
   +            <property name="path" value="${excalibur-joust.jar}"/>
   +            <property name="proj.home" value="${basedir}/../joust"/>
   +        </ant>
   +    </target>
        <target name="checkIO">
            <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -             <property name="name" value="excalibur-io.jar"/>
  +             <property name="proj.jar.name" value="excalibur-io.jar"/>
   
   
      Then if other projects want to have Joust automatically built, they can call:
  
  
  
  1.24      +1 -1      jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	14 Jul 2002 23:12:44 -0000	1.23
  +++ build.xml	21 Jul 2002 09:15:51 -0000	1.24
  @@ -37,7 +37,7 @@
   	
   	<target name="checkBCEL">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -            <property name="name" value="jakarta-bcel.jar"/>
  +            <property name="proj.jar.name" value="jakarta-bcel.jar"/>
               <property name="class" value="org.apache.bcel.generic.ClassGen"/>
               <property name="classpath" value="${cp}"/>
               <property name="remedy" value="Download BCEL from http://jakarta.apache.org/builds/jakarta-bcel/release/v5.0rc1/
and copy bcel.jar ${nl}
  
  
  
  1.26      +1 -1      jakarta-avalon-excalibur/baxter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- build.xml	19 Jul 2002 08:00:50 -0000	1.25
  +++ build.xml	21 Jul 2002 09:15:51 -0000	1.26
  @@ -36,7 +36,7 @@
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="jmx.jar"/>
  +            <property name="proj.jar.name" value="jmx.jar"/>
               <property name="path" value="${jmx.jar}"/>
           </ant>
       </target>
  
  
  
  1.31      +1 -1      jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml	19 Jul 2002 12:32:21 -0000	1.30
  +++ build.xml	21 Jul 2002 09:15:51 -0000	1.31
  @@ -68,7 +68,7 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -            <property name="name" value="xml-apis.jar"/>
  +            <property name="proj.jar.name" value="xml-apis.jar"/>
               <property name="class" value="org.xml.sax.InputSource"/>
               <property name="classpath" value="${cp}"/>
               <property name="message" value="This class (probably in a differently named
jar) is usually included in your ${ant.home}/lib directory."/>
  
  
  
  1.29      +1 -1      jakarta-avalon-excalibur/instrument-client/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/build.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build.xml	22 Jun 2002 16:35:01 -0000	1.28
  +++ build.xml	21 Jul 2002 09:15:51 -0000	1.29
  @@ -46,7 +46,7 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrumentManager"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="excalibur-altrmi-client-impl.jar"/>
  +            <property name="proj.jar.name" value="excalibur-altrmi-client-impl.jar"/>
               <property name="path" value="${excalibur-altrmi-client-impl.jar}"/>
           </ant>
       </target>
  
  
  
  1.22      +3 -4      jakarta-avalon-excalibur/logger/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/build.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- build.xml	20 Jul 2002 09:31:48 -0000	1.21
  +++ build.xml	21 Jul 2002 09:15:51 -0000	1.22
  @@ -79,7 +79,7 @@
       <!-- Check that if we want servlet logging support, our logkit.jar has it enabled
too -->
       <target name="dependencies.servlet" if="servlet.present">
               <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -                <property name="name" value="logkit.jar"/>
  +                <property name="proj.jar.name" value="logkit.jar"/>
                   <property name="class" value="org.apache.log.output.ServletOutputLogTarget"/>
                   <property name="classpath" value="${cp}"/>
                   <property name="remedy" value="Recompile LogKit with servlet support
enabled, or disable servlet support in ${Name} by setting a blank 'servlet.jar' property in
ant.properties"/>
  @@ -89,18 +89,17 @@
       <!-- Check that if we want JDBC logging support, our logkit.jar has it enabled too
-->
       <target name="dependencies.datasource" if="datasource.present">
               <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -                <property name="name" value="logkit.jar"/>
  +                <property name="proj.jar.name" value="logkit.jar"/>
                   <property name="class" value="org.apache.log.output.db.ColumnInfo"/>
                   <property name="classpath" value="${cp}"/>
                   <property name="remedy" value="Recompile LogKit with JDBC logging support
enabled, or disable JDBC support in ${Name} by setting a blank 'jdbc.jar' property in ant.properties"/>
               </ant>
  -            <echo>hooray</echo>
       </target>
   
       <!-- Check that if we want JMS logging support, our logkit.jar has it enabled too
-->
       <target name="dependencies.jms" if="jms.present">
               <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -                <property name="name" value="logkit.jar"/>
  +                <property name="proj.jar.name" value="logkit.jar"/>
                   <property name="class" value="org.apache.log.output.jms.JMSQueueTarget"/>
                   <property name="classpath" value="${cp}"/>
                   <property name="remedy" value="Recompile LogKit with JMS support enabled,
or disable JMS support in ${Name} by setting a blank 'jms.jar' property in ant.properties"/>
  
  
  
  1.27      +3 -3      jakarta-avalon-excalibur/xmlbundle/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	8 Jul 2002 11:49:09 -0000	1.26
  +++ build.xml	21 Jul 2002 09:15:51 -0000	1.27
  @@ -64,15 +64,15 @@
   		
   
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="xerces.jar"/>
  +            <property name="proj.jar.name" value="xerces.jar"/>
               <property name="path" value="${xerces.jar}"/>
           </ant>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="xalan.jar"/>
  +            <property name="proj.jar.name" value="xalan.jar"/>
               <property name="path" value="${xalan.jar}"/>
           </ant>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -            <property name="name" value="xml-apis.jar"/>
  +            <property name="proj.jar.name" value="xml-apis.jar"/>
               <property name="class" value="javax.xml.parsers.SAXParser"/>
               <property name="classpath" value="${cp}"/>
           </ant>
  
  
  
  1.25      +3 -3      jakarta-avalon-excalibur/xmlutil/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlutil/build.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml	7 Jul 2002 08:00:56 -0000	1.24
  +++ build.xml	21 Jul 2002 09:15:52 -0000	1.25
  @@ -68,15 +68,15 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkSourceResolve"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkStore"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="xerces.jar"/>
  +            <property name="proj.jar.name" value="xerces.jar"/>
               <property name="path" value="${xerces.jar}"/>
           </ant>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="xalan.jar"/>
  +            <property name="proj.jar.name" value="xalan.jar"/>
               <property name="path" value="${xalan.jar}"/>
           </ant>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -            <property name="name" value="xml-apis.jar"/>
  +            <property name="proj.jar.name" value="xml-apis.jar"/>
               <property name="class" value="javax.xml.parsers.SAXParser"/>
               <property name="classpath" value="${cp}"/>
           </ant>
  
  
  

--
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