svn commit: r555705 - in /jakarta/commons/proper/dbcp/trunk: build.properties.sample build.xml src/test/org/apache/commons/dbcp/TestAll.java src/test/org/apache/commons/dbcp/TestJndi.java

[bayard]

Author: bayard
Date: Thu Jul 12 10:52:28 2007
New Revision: 555705

URL: http://svn.apache.org/viewvc?view=rev&rev=555705
Log:
Applying my patch from DBCP-227 - it's easy enough to run 'maven ant' if 
someone decides to do that someday, so no reason not to improve the existing 
build.xml in the meantime

Modified:
    jakarta/commons/proper/dbcp/trunk/build.properties.sample
    jakarta/commons/proper/dbcp/trunk/build.xml
    
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestAll.java
    
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJndi.java

Modified: jakarta/commons/proper/dbcp/trunk/build.properties.sample
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/build.properties.sample?view=diff&rev=555705&r1=555704&r2=555705
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/build.properties.sample (original)
+++ jakarta/commons/proper/dbcp/trunk/build.properties.sample Thu Jul 12 
10:52:28 2007
@@ -48,8 +48,8 @@
 naming-java.jar=${naming.home}/naming-java-5.0.28.jar 
 
 # Commons logging - dependency of naming jars
-logging.home=${repository}/commons-logging/jars
-logging.jar=${logging.home}/commons-logging-1.0.4.jar
+commons-logging.home=${repository}/commons-logging/jars
+commons-logging.jar=${commons-logging.home}/commons-logging-1.0.4.jar
 
 # JTA - needed for managed connections
 
jta-spec.jar=${repository}/org.apache.geronimo.specs/jars/geronimo-jta_1.1_spec-1.1.jar

Modified: jakarta/commons/proper/dbcp/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/build.xml?view=diff&rev=555705&r1=555704&r2=555705
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/build.xml (original)
+++ jakarta/commons/proper/dbcp/trunk/build.xml Thu Jul 12 10:52:28 2007
@@ -176,14 +176,15 @@
    </target>
 
    <target name="test" depends="compile-test" description="runs (junit) unit 
tests">
-      <java classname="${test.runner}" fork="yes" 
failonerror="${test.failonerror}">
-        <arg value="${test.entry}"/> 
+      <echo message="${classpath}"/>
+      <junit printsummary="true" showoutput="true" fork="yes" 
haltonfailure="${test.failonerror}">
         <classpath>
           <pathelement location="${build.classes.dir}" /> 
           <pathelement location="${build.test-classes.dir}" /> 
           <pathelement path="${classpath}" /> 
         </classpath>
-      </java>
+        <test name="${test.entry}"/> 
+      </junit>
    </target>
 
    <target name="build-jar" depends="compile">
@@ -211,4 +212,4 @@
 
    <target name="dist" depends="build" description="gump target"/>
    
-</project>
\ No newline at end of file
+</project>

Modified: 
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestAll.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestAll.java?view=diff&rev=555705&r1=555704&r2=555705
==============================================================================
--- 
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestAll.java 
(original)
+++ 
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestAll.java 
Thu Jul 12 10:52:28 2007
@@ -21,6 +21,7 @@
 import org.apache.commons.dbcp.datasources.TestSharedPoolDataSource;
 import org.apache.commons.dbcp.datasources.TestPerUserPoolDataSource;
 import org.apache.commons.dbcp.datasources.TestFactory;
+import org.apache.commons.jocl.TestJOCLContentHandler;
 
 /**
  * @author Rodney Waldhoff
@@ -47,6 +48,9 @@
         suite.addTest(TestSharedPoolDataSource.suite());
         suite.addTest(TestPerUserPoolDataSource.suite());
         suite.addTest(TestFactory.suite());
+        suite.addTest(TestJOCLContentHandler.suite());
+        suite.addTest(TestPoolingDataSource.suite());
+        suite.addTest(TestJndi.suite());
         return suite;
     }
 

Modified: 
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJndi.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJndi.java?view=diff&rev=555705&r1=555704&r2=555705
==============================================================================
--- 
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJndi.java
 (original)
+++ 
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestJndi.java
 Thu Jul 12 10:52:28 2007
@@ -24,7 +24,9 @@
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
+import junit.framework.Test;
 import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 import org.apache.commons.dbcp.datasources.SharedPoolDataSource;
 import org.apache.commons.dbcp.datasources.PerUserPoolDataSource;
@@ -55,6 +57,10 @@
      */
     public TestJndi(String name) {
         super(name);
+    }
+
+    public static Test suite() {
+        return new TestSuite(TestJndi.class);
     }
 
     /**



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]