incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1336965 - in /incubator/lcf/trunk: ./ connectors/ connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/ dist-license/ framework/ framework/core/src/main/java/org/apache/manifoldcf/core/database/ framework/c...
Date Thu, 10 May 2012 23:45:50 GMT
Author: kwright
Date: Thu May 10 23:45:49 2012
New Revision: 1336965

URL: http://svn.apache.org/viewvc?rev=1336965&view=rev
Log:
Fix for CONNECTORS-96.  Get rid of jdbcpool, and implement something much simpler natively.

Added:
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/
      - copied from r1336940, incubator/lcf/branches/CONNECTORS-96/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/connector-build.xml
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java
    incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java
    incubator/lcf/trunk/dist-license/LICENSE.txt
    incubator/lcf/trunk/framework/build.xml
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/ConnectionFactory.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
    incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
    incubator/lcf/trunk/lib-license/LICENSE.txt
    incubator/lcf/trunk/tests/test-build.xml

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
  Merged /incubator/lcf/branches/CONNECTORS-96:r1335360-1336940

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu May 10 23:45:49 2012
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 0.6-dev =====================
 
+CONNECTORS-96: Remove jdbcpool driver, and replace with a simple
+set of pooling classes.  This gives us better control and makes failures
+on long crawls less likely.
+(Karl Wright)
+
 CONNECTORS-469: Hook up context listener to catch web application
 shutdown more efficiently.
 (Karl Wright)

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Thu May 10 23:45:49 2012
@@ -3134,14 +3134,6 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
     
-    <target name="download-jdbcpool">
-        <mkdir dir="lib"/>
-        <mkdir dir="build/download"/>
-        <get src="http://ftp.nerim.net/FreeBSD/ports/i386/packages/databases/jdbcpool-0.99_3.tbz" dest="build/download/jdbcpool-0.99_3.tbz"/>
-        <untar src="build/download/jdbcpool-0.99_3.tbz" compression="bzip2" dest="build/download/jdbcpool"/>
-        <copy todir="lib" file="build/download/jdbcpool/share/java/classes/jdbcpool.jar"/>
-    </target>
-
     <target name="download-chemistry">
         <mkdir dir="lib"/>
         <property name="chemistry-version" value="0.6.0"/>
@@ -3394,7 +3386,7 @@ Use Apache Forrest version forrest-0.9-d
         </copy>
     </target>
 
-    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-jdbcpool,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
+    <target name="make-core-deps" depends="download-json,download-hsqldb,download-xerces,download-commons,download-solr-plugins,download-sharepoint-plugin,download-jstl,download-xmlgraphics-commons,download-wstx-asl,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jsr181-api,download-jsr250-api,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-derby,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (original)
+++ incubator/lcf/trunk/connectors/connector-build.xml Thu May 10 23:45:49 2012
@@ -44,7 +44,6 @@
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
             <include name="slf4j*.jar"/>
-            <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>

Modified: incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java (original)
+++ incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnection.java Thu May 10 23:45:49 2012
@@ -20,6 +20,7 @@ package org.apache.manifoldcf.crawler.co
 
 import org.apache.manifoldcf.core.interfaces.*;
 import org.apache.manifoldcf.core.database.*;
+import org.apache.manifoldcf.core.jdbcpool.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 
 import java.sql.*;
@@ -29,8 +30,6 @@ import javax.sql.*;
 import java.io.*;
 import java.util.*;
 
-import com.bitmechanic.sql.*;
-
 /** This object describes a connection to a particular JDBC instance.
 */
 public class JDBCConnection
