tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r526179 - in /tomcat/build/tc5.5.x: build.properties.default build.xml
Date Fri, 06 Apr 2007 14:33:06 GMT
Author: pero
Date: Fri Apr  6 07:33:06 2007
New Revision: 526179

URL: http://svn.apache.org/viewvc?view=rev&rev=526179
Log:
Update to use DBCP 1.2.2 without depends at commons collection
Update to commons-pool 1.3
WARNING: After update please build with 'ant clean clean-depend download deploy'

Modified:
    tomcat/build/tc5.5.x/build.properties.default
    tomcat/build/tc5.5.x/build.xml

Modified: tomcat/build/tc5.5.x/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.properties.default?view=diff&rev=526179&r1=526178&r2=526179
==============================================================================
--- tomcat/build/tc5.5.x/build.properties.default (original)
+++ tomcat/build/tc5.5.x/build.properties.default Fri Apr  6 07:33:06 2007
@@ -160,8 +160,8 @@
 
 
 # ----- Commons DBCP, version 1.1 or later -----
-commons-dbcp.version=1.2.1
-commons-dbcp.home=${base.path}/commons-dbcp-1.2.1
+commons-dbcp.version=1.2.2
+commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
 commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
 
 
@@ -173,8 +173,8 @@
 
 
 # ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.2
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.2-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.3-src
+commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
 
 
 # ----- Commons Collections, version 2.0 or later -----

Modified: tomcat/build/tc5.5.x/build.xml
URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?view=diff&rev=526179&r1=526178&r2=526179
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Fri Apr  6 07:33:06 2007
@@ -655,10 +655,11 @@
     <!-- <antcall target="build-commons-modeler" /> -->
     <!-- <antcall target="build-commons-daemon"  /> -->
 
-    <antcall target="downloadgz">
+    <!--<antcall target="downloadgz">
       <param name="sourcefile" value="${commons-collections-src.loc}"/>
       <param name="destfile" value="${tomcat-dbcp.jar}" />
     </antcall>
+    -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-pool-src.loc}"/>
       <param name="destfile" value="${tomcat-dbcp.jar}" />
@@ -687,12 +688,13 @@
 
   <target name="-build-tomcat-dbcp">
     <copy todir="${tomcat-dbcp.home}">
-        <fileset dir="${commons-collections.home}" >
+   <!-- <fileset dir="${commons-collections.home}" >
             <include name="**/collections/CursorableLinkedList.java" />
             <include name="**/collections/KeyValue.java" />
             <include name="**/collections/LRUMap.java" />
             <include name="**/collections/SequencedHashMap.java" />
         </fileset>
+       -->
         <fileset dir="${commons-pool.home}">
             <include name="**/*.java" />
             <exclude name="**/test/**" />
@@ -702,12 +704,13 @@
             <exclude name="**/test/**" />
         </fileset>
     </copy>
-    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
+ <!--   <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
         <replacefilter token="return UnmodifiableList.decorate(l);"
             value="return l;" />
         <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
             value=" " />
     </replace>
+    -->
     <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
         <replacefilter token="org.apache.commons"
             value="org.apache.tomcat.dbcp" />
@@ -735,7 +738,7 @@
     </jar>
   </target>
 
-      <target name="build-jasper-compiler-jdt">
+  <target name="build-jasper-compiler-jdt">
        <mkdir dir="${jasper-compiler-jdt.home}"/>
        <antcall target="-build-jasper-compiler-jdt">
           <param name="basedir" value="${jasper-compiler-jdt.home}" />
@@ -751,7 +754,7 @@
                 <include name="org/eclipse/jdt/internal/core/util/CommentRecorder*"/>
             </fileset>
         </jar>
-      </target>
+  </target>
 
   <target name="build-webapps" depends="init"
           description="build  webapps">
@@ -1103,6 +1106,13 @@
 
 
   <!-- ====================== COMBO: Clean All Directories ================ -->
+  
+  <target name="clean-depend"
+   description="Clean depend src components">
+    <delete dir="${tomcat-dbcp.home}"/>    
+    <delete dir="${jasper-compiler-jdt.home}"/>
+  </target>
+  
   <target name="clean"
    description="Clean all components">
 
@@ -1989,7 +1999,7 @@
     </condition>
   </target>
 
-  <target name="setproxy"  if="useproxy">
+  <target name="setproxy" depends="proxyflags" if="useproxy">
     <taskdef name="setproxy"
       classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message