Author: bayard
Date: Tue Jun 12 11:28:57 2007
New Revision: 546584
URL: http://svn.apache.org/viewvc?view=rev&rev=546584
Log:
Adding a Maven2 pom.xml as per DBCP-211. I've removed a block of code from
TestJOCLed that set the Xerces parser manually, I presume it was only there for
odd situations in old JDKs.
Added:
jakarta/commons/proper/dbcp/trunk/pom.xml (with props)
Modified:
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
Added: jakarta/commons/proper/dbcp/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/pom.xml?view=auto&rev=546584
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/pom.xml (added)
+++ jakarta/commons/proper/dbcp/trunk/pom.xml Tue Jun 12 11:28:57 2007
@@ -0,0 +1,224 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-parent</artifactId>
+ <version>1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <name>Commons DBCP</name>
+
+ <inceptionYear>2001</inceptionYear>
+ <description>Commons Database Connection Pooling</description>
+ <url>http://jakarta.apache.org/commons/dbcp/</url>
+
+ <issueManagement>
+ <system>jira</system>
+ <url>http://issues.apache.org/jira/browse/DBCP</url>
+ </issueManagement>
+
+ <scm>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/dbcp/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/dbcp/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <name>Morgan Delagrange</name>
+ <id>morgand</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Geir Magnusson</name>
+ <id>geirm</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Craig McClanahan</name>
+ <id>craigmcc</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>John McNally</name>
+ <id>jmcnally</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Martin Poeschl</name>
+ <id>mpoeschl</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>tucana.at</organization>
+ </developer>
+ <developer>
+ <name>Rodney Waldhoff</name>
+ <id>rwaldhoff</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>David Weinrich</name>
+ <id>dweinr1</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Dirk Verbeeck</name>
+ <id>dirkv</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Yoav Shapira</name>
+ <id>yoavs</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Apache Software Foundation</organization>
+ </developer>
+ <developer>
+ <name>Phil Steitz</name>
+ <id>psteitz</id>
+ <email></email>
+ <organization></organization>
+ </developer>
+ <developer>
+ <name>Jörg Schaible</name>
+ <id>joehni</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization></organization>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Todd Carmichael</name>
+ <email>[EMAIL PROTECTED]</email>
+ </contributor>
+ <contributor>
+ <name>Wayne Woodfield</name>
+ </contributor>
+ </contributors>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- tomcat naming jars for jndi reference tests -->
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-common</artifactId>
+ <version>5.0.28</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-java</artifactId>
+ <version>5.0.28</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dragged in by tomcat-naming jars - only for jndi tests -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/test</directory>
+ <includes>
+ <include>testpool.jocl</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.txt</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>testpool.jocl</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+
<include>org/apache/commons/dbcp/TestAbandonedObjectPool.java</include>
+
<include>org/apache/commons/jocl/TestJOCLContentHandler.java</include>
+
<include>org/apache/commons/dbcp/TestDelegatingConnection.java</include>
+
<include>org/apache/commons/dbcp/TestPoolableConnection.java</include>
+
<include>org/apache/commons/dbcp/TestDelegatingPreparedStatement.java</include>
+
<include>org/apache/commons/dbcp/TestDelegatingStatement.java</include>
+ <include>org/apache/commons/dbcp/TestJOCLed.java</include>
+ <include>org/apache/commons/dbcp/TestManual.java</include>
+
+
<include>org/apache/commons/dbcp/TestBasicDataSourceFactory.java</include>
+
<include>org/apache/commons/dbcp/TestBasicDataSource.java</include>
+
<include>org/apache/commons/dbcp/TestAbandonedBasicDataSource.java</include>
+
<include>org/apache/commons/dbcp/TestPStmtPoolingBasicDataSource.java</include>
+
<include>org/apache/commons/dbcp/TestPoolingDataSource.java</include>
+ <include>org/apache/commons/dbcp/TestJndi.java</include>
+
+
<include>org/apache/commons/dbcp/datasources/TestFactory.java</include>
+
<include>org/apache/commons/dbcp/datasources/TestPerUserPoolDataSource.java</include>
+
<include>org/apache/commons/dbcp/datasources/TestSharedPoolDataSource.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: jakarta/commons/proper/dbcp/trunk/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java?view=diff&rev=546584&r1=546583&r2=546584
==============================================================================
---
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
(original)
+++
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJOCLed.java
Tue Jun 12 11:28:57 2007
@@ -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() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