@@ -229,7 +228,7 @@ public class JDBCConnection
     {
       try
       {
-        Connection tempConnection = JDBCConnectionFactory.getConnection(jdbcProvider,host,databaseName,userName,password);
+        WrappedConnection tempConnection = JDBCConnectionFactory.getConnection(jdbcProvider,host,databaseName,userName,password);
         JDBCConnectionFactory.releaseConnection(tempConnection);
       }
       catch (Throwable e)
@@ -306,10 +305,10 @@ public class JDBCConnection
     {
       try
       {
-        Connection tempConnection = JDBCConnectionFactory.getConnection(jdbcProvider,host,databaseName,userName,password);
+        WrappedConnection tempConnection = JDBCConnectionFactory.getConnection(jdbcProvider,host,databaseName,userName,password);
         try
         {
-          execute(tempConnection,query,params,false,0);
+          execute(tempConnection.getConnection(),query,params,false,0);
         }
         finally
         {
@@ -791,7 +790,7 @@ public class JDBCConnection
 
   protected class JDBCResultSet implements IDynamicResultSet
   {
-    protected Connection connection;
+    protected WrappedConnection connection;
     protected Statement stmt;
     protected ResultSet rs;
     protected ResultSetMetaData rsmd;
@@ -907,7 +906,7 @@ public class JDBCConnection
     protected String query;
 
     protected Throwable exception = null;
-    protected Connection connection = null;
+    protected WrappedConnection connection = null;
     protected Statement stmt = null;
     protected ResultSet rs = null;
     protected ResultSetMetaData rsmd = null;
@@ -926,7 +925,7 @@ public class JDBCConnection
       {
         connection = JDBCConnectionFactory.getConnection(jdbcProvider,host,databaseName,userName,password);
         // lightest statement type
-        stmt = connection.createStatement();
+        stmt = connection.getConnection().createStatement();
         stmt.execute(query);
         rs = stmt.getResultSet();
         rsmd = rs.getMetaData();
@@ -1003,7 +1002,7 @@ public class JDBCConnection
       return exception;
     }
 
-    public Connection getConnection()
+    public WrappedConnection getConnection()
     {
       return connection;
     }
@@ -1031,7 +1030,7 @@ public class JDBCConnection
 
   protected class JDBCPSResultSet implements IDynamicResultSet
   {
-    protected Connection connection;
+    protected WrappedConnection connection;
     protected PreparedStatement ps;
     protected ResultSet rs;
     protected ResultSetMetaData rsmd;
@@ -1184,7 +1183,7 @@ public class JDBCConnection
     protected ArrayList params;
     protected String query;
 
-    protected Connection connection = null;
+    protected WrappedConnection connection = null;
     protected Throwable exception = null;
     protected PreparedStatement ps = null;
     protected ResultSet rs = null;
@@ -1204,7 +1203,7 @@ public class JDBCConnection
       try
       {
         connection = JDBCConnectionFactory.getConnection(jdbcProvider,host,databaseName,userName,password);
-        ps = connection.prepareStatement(query);
+        ps = connection.getConnection().prepareStatement(query);
         loadPS(ps, params);
         rs = ps.executeQuery();
         rsmd = rs.getMetaData();
@@ -1278,7 +1277,7 @@ public class JDBCConnection
       return exception;
     }
 
-    public Connection getConnection()
+    public WrappedConnection getConnection()
     {
       return connection;
     }

Modified: incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java (original)
+++ incubator/lcf/trunk/connectors/jdbc/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jdbc/JDBCConnectionFactory.java Thu May 10 23:45:49 2012
@@ -19,6 +19,7 @@
 package org.apache.manifoldcf.crawler.connectors.jdbc;
 
 import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.core.jdbcpool.*;
 import org.apache.manifoldcf.agents.interfaces.*;
 import org.apache.manifoldcf.crawler.system.Logging;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;
@@ -29,8 +30,6 @@ import javax.naming.*;
 import javax.sql.*;
 import java.util.*;
 
-import com.bitmechanic.sql.*;
-
 /** This class creates a connection
 */
 public class JDBCConnectionFactory
@@ -65,7 +64,7 @@ public class JDBCConnectionFactory
   }
 
 
-  public static Connection getConnection(String providerName, String host, String database, String userName, String password)
+  public static WrappedConnection getConnection(String providerName, String host, String database, String userName, String password)
     throws ManifoldCFException, ServiceInterruption
   {
     if (database.length() == 0)
@@ -113,31 +112,31 @@ public class JDBCConnectionFactory
         // to be displayed.
         poolKey += "/" + userName + "/" + ManifoldCF.hash(password);
 
+        ConnectionPool cp;
         synchronized (_pool)
         {
-          ConnectionPool cp = null;
-          try
-          {
-            cp = _pool.getPool(poolKey);
-          }
-          catch (Exception e)
-          {
-          }
+          cp = _pool.getPool(poolKey);
           if (cp == null)
           {
-            _pool.addAlias(poolKey, driverClassName, dburl,
-              userName, password, 25, 300, 3600, 30, false);
-            // cp = _pool.getPool(poolKey);
+            // Register the driver here
+            Class.forName(driverClassName);
+            //System.out.println("Class name '"+driverClassName+"'; URL = '"+dburl+"'");
+            cp =_pool.addAlias(poolKey, driverClassName, dburl,
+              userName, password, 30, 300000L);
           }
         }
-        return DriverManager.getConnection(
-          ConnectionPoolManager.URL_PREFIX + poolKey, null, null);
+        return cp.getConnection();
       }
       else
         throw new ManifoldCFException("Can't get connection since pool driver did not initialize properly");
     }
+    catch (InterruptedException e)
+    {
+      throw new ManifoldCFException(e.getMessage(),ManifoldCFException.INTERRUPTED);
+    }
     catch (java.sql.SQLException e)
     {
+      e.printStackTrace();
       // Unfortunately, the connection pool manager manages to eat all actual connection setup errors.  This makes it very hard to figure anything out
       // when something goes wrong.  So, we try again, going directly this time as a means of getting decent error feedback.
       try
@@ -173,17 +172,10 @@ public class JDBCConnectionFactory
     }
   }
 
-  public static void releaseConnection(Connection c)
+  public static void releaseConnection(WrappedConnection c)
     throws ManifoldCFException, ServiceInterruption
   {
-    try
-    {
-      c.close();
-    }
-    catch (java.sql.SQLException e)
-    {
-      throw new ManifoldCFException("Error releasing connection: "+e.getMessage(),e);
-    }
+    c.release();
   }
 
 }

Modified: incubator/lcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/dist-license/LICENSE.txt?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/dist-license/LICENSE.txt (original)
+++ incubator/lcf/trunk/dist-license/LICENSE.txt Thu May 10 23:45:49 2012
@@ -201,9 +201,6 @@ License: BSD License (http://jdbc.postgr
 This product includes a JUnit jar: http://junit.sourceforge.net/
 License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
 
-This product includes a jdbcpool-0.99.jar.
-License: Apache Software Foundation - v 1.1
-
 This product includes an eclipse-ecj.jar.
 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
 
@@ -561,65 +558,6 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to jdbcpool-0.99.jar
---------------------------------------------------------------------------
-The Apache Software License, Version 1.1
-
-Copyright (c) 2000 The Apache Software Foundation.  All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by the
-       Apache Software Foundation (http://www.apache.org/)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Apache" and "Apache Software Foundation" must
-   not be used to endorse or promote products derived from this
-   software without prior written permission. For written
-   permission, please contact apache@apache.org.
-
-5. Products derived from this software may not be called "Apache",
-   nor may "Apache" appear in their name, without prior written
-   permission of the Apache Software Foundation.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation.  For more
-information on the Apache Software Foundation, please see
-<http://www.apache.org/>.
-
-Portions of this software are based upon public domain software
-originally written at the National Center for Supercomputing Applications,
-University of Illinois, Urbana-Champaign.
-
-==========================================================================
 The following license applies to eclipse-ecj.jar, and
 h2-1.3.158.jar:
 --------------------------------------------------------------------------

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Thu May 10 23:45:49 2012
@@ -45,7 +45,6 @@
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
             <include name="slf4j*.jar"/>
-            <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>
@@ -254,7 +253,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
@@ -290,7 +288,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
@@ -331,7 +328,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
@@ -368,7 +364,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
@@ -411,7 +406,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
@@ -456,7 +450,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="xalan*.jar"/>
@@ -559,7 +552,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
@@ -598,7 +590,6 @@
                 <include name="commons-io*.jar"/>
                 <include name="commons-lang*.jar"/>
                 <include name="commons-logging*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="log4j*.jar"/>
                 <include name="serializer*.jar"/>
                 <include name="servlet-api*.jar"/>
@@ -750,7 +741,6 @@
                 <include name="commons-logging*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="jsp-api*.jar"/>
@@ -821,8 +811,7 @@
         <property name="manifest-cp-26" value="${manifest-cp-25} lib/derbytools.jar"/>
         <property name="manifest-cp-27" value="${manifest-cp-26} lib/jasper.jar"/>
         <property name="manifest-cp-28" value="${manifest-cp-27} lib/jasper-el.jar"/>
-        <property name="manifest-cp-29" value="${manifest-cp-28} lib/jdbcpool.jar"/>
-        <property name="manifest-cp-30" value="${manifest-cp-29} lib/jetty-server.jar"/>
+        <property name="manifest-cp-30" value="${manifest-cp-28} lib/jetty-server.jar"/>
         <property name="manifest-cp-31" value="${manifest-cp-30} lib/jetty-util.jar"/>
         <property name="manifest-cp-32" value="${manifest-cp-31} lib/jsp-api-2.1-glassfish.jar"/>
         <property name="manifest-cp-33" value="${manifest-cp-32} lib/json.jar"/>
@@ -877,7 +866,6 @@
                 <include name="commons-logging*.jar"/>
                 <include name="ecj*.jar"/>
                 <include name="jasper*.jar"/>
-                <include name="jdbcpool*.jar"/>
                 <include name="jetty*.jar"/>
                 <include name="slf4j*.jar"/>
                 <include name="jsp-api*.jar"/>
@@ -953,8 +941,7 @@
         <property name="manifest-cp-proprietary-26" value="${manifest-cp-proprietary-25} lib/derbytools.jar"/>
         <property name="manifest-cp-proprietary-27" value="${manifest-cp-proprietary-26} lib/jasper.jar"/>
         <property name="manifest-cp-proprietary-28" value="${manifest-cp-proprietary-27} lib/jasper-el.jar"/>
-        <property name="manifest-cp-proprietary-29" value="${manifest-cp-proprietary-28} lib/jdbcpool.jar"/>
-        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-29} lib/jetty-server.jar"/>
+        <property name="manifest-cp-proprietary-30" value="${manifest-cp-proprietary-28} lib/jetty-server.jar"/>
         <property name="manifest-cp-proprietary-31" value="${manifest-cp-proprietary-30} lib/jetty-util.jar"/>
         <property name="manifest-cp-proprietary-32" value="${manifest-cp-proprietary-31} lib/jsp-api-2.1-glassfish.jar"/>
         <property name="manifest-cp-proprietary-33" value="${manifest-cp-proprietary-32} lib/json.jar"/>

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/ConnectionFactory.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/ConnectionFactory.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/ConnectionFactory.java Thu May 10 23:45:49 2012
@@ -19,6 +19,7 @@
 package org.apache.manifoldcf.core.database;
 
 import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.core.jdbcpool.*;
 import org.apache.manifoldcf.core.system.Logging;
 import org.apache.manifoldcf.core.system.ManifoldCF;
 
@@ -27,8 +28,6 @@ import java.sql.*;
 import javax.naming.*;
 import javax.sql.*;
 
-import com.bitmechanic.sql.*;
-
 /** This class creates a connection, and may at our discretion manage
 * a connection pool someday.
 */
@@ -48,19 +47,29 @@ public class ConnectionFactory
   {
   }
 
-  public static Connection getConnection(String jdbcUrl, String jdbcDriver, String database, String userName, String password)
+  public static WrappedConnection getConnection(String jdbcUrl, String jdbcDriver, String database, String userName, String password)
     throws ManifoldCFException
   {
+    // Make sure database driver is registered
+    try
+    {
+      Class.forName(jdbcDriver);
+    }
+    catch (Exception e)
+    {
+      throw new ManifoldCFException("Unable to load database driver: "+e.getMessage(),e,ManifoldCFException.SETUP_ERROR);
+    }
 
-    ConnectionPoolManager _pool = poolManager.ensurePoolExists(jdbcDriver);
+    ConnectionPoolManager cpm = poolManager.createPoolManager();
+    
     try
     {
       // Hope for a connection now
-      Connection rval;
+      WrappedConnection rval;
       ConnectionPool cp = null;
       try
       {
-        cp = _pool.getPool(database);
+        cp = cpm.getPool(database);
       }
       catch (Exception e)
       {
@@ -71,57 +80,31 @@ public class ConnectionFactory
         int maxDBConnections = defaultMaxDBConnections;
         if (handleMax != null && handleMax.length() > 0)
           maxDBConnections = Integer.parseInt(handleMax);
-        String timeoutValueString = ManifoldCF.getProperty(ManifoldCF.databaseHandleTimeoutProperty);
-        int timeoutValue = defaultTimeoutValue;
-        if (timeoutValueString != null && timeoutValueString.length() > 0)
-          timeoutValue = Integer.parseInt(timeoutValueString);
+        //String timeoutValueString = ManifoldCF.getProperty(ManifoldCF.databaseHandleTimeoutProperty);
+        //int timeoutValue = defaultTimeoutValue;
+        //if (timeoutValueString != null && timeoutValueString.length() > 0)
+        //  timeoutValue = Integer.parseInt(timeoutValueString);
 
         // Logging.db.debug("adding pool alias [" + database + "]");
         // I had to up the timeout from one hour to 3 due to the webconnector keeping some connections open a very long time...
 	//System.out.println("jdbcUrl = '"+jdbcUrl+"', userName='"+userName+"', password='"+password+"'");
-        _pool.addAlias(database, jdbcDriver, jdbcUrl,
+        cpm.addAlias(database, jdbcDriver, jdbcUrl,
           userName, password,
-          maxDBConnections,
-          300,                      // Idle timeout: idle time before closing connection: 5 minutes
-          timeoutValue,         // Checkout timeout: Time a thread can have connection checked out: 24 hours
-          30,                       // Number of times you can check out a connection before it gets closed: 30
-          false);
-        cp = _pool.getPool(database);
-      }
-      rval = getConnectionWithRetries(ConnectionPoolManager.URL_PREFIX + database, null, null);
-      //rval = getConnectionWithRetries(ConnectionPoolManager.URL_PREFIX + database, userName, password);
-
-      // Enter it in the pool so we can figure out whether it closed
-      // synchronized (checkedOutConnections)
-      // {
-      //      checkedOutConnections.put(rval.toString(),new ConnectionTracker(rval));
-      // }
-      //
-      // checkConnections(System.currentTimeMillis());
-
-      return rval;
+          maxDBConnections, 300000L);
+        cp = cpm.getPool(database);
+      }
+      return getConnectionWithRetries(cp);
     }
     catch (Exception e)
     {
-      throw new ManifoldCFException("Error getting connection",e,ManifoldCFException.DATABASE_ERROR);
+      throw new ManifoldCFException("Error getting connection: "+e.getMessage(),e,ManifoldCFException.DATABASE_ERROR);
     }
   }
 
-  public static void releaseConnection(Connection c)
+  public static void releaseConnection(WrappedConnection c)
     throws ManifoldCFException
   {
-    try
-    {
-      c.close();
-      // synchronized (checkedOutConnections)
-      // {
-      //      checkedOutConnections.remove(c.toString());
-      // }
-    }
-    catch (Exception e)
-    {
-      throw new ManifoldCFException("Error releasing connection",e,ManifoldCFException.DATABASE_ERROR);
-    }
+    c.release();
   }
 
   public static void releaseAll()
@@ -130,8 +113,8 @@ public class ConnectionFactory
       poolManager.releaseAll();
   }
 
-  protected static Connection getConnectionWithRetries(String dbURL, String userName, String password)
-    throws Exception
+  protected static WrappedConnection getConnectionWithRetries(ConnectionPool cp)
+    throws SQLException, ManifoldCFException
   {
     // If we have a problem, we will wait a grand total of 30 seconds
     int retryCount = 3;
@@ -139,20 +122,19 @@ public class ConnectionFactory
     {
       try
       {
-        Connection rval;
-        if (userName != null && userName.length() > 0)
-          rval = DriverManager.getConnection(dbURL,userName,password);
-        else
-          rval = DriverManager.getConnection(dbURL);
-        return rval;
+        return cp.getConnection();
       }
-      catch (Exception e)
+      catch (SQLException e)
       {
         if (retryCount == 0)
           throw e;
         // Eat the exception and try again
         retryCount--;
       }
+      catch (InterruptedException e)
+      {
+        throw new ManifoldCFException("Interrupted",ManifoldCFException.INTERRUPTED);
+      }
       try
       {
         // Ten seconds is a long time
@@ -196,34 +178,14 @@ public class ConnectionFactory
     {
     }
 
-    public ConnectionPoolManager ensurePoolExists(String jdbcDriver)
-      throws ManifoldCFException
+    public ConnectionPoolManager createPoolManager()
     {
       synchronized (poolExistenceLock)
       {
         if (_pool != null)
           return _pool;
-        try
-        {
-          Class.forName(jdbcDriver);
-        }
-        catch (Exception e)
-        {
-          throw new ManifoldCFException("Unable to load database driver: "+e.getMessage(),e,ManifoldCFException.SETUP_ERROR);
-        }
-        try
-        {
-          String handleMax = ManifoldCF.getProperty(ManifoldCF.databaseHandleMaxcountProperty);
-          int maxDBConnections = defaultMaxDBConnections;
-          if (handleMax != null && handleMax.length() > 0)
-            maxDBConnections = Integer.parseInt(handleMax);
-          _pool = new ConnectionPoolManager(maxDBConnections);
-          return _pool;
-        }
-        catch (Exception e)
-        {
-          throw new ManifoldCFException("Unable to initialize database handle pool: "+e.getMessage(),e,ManifoldCFException.SETUP_ERROR);
-        }
+        _pool = new ConnectionPoolManager(100);
+        return _pool;
       }
     }
 
@@ -235,6 +197,14 @@ public class ConnectionFactory
           return;
       }
 
+      // Cleanup strategy: Some connections are still in use because they are being
+      // used by non-worker threads that have been interrupted but haven't yet died.
+      // Cleaning these up is a challenge.  For now I won't address this.
+      
+      _pool.shutdown();
+    }
+      
+      /*
       // Cleanup strategy is to close everything that can easily be closed, but leave around connections that are so busy that they will not close within a certain amount of
       // time.  To do that, we spin up a thread for each connection, which attempts to close that connection, and then wait until either 15 seconds passes, or all the threads
       // are finished.
@@ -244,7 +214,7 @@ public class ConnectionFactory
       // This is not ideal, but is a compromise designed to permit speedy and relatively clean shutdown even under
       // difficult conditions.
 
-
+      
       Enumeration enumeration = _pool.getPools();
       ArrayList connectionShutdownThreads = new ArrayList();
       while (enumeration.hasMoreElements())
@@ -305,7 +275,7 @@ public class ConnectionFactory
 
       // Some threads may still be running - but that can't be helped.
     }
-
+    */
 
     // Protected methods and classes
 
@@ -315,6 +285,7 @@ public class ConnectionFactory
     * will be blocked from proceeding under Tomcat 5.5.  Between the two, however,
     * there's hope that the right things will take place.
     */
+    /*
     protected void finalize()
       throws Throwable
     {
@@ -328,8 +299,10 @@ public class ConnectionFactory
         super.finalize();
       }
     }
+    */
   }
 
+  /*
   protected static class ConnectionCloseThread extends Thread
   {
     protected com.bitmechanic.sql.PooledConnection connection;
@@ -361,7 +334,8 @@ public class ConnectionFactory
     }
 
   }
-
+  */
+  
   protected static class ConnectionTracker
   {
     protected Connection theConnection;

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java Thu May 10 23:45:49 2012
@@ -1388,7 +1388,7 @@ public class DBInterfaceDerby extends Da
     case TRANSACTION_READCOMMITTED:
       try
       {
-        executeViaThread(connection,"SET ISOLATION READ COMMITTED",null,false,0,null,null);
+        executeViaThread((connection==null)?null:connection.getConnection(),"SET ISOLATION READ COMMITTED",null,false,0,null,null);
       }
       catch (Error e)
       {
@@ -1407,7 +1407,7 @@ public class DBInterfaceDerby extends Da
     case TRANSACTION_SERIALIZED:
       try
       {
-        executeViaThread(connection,"SET ISOLATION SERIALIZABLE",null,false,0,null,null);
+        executeViaThread((connection==null)?null:connection.getConnection(),"SET ISOLATION SERIALIZABLE",null,false,0,null,null);
       }
       catch (Error e)
       {
@@ -1475,7 +1475,7 @@ public class DBInterfaceDerby extends Da
     {
       try
       {
-        connection.setAutoCommit(false);
+        connection.getConnection().setAutoCommit(false);
       }
       catch (java.sql.SQLException e)
       {
@@ -1498,8 +1498,8 @@ public class DBInterfaceDerby extends Da
         {
           if (connection != null)
           {
-            connection.commit();
-            connection.setAutoCommit(true);
+            connection.getConnection().commit();
+            connection.getConnection().setAutoCommit(true);
           }
         }
         catch (java.sql.SQLException e)
@@ -1526,8 +1526,8 @@ public class DBInterfaceDerby extends Da
         {
           if (connection != null)
           {
-            connection.rollback();
-            connection.setAutoCommit(true);
+            connection.getConnection().rollback();
+            connection.getConnection().setAutoCommit(true);
           }
         }
         catch (java.sql.SQLException e)

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java Thu May 10 23:45:49 2012
@@ -1374,8 +1374,8 @@ public class DBInterfaceHSQLDB extends D
     {
       try
       {
-        connection.setAutoCommit(false);
-        connection.setTransactionIsolation(desiredTransactionType);
+        connection.getConnection().setAutoCommit(false);
+        connection.getConnection().setTransactionIsolation(desiredTransactionType);
       }
       catch (java.sql.SQLException e)
       {
@@ -1398,8 +1398,8 @@ public class DBInterfaceHSQLDB extends D
         {
           if (connection != null)
           {
-            connection.commit();
-            connection.setAutoCommit(true);
+            connection.getConnection().commit();
+            connection.getConnection().setAutoCommit(true);
           }
         }
         catch (java.sql.SQLException e)
@@ -1426,8 +1426,8 @@ public class DBInterfaceHSQLDB extends D
         {
           if (connection != null)
           {
-            connection.rollback();
-            connection.setAutoCommit(true);
+            connection.getConnection().rollback();
+            connection.getConnection().setAutoCommit(true);
           }
         }
         catch (java.sql.SQLException e)

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java Thu May 10 23:45:49 2012
@@ -1018,7 +1018,7 @@ public class DBInterfaceMySQL extends Da
   {
     try
     {
-      executeViaThread(connection,"START TRANSACTION",null,false,0,null,null);
+      executeViaThread(connection.getConnection(),"START TRANSACTION",null,false,0,null,null);
     }
     catch (ManifoldCFException e)
     {
@@ -1032,7 +1032,7 @@ public class DBInterfaceMySQL extends Da
   {
     try
     {
-      executeViaThread(connection,"COMMIT",null,false,0,null,null);
+      executeViaThread(connection.getConnection(),"COMMIT",null,false,0,null,null);
     }
     catch (ManifoldCFException e)
     {
@@ -1046,7 +1046,7 @@ public class DBInterfaceMySQL extends Da
   {
     try
     {
-      executeViaThread(connection,"ROLLBACK",null,false,0,null,null);
+      executeViaThread(connection.getConnection(),"ROLLBACK",null,false,0,null,null);
     }
     catch (ManifoldCFException e)
     {

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java Thu May 10 23:45:49 2012
@@ -1148,7 +1148,7 @@ public class DBInterfacePostgreSQL exten
   {
     try
     {
-      executeViaThread(connection,"START TRANSACTION",null,false,0,null,null);
+      executeViaThread((connection==null)?null:connection.getConnection(),"START TRANSACTION",null,false,0,null,null);
     }
     catch (ManifoldCFException e)
     {
@@ -1162,7 +1162,7 @@ public class DBInterfacePostgreSQL exten
   {
     try
     {
-      executeViaThread(connection,"COMMIT",null,false,0,null,null);
+      executeViaThread((connection==null)?null:connection.getConnection(),"COMMIT",null,false,0,null,null);
     }
     catch (ManifoldCFException e)
     {
@@ -1177,7 +1177,7 @@ public class DBInterfacePostgreSQL exten
   {
     try
     {
-      executeViaThread(connection,"ROLLBACK",null,false,0,null,null);
+      executeViaThread((connection==null)?null:connection.getConnection(),"ROLLBACK",null,false,0,null,null);
     }
     catch (ManifoldCFException e)
     {

Modified: incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java (original)
+++ incubator/lcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/database/Database.java Thu May 10 23:45:49 2012
@@ -19,6 +19,7 @@
 package org.apache.manifoldcf.core.database;
 
 import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.core.jdbcpool.*;
 import org.apache.manifoldcf.core.system.Logging;
 import org.apache.manifoldcf.core.system.ManifoldCF;
 
@@ -45,7 +46,7 @@ public abstract class Database
   protected String userName;
   protected String password;
   protected TransactionHandle th = null;
-  protected Connection connection = null;
+  protected WrappedConnection connection = null;
   protected boolean doRollback = false;
   protected boolean commitDone = false;
   protected int delayedTransactionDepth = 0;
@@ -250,7 +251,7 @@ public abstract class Database
       try
       {
         // Initialize the connection (for HSQLDB)
-        initializeConnection(connection);
+        initializeConnection(connection.getConnection());
         // Start a transaction
         startATransaction();
       }
@@ -705,7 +706,7 @@ public abstract class Database
     {
       try
       {
-        return executeViaThread(connection,query,params,bResults,maxResults,spec,returnLimit);
+        return executeViaThread(connection.getConnection(),query,params,bResults,maxResults,spec,returnLimit);
       }
       catch (ManifoldCFException e)
       {
@@ -718,12 +719,12 @@ public abstract class Database
     else
     {
       // Grab a connection
-      Connection tempConnection = ConnectionFactory.getConnection(jdbcUrl,jdbcDriverClass,databaseName,userName,password);
+      WrappedConnection tempConnection = ConnectionFactory.getConnection(jdbcUrl,jdbcDriverClass,databaseName,userName,password);
       try
       {
         // Initialize the connection (for HSQLDB)
-        initializeConnection(tempConnection);
-        return executeViaThread(tempConnection,query,params,bResults,maxResults,spec,returnLimit);
+        initializeConnection(tempConnection.getConnection());
+        return executeViaThread(tempConnection.getConnection(),query,params,bResults,maxResults,spec,returnLimit);
       }
       catch (ManifoldCFException e)
       {

Modified: incubator/lcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/lib-license/LICENSE.txt?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/lib-license/LICENSE.txt (original)
+++ incubator/lcf/trunk/lib-license/LICENSE.txt Thu May 10 23:45:49 2012
@@ -201,9 +201,6 @@ License: BSD License (http://jdbc.postgr
 This product includes a JUnit jar: http://junit.sourceforge.net/
 License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
 
-This product includes a jdbcpool-0.99.jar.
-License: Apache Software Foundation - v 1.1
-
 This product includes an eclipse-ecj.jar.
 License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html)
 
@@ -561,65 +558,6 @@ resulting litigation.
 
 
 ==========================================================================
-The following license applies to jdbcpool-0.99.jar
---------------------------------------------------------------------------
-The Apache Software License, Version 1.1
-
-Copyright (c) 2000 The Apache Software Foundation.  All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-3. The end-user documentation included with the redistribution,
-   if any, must include the following acknowledgment:
-      "This product includes software developed by the
-       Apache Software Foundation (http://www.apache.org/)."
-   Alternately, this acknowledgment may appear in the software itself,
-   if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Apache" and "Apache Software Foundation" must
-   not be used to endorse or promote products derived from this
-   software without prior written permission. For written
-   permission, please contact apache@apache.org.
-
-5. Products derived from this software may not be called "Apache",
-   nor may "Apache" appear in their name, without prior written
-   permission of the Apache Software Foundation.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation.  For more
-information on the Apache Software Foundation, please see
-<http://www.apache.org/>.
-
-Portions of this software are based upon public domain software
-originally written at the National Center for Supercomputing Applications,
-University of Illinois, Urbana-Champaign.
-
-==========================================================================
 The following license applies to eclipse-ecj.jar, and
 h2-1.3.158.jar:
 --------------------------------------------------------------------------

Modified: incubator/lcf/trunk/tests/test-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/test-build.xml?rev=1336965&r1=1336964&r2=1336965&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/test-build.xml (original)
+++ incubator/lcf/trunk/tests/test-build.xml Thu May 10 23:45:49 2012
@@ -43,7 +43,6 @@
             <include name="jasper*.jar"/>
             <include name="jetty*.jar"/>
             <include name="slf4j*.jar"/>
-            <include name="jdbcpool*.jar"/>
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>



Mime
View raw message