You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pe...@apache.org on 2007/04/09 11:15:08 UTC
svn commit: r526680 - /tomcat/tc6.0.x/trunk/build.xml
Author: pero
Date: Mon Apr 9 02:15:08 2007
New Revision: 526680
URL: http://svn.apache.org/viewvc?view=rev&rev=526680
Log:
Add clean_depend use as Eclispe or DBCP package changed.
remove commons collection dependency (remove at DBCP 1.2.2)
Modified:
tomcat/tc6.0.x/trunk/build.xml
Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diff&rev=526680&r1=526679&r2=526680
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Mon Apr 9 02:15:08 2007
@@ -510,7 +510,13 @@
<copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
</target>
-
+
+ <target name="clean-depend"
+ description="Clean depend src components">
+ <delete dir="${tomcat-dbcp.home}"/>
+ <delete dir="${jasper-jdt.home}"/>
+ </target>
+
<target name="clean">
<delete dir="${tomcat.classes}" />
<delete dir="${tomcat.build}" />
@@ -606,12 +612,14 @@
<target name="build-tomcat-dbcp">
<copy todir="${tomcat-dbcp.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/**" />
@@ -621,12 +629,14 @@
<exclude name="**/test/**" />
</fileset>
</copy>
+ <!--
<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" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r526680 - /tomcat/tc6.0.x/trunk/build.xml
Posted by Peter Rossbach <pr...@objektpark.de>.
HI Filip,
I have add a new build.xml target ant clean-depend to clear dbcp and
eclipse jdt builds.
Peter
Am 09.04.2007 um 16:46 schrieb Filip Hanik - Dev Lists:
> ant download fails for me, ant download should actually download
> the file, shouldn't it?
>
>
> BUILD FAILED
> C:\development\tomcat\6.0\tc6.0.x\trunk\build.xml:596: The
> following error occurred while executing this line:
> C:\development\tomcat\6.0\tc6.0.x\trunk\build.xml:614: C:
> \development\tomcat\6.0\tc6.0.x\includes\commons-pool-1.3-src not
> found.
>
> this is because the file tomcat6-deps/dbcp.... exists, it doesn't
> even consider downloading the new version,
> not a critical issue by any means, just a little annoyance
>
>
> Filip
>
> pero@apache.org wrote:
>> Author: pero
>> Date: Mon Apr 9 02:15:08 2007
>> New Revision: 526680
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=526680
>> Log:
>> Add clean_depend use as Eclispe or DBCP package changed.
>> remove commons collection dependency (remove at DBCP 1.2.2)
>>
>> Modified:
>> tomcat/tc6.0.x/trunk/build.xml
>>
>> Modified: tomcat/tc6.0.x/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?
>> view=diff&rev=526680&r1=526679&r2=526680
>> =====================================================================
>> =========
>> --- tomcat/tc6.0.x/trunk/build.xml (original)
>> +++ tomcat/tc6.0.x/trunk/build.xml Mon Apr 9 02:15:08 2007
>> @@ -510,7 +510,13 @@
>> <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
>> </target>
>> -
>> +
>> + <target name="clean-depend"
>> + description="Clean depend src components">
>> + <delete dir="${tomcat-dbcp.home}"/> + <delete dir="${jasper-
>> jdt.home}"/>
>> + </target>
>> +
>> <target name="clean">
>> <delete dir="${tomcat.classes}" />
>> <delete dir="${tomcat.build}" />
>> @@ -606,12 +612,14 @@
>> <target name="build-tomcat-dbcp">
>> <copy todir="${tomcat-dbcp.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/**" />
>> @@ -621,12 +629,14 @@
>> <exclude name="**/test/**" />
>> </fileset>
>> </copy>
>> + <!--
>> <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" />
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: svn commit: r526680 - /tomcat/tc6.0.x/trunk/build.xml
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
ant download fails for me, ant download should actually download the
file, shouldn't it?
BUILD FAILED
C:\development\tomcat\6.0\tc6.0.x\trunk\build.xml:596: The following
error occurred while executing this line:
C:\development\tomcat\6.0\tc6.0.x\trunk\build.xml:614:
C:\development\tomcat\6.0\tc6.0.x\includes\commons-pool-1.3-src not found.
this is because the file tomcat6-deps/dbcp.... exists, it doesn't even
consider downloading the new version,
not a critical issue by any means, just a little annoyance
Filip
pero@apache.org wrote:
> Author: pero
> Date: Mon Apr 9 02:15:08 2007
> New Revision: 526680
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=526680
> Log:
> Add clean_depend use as Eclispe or DBCP package changed.
> remove commons collection dependency (remove at DBCP 1.2.2)
>
> Modified:
> tomcat/tc6.0.x/trunk/build.xml
>
> Modified: tomcat/tc6.0.x/trunk/build.xml
> URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diff&rev=526680&r1=526679&r2=526680
> ==============================================================================
> --- tomcat/tc6.0.x/trunk/build.xml (original)
> +++ tomcat/tc6.0.x/trunk/build.xml Mon Apr 9 02:15:08 2007
> @@ -510,7 +510,13 @@
> <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
>
> </target>
> -
> +
> + <target name="clean-depend"
> + description="Clean depend src components">
> + <delete dir="${tomcat-dbcp.home}"/>
> + <delete dir="${jasper-jdt.home}"/>
> + </target>
> +
> <target name="clean">
> <delete dir="${tomcat.classes}" />
> <delete dir="${tomcat.build}" />
> @@ -606,12 +612,14 @@
>
> <target name="build-tomcat-dbcp">
> <copy todir="${tomcat-dbcp.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/**" />
> @@ -621,12 +629,14 @@
> <exclude name="**/test/**" />
> </fileset>
> </copy>
> + <!--
> <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" />
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org