cvs commit: jakarta-tomcat-5 build.properties.default build.xml

[remm]

remm        2003/08/10 01:50:44

  Modified:    .        build.properties.default build.xml
  Log:
  - Update to commons-modeler 1.1. Thanks to Yoav :)
  
  Revision  Changes    Path
  1.100     +3 -4      jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- build.properties.default  1 Aug 2003 06:54:10 -0000       1.99
  +++ build.properties.default  10 Aug 2003 08:50:44 -0000      1.100
  @@ -102,12 +102,11 @@
   
   
   # ----- Commons Modeler, version 1.1 or later -----
  -commons-modeler.home=${base.path}/commons-modeler-1.1dev
  +commons-modeler.home=${base.path}/commons-modeler-1.1
   #commons-modeler.lib=${commons-modeler.home}
   commons-modeler.lib=${commons-modeler.home}
   commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
  
-#commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
  -commons-modeler.cvs.loc=jakarta-commons/modeler
  
+commons-modeler.loc=http://www.apache.org/dist/jakarta/commons/modeler/binaries/modeler-1.1.tar.gz
   
   
   # ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
  
  
  
  1.148     +12 -2     jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.147
  retrieving revision 1.148
  diff -u -r1.147 -r1.148
  --- build.xml 2 Aug 2003 17:15:54 -0000       1.147
  +++ build.xml 10 Aug 2003 08:50:44 -0000      1.148
  @@ -117,10 +117,12 @@
         <srcfiles dir="${catalina.home}/webapps/admin" includes="**" />
       </uptodate>
   
  +<!--
       <uptodate property="commons-modeler.build.notrequired"
                 targetfile="${commons-modeler.jar}">
         <srcfiles dir="${cvs.base}/jakarta-commons/modeler/src/java" includes="**" />
       </uptodate>
  +-->
   
       <uptodate property="commons-daemon.build.notrequired"
                 targetfile="${commons-daemon.jar}">
  @@ -463,6 +465,7 @@
   
     <!-- ====================== Build dependent code =================== -->
   
  +<!--
     <target name="build-commons-modeler" unless="commons-modeler.build.notrequired" 
description="build commons-modeler">
       <echo>========== Building: commons-modeler </echo>
   
  @@ -474,7 +477,7 @@
           <property name="build.home" value="${tomcat.build}" />
       </ant>
     </target>
  -
  +-->
   
     <target name="build-commons-daemon" unless="commons-daemon.build.notrequired" 
description="build commons-daemon" >
       <echo>========== Building: commons-daemon </echo>
  @@ -494,7 +497,7 @@
       <antcall target="build-servletapi"/>
       <antcall target="build-jspapi"/>
   
  -    <antcall target="build-commons-modeler" />
  +    <!-- <antcall target="build-commons-modeler" /> -->
       <antcall target="build-commons-daemon" />
   
     </target>
  @@ -1531,6 +1534,11 @@
       </antcall>
   
       <antcall target="downloadgz">
  +      <param name="sourcefile" value="${commons-modeler.loc}"/>
  +      <param name="destfile" value="${commons-modeler.jar}"/>
  +    </antcall>
  +
  +    <antcall target="downloadgz">
         <param name="sourcefile" value="${log4j.loc}"/>
         <param name="destfile" value="${log4j.jar}"/>
       </antcall>
  @@ -1700,9 +1708,11 @@
       <cvs cvsroot="${cvsroot}" quiet="true"
            command="checkout -P ${cvstag} ${commons-daemon.cvs.loc}"
            dest="${cvs.base}"/>
  +<!--
       <cvs cvsroot="${cvsroot}" quiet="true"
            command="checkout -P ${cvstag} ${commons-modeler.cvs.loc}" 
            dest="${cvs.base}"/>
  +-->
     </target>
   
   
  
  
  

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