You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bi...@apache.org on 2013/08/02 07:16:04 UTC
svn commit: r1509547 - /gump/metadata/project/tomcat-trunk.xml
Author: billbarker
Date: Fri Aug 2 05:16:04 2013
New Revision: 1509547
URL: http://svn.apache.org/r1509547
Log:
dbcp build is now integrated into the regular tomcat build
Modified:
gump/metadata/project/tomcat-trunk.xml
Modified: gump/metadata/project/tomcat-trunk.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1509547&r1=1509546&r2=1509547&view=diff
==============================================================================
--- gump/metadata/project/tomcat-trunk.xml (original)
+++ gump/metadata/project/tomcat-trunk.xml Fri Aug 2 05:16:04 2013
@@ -27,6 +27,7 @@
<svn repository="asf" dir="tomcat/trunk"/>
+ <mkdir dir="tomcat-deps" />
<project name="tomcat-trunk">
<package>org.apache.catalina</package>
<ant>
@@ -42,12 +43,12 @@
<property name="tomcat-native.tar.gz" project="commons-daemon"
id="native-distro" reference="outputpath" />
<property name="junit.jar" project="junit" reference="jarpath" id="junit" />
- <property name="commons-pool.home" project="commons-pool"
- path="." />
- <property name="commons-dbcp.home" project="commons-dbcp"
- path="." />
- <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
- reference="home" />
+ <property name="commons-pool.home" project="commons-pool2"
+ path="pool" />
+ <property name="commons-dbcp.home" project="commons-dbcp2"
+ path="dbcp" />
+ <property name="tomcat-dbcp.home" project="tomcat-trunk"
+ path="tomcat-deps" />
</ant>
<depend project="ant" inherit="runtime" />
@@ -83,31 +84,6 @@
from="Bill Barker <billbarker@apache.org>" />
</project>
- <project name="tomcat-trunk-dbcp">
- <package>org.apache.tomcat.dbcp</package>
- <mkdir dir="tomcat-deps" />
- <ant target="build-tomcat-dbcp" >
- <property name="commons-pool.home" project="commons-pool"
- path="." />
- <property name="commons-dbcp.home" project="commons-dbcp"
- path="." />
- <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
- reference="home" />
- <property name="tomcat-dbcp.jar" project="tomcat-trunk-dbcp"
- id="tomcat-dbcp" reference="jarpath" />
- </ant>
-
- <depend project="ant" inherit="runtime"/>
- <depend project="jta" />
- <home nested="tomcat-deps" />
- <jar name="tomcat-dbcp-@@DATE@@.jar" id="tomcat-dbcp"/>
- <jar name="tomcat-dbcp-src.jar" id="tomcat-dbcp-src" />
- <license name="LICENSE" />
-
- <nag to="dev@tomcat.apache.org"
- from="Bill Barker <billbarker@apache.org>" />
- </project>
-
<project name="tomcat-trunk-test">
<package>org.apache.catalina</package>
<ant target="test">
@@ -122,12 +98,12 @@
<property name="tomcat-native.tar.gz" project="commons-daemon"
id="native-distro" reference="outputpath" />
<depend property="junit.jar" project="junit" id="junit"/>
- <property name="commons-pool.home" project="commons-pool"
- path="." />
- <property name="commons-dbcp.home" project="commons-dbcp"
- path="." />
- <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
- reference="home" />
+ <property name="commons-pool.home" project="commons-pool2"
+ path="pool" />
+ <property name="commons-dbcp.home" project="commons-dbcp2"
+ path="dbco" />
+ <property name="tomcat-dbcp.home" project="tomcat-trunk"
+ path="tomcat-deps" />
<property name="examples.sources.skip" value="true" />
<property name="test.accesslog" value="true" />
</ant>
Re: svn commit: r1509547 - /gump/metadata/project/tomcat-trunk.xml
Posted by Stefan Bodewig <bo...@apache.org>.
On 2013-08-12, David Crossley wrote:
>>+ <mkdir dir="tomcat-deps" />
> The metadata validation system does not like that "mkdir"
> being outside of a "project".
I've seen that as well, when I looked through the remaining descriptors,
I don't even think it does anything. I've moved it.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org
Re: svn commit: r1509547 - /gump/metadata/project/tomcat-trunk.xml
Posted by David Crossley <cr...@apache.org>.
> Author: billbarker
> Date: Fri Aug 2 05:16:04 2013
> New Revision: 1509547
>
> URL: http://svn.apache.org/r1509547
> Log:
> dbcp build is now integrated into the regular tomcat build
>
> Modified:
> gump/metadata/project/tomcat-trunk.xml
>
> Modified: gump/metadata/project/tomcat-trunk.xml
> URL: http://svn.apache.org/viewvc/gump/metadata/project/tomcat-trunk.xml?rev=1509547&r1=1509546&r2=1509547&view=diff
> ==============================================================================
> --- gump/metadata/project/tomcat-trunk.xml (original)
> +++ gump/metadata/project/tomcat-trunk.xml Fri Aug 2 05:16:04 2013
> @@ -27,6 +27,7 @@
>
> <svn repository="asf" dir="tomcat/trunk"/>
>
> + <mkdir dir="tomcat-deps" />
The metadata validation system does not like that "mkdir"
being outside of a "project".
Do 'cd metadata; ./validate'
Is it just a remnant of the stuff that was removed?
-David
> <project name="tomcat-trunk">
> <package>org.apache.catalina</package>
> <ant>
> @@ -42,12 +43,12 @@
> <property name="tomcat-native.tar.gz" project="commons-daemon"
> id="native-distro" reference="outputpath" />
> <property name="junit.jar" project="junit" reference="jarpath" id="junit" />
> - <property name="commons-pool.home" project="commons-pool"
> - path="." />
> - <property name="commons-dbcp.home" project="commons-dbcp"
> - path="." />
> - <property name="tomcat-dbcp.home" project="tomcat-trunk-dbcp"
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org