You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by jo...@apache.org on 2009/12/23 12:44:42 UTC
svn commit: r893481 - in /commons/proper/dbcp/trunk: build.properties.sample
build.xml pom-1.3.xml pom.xml
src/test/org/apache/commons/dbcp/TestJOCLed.java
Author: joehni
Date: Wed Dec 23 11:44:41 2009
New Revision: 893481
URL: http://svn.apache.org/viewvc?rev=893481&view=rev
Log:
Drop XML artifacts used in test and explicit selection of SAX driver.
Modified:
commons/proper/dbcp/trunk/build.properties.sample
commons/proper/dbcp/trunk/build.xml
commons/proper/dbcp/trunk/pom-1.3.xml
commons/proper/dbcp/trunk/pom.xml
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
Modified: commons/proper/dbcp/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=893481&r1=893480&r2=893481&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.properties.sample (original)
+++ commons/proper/dbcp/trunk/build.properties.sample Wed Dec 23 11:44:41 2009
@@ -31,10 +31,6 @@
junit.home=${repository}/junit/junit/3.8.2
junit.jar=${junit.home}/junit-3.8.2.jar
-# XML parser
-xerces.home=${repository}/xerces/xercesImpl/2.4.0
-xerces.jar=${xerces.home}/xercesImpl-2.4.0.jar
-
# Tomcat naming jars - needed only for JNDI tests
naming.common.home=${repository}/tomcat/naming-common/5.0.28
naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar
Modified: commons/proper/dbcp/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=893481&r1=893480&r2=893481&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.xml (original)
+++ commons/proper/dbcp/trunk/build.xml Wed Dec 23 11:44:41 2009
@@ -46,7 +46,7 @@
<property name="classpath"
value="${cp}:${commons-pool.jar}:${junit.jar}:
${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
- ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
+ ${jta-spec.jar}:${jta-impl.jar}:
${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
<property name="name" value="commons-dbcp"/>
@@ -105,9 +105,6 @@
<param name="file" value="${commons-logging.jar}"/>
</antcall>
<antcall target="check_jar">
- <param name="file" value="${xerces.jar}"/>
- </antcall>
- <antcall target="check_jar">
<param name="file" value="${jta-spec.jar}"/>
</antcall>
<antcall target="check_jar">
Modified: commons/proper/dbcp/trunk/pom-1.3.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom-1.3.xml?rev=893481&r1=893480&r2=893481&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom-1.3.xml (original)
+++ commons/proper/dbcp/trunk/pom-1.3.xml Wed Dec 23 11:44:41 2009
@@ -163,7 +163,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>1.1</version>
<optional>true</optional>
</dependency>
@@ -202,12 +202,12 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
+ <version>1.3.04</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
+ <artifactId>xercesImpl</artifactId>
<version>2.4.0</version>
<scope>test</scope>
</dependency>
Modified: commons/proper/dbcp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=893481&r1=893480&r2=893481&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/pom.xml (original)
+++ commons/proper/dbcp/trunk/pom.xml Wed Dec 23 11:44:41 2009
@@ -197,20 +197,6 @@
<version>1.2-beta</version>
<scope>test</scope>
</dependency>
-
- <!-- required by TestJOCLed -->
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<properties>
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java?rev=893481&r1=893480&r2=893481&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java Wed Dec 23 11:44:41 2009
@@ -30,9 +30,6 @@
public class TestJOCLed extends TestConnectionPool {
public TestJOCLed(String testName) {
super(testName);
- if(null == System.getProperty("org.xml.sax.driver")) {
- System.setProperty("org.xml.sax.driver","org.apache.xerces.parsers.SAXParser");
- }
}
public static Test suite() {
Re: svn commit: r893481 - in /commons/proper/dbcp/trunk: build.properties.sample
build.xml pom-1.3.xml pom.xml src/test/org/apache/commons/dbcp/TestJOCLed.java
Posted by Phil Steitz <ph...@gmail.com>.
Jörg Schaible wrote:
> Hi Phil,
>
> Phil Steitz wrote:
>
>> joehni@apache.org wrote:
>>> Author: joehni
>>> Date: Wed Dec 23 11:44:41 2009
>>> New Revision: 893481
>>>
>>> URL: http://svn.apache.org/viewvc?rev=893481&view=rev
>>> Log:
>>> Drop XML artifacts used in test and explicit selection of SAX driver.
>> While the maven build in trunk works only for JDK 1.6, the Ant build
>> is supposed to work under 1.4-1.5. The change below breaks this, so
>> I am going to revert it.
>
> I changed it, because there's a build-1.3.xml and build-
> properties.sample-1.3. Then what's that for? IIRC correctly you said, that
> those are the ones used for the 1.3 branch ...
>
Sorry I have confused the issue here. Where I made a mistake was
adding the build-properties.sample-1.3 instead of dealing with the
jta spec issue. Here is the setup I am trying to maintain:
Ant build in trunk works for 1.4-1.6. It accomplishes this by
filtering the sources (in the /build directory) when it detects JDK
< 1.6.
The 1.3 branch is just a pre-image of the 1.3 release tag and it
contains filtered sources. The 1.3 Ant build does the filtering in
place - i.e., in the src directory. This is really only needed as
part of release prep. Success of the 1.3 build depends on the
filtering having been done in place.
The maven builds are platform-specific - i.e., the build in trunk
*requires* 1.6 and the pom-1.3.xml only works with the filtered
sources in the 1.3 release branch.
I tried to explain the setup in README.txt. It is convenient to be
able to test 1.4-1.5 builds from trunk using Ant, so if possible I
would like to keep that working. The only problem that I see is the
jta spec jar version, but per my last message that is a non-issue.
Sorry again for being unclear on the intention here.
Phil
> [snip]
>
> - Jörg
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r893481 - in /commons/proper/dbcp/trunk: build.properties.sample build.xml pom-1.3.xml pom.xml src/test/org/apache/commons/dbcp/TestJOCLed.java
Posted by Jörg Schaible <jo...@gmx.de>.
Hi Phil,
Phil Steitz wrote:
> joehni@apache.org wrote:
>> Author: joehni
>> Date: Wed Dec 23 11:44:41 2009
>> New Revision: 893481
>>
>> URL: http://svn.apache.org/viewvc?rev=893481&view=rev
>> Log:
>> Drop XML artifacts used in test and explicit selection of SAX driver.
>
> While the maven build in trunk works only for JDK 1.6, the Ant build
> is supposed to work under 1.4-1.5. The change below breaks this, so
> I am going to revert it.
I changed it, because there's a build-1.3.xml and build-
properties.sample-1.3. Then what's that for? IIRC correctly you said, that
those are the ones used for the 1.3 branch ...
[snip]
- Jörg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r893481 - in /commons/proper/dbcp/trunk: build.properties.sample
build.xml pom-1.3.xml pom.xml src/test/org/apache/commons/dbcp/TestJOCLed.java
Posted by Phil Steitz <ph...@gmail.com>.
Phil Steitz wrote:
> joehni@apache.org wrote:
>> Author: joehni
>> Date: Wed Dec 23 11:44:41 2009
>> New Revision: 893481
>>
>> URL: http://svn.apache.org/viewvc?rev=893481&view=rev
>> Log:
>> Drop XML artifacts used in test and explicit selection of SAX driver.
>
> While the maven build in trunk works only for JDK 1.6, the Ant build
> is supposed to work under 1.4-1.5. The change below breaks this, so
> I am going to revert it.
Ugh. Just realized / remembered that the geronimo jta spec version
breaks jdk 1.4. I just diffed the sources (using source jars from
the m2 repo) for 1.1 vs 1.1.1 of the jta spec jar and saw no
difference. I can't find any release notes, but from what I can
glean from the geronimo dev list archives, the only difference
between 1.1 and 1.1.1 is that 1.1.1 is packaged as an OSGi bundle.
That would explain no difference in sources. I am therefore going to
change the version in build.properties.sample and dispense with
build.properties.sample-1.3.
Phil
>
>> Modified:
>> commons/proper/dbcp/trunk/build.properties.sample
>> commons/proper/dbcp/trunk/build.xml
>> commons/proper/dbcp/trunk/pom-1.3.xml
>> commons/proper/dbcp/trunk/pom.xml
>> commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
>>
>> Modified: commons/proper/dbcp/trunk/build.properties.sample
>> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=893481&r1=893480&r2=893481&view=diff
>> ==============================================================================
>> --- commons/proper/dbcp/trunk/build.properties.sample (original)
>> +++ commons/proper/dbcp/trunk/build.properties.sample Wed Dec 23 11:44:41 2009
>> @@ -31,10 +31,6 @@
>> junit.home=${repository}/junit/junit/3.8.2
>> junit.jar=${junit.home}/junit-3.8.2.jar
>>
>> -# XML parser
>> -xerces.home=${repository}/xerces/xercesImpl/2.4.0
>> -xerces.jar=${xerces.home}/xercesImpl-2.4.0.jar
>> -
>> # Tomcat naming jars - needed only for JNDI tests
>> naming.common.home=${repository}/tomcat/naming-common/5.0.28
>> naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar
>>
>> Modified: commons/proper/dbcp/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=893481&r1=893480&r2=893481&view=diff
>> ==============================================================================
>> --- commons/proper/dbcp/trunk/build.xml (original)
>> +++ commons/proper/dbcp/trunk/build.xml Wed Dec 23 11:44:41 2009
>> @@ -46,7 +46,7 @@
>> <property name="classpath"
>> value="${cp}:${commons-pool.jar}:${junit.jar}:
>> ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
>> - ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
>> + ${jta-spec.jar}:${jta-impl.jar}:
>> ${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
>>
>> <property name="name" value="commons-dbcp"/>
>> @@ -105,9 +105,6 @@
>> <param name="file" value="${commons-logging.jar}"/>
>> </antcall>
>> <antcall target="check_jar">
>> - <param name="file" value="${xerces.jar}"/>
>> - </antcall>
>> - <antcall target="check_jar">
>> <param name="file" value="${jta-spec.jar}"/>
>> </antcall>
>> <antcall target="check_jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r893481 - in /commons/proper/dbcp/trunk: build.properties.sample
build.xml pom-1.3.xml pom.xml src/test/org/apache/commons/dbcp/TestJOCLed.java
Posted by Phil Steitz <ph...@gmail.com>.
joehni@apache.org wrote:
> Author: joehni
> Date: Wed Dec 23 11:44:41 2009
> New Revision: 893481
>
> URL: http://svn.apache.org/viewvc?rev=893481&view=rev
> Log:
> Drop XML artifacts used in test and explicit selection of SAX driver.
While the maven build in trunk works only for JDK 1.6, the Ant build
is supposed to work under 1.4-1.5. The change below breaks this, so
I am going to revert it.
>
> Modified:
> commons/proper/dbcp/trunk/build.properties.sample
> commons/proper/dbcp/trunk/build.xml
> commons/proper/dbcp/trunk/pom-1.3.xml
> commons/proper/dbcp/trunk/pom.xml
> commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
>
> Modified: commons/proper/dbcp/trunk/build.properties.sample
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=893481&r1=893480&r2=893481&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/build.properties.sample (original)
> +++ commons/proper/dbcp/trunk/build.properties.sample Wed Dec 23 11:44:41 2009
> @@ -31,10 +31,6 @@
> junit.home=${repository}/junit/junit/3.8.2
> junit.jar=${junit.home}/junit-3.8.2.jar
>
> -# XML parser
> -xerces.home=${repository}/xerces/xercesImpl/2.4.0
> -xerces.jar=${xerces.home}/xercesImpl-2.4.0.jar
> -
> # Tomcat naming jars - needed only for JNDI tests
> naming.common.home=${repository}/tomcat/naming-common/5.0.28
> naming-common.jar=${naming.common.home}/naming-common-5.0.28.jar
>
> Modified: commons/proper/dbcp/trunk/build.xml
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=893481&r1=893480&r2=893481&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/build.xml (original)
> +++ commons/proper/dbcp/trunk/build.xml Wed Dec 23 11:44:41 2009
> @@ -46,7 +46,7 @@
> <property name="classpath"
> value="${cp}:${commons-pool.jar}:${junit.jar}:
> ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
> - ${xerces.jar}:${jta-spec.jar}:${jta-impl.jar}:
> + ${jta-spec.jar}:${jta-impl.jar}:
> ${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
>
> <property name="name" value="commons-dbcp"/>
> @@ -105,9 +105,6 @@
> <param name="file" value="${commons-logging.jar}"/>
> </antcall>
> <antcall target="check_jar">
> - <param name="file" value="${xerces.jar}"/>
> - </antcall>
> - <antcall target="check_jar">
> <param name="file" value="${jta-spec.jar}"/>
> </antcall>
> <antcall target="check_jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org