commonjava-developer — developers list.

[CJ-dev] commonjava-projects/commonjava-util project.xml,1.3,1.4

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22709

Modified Files:
	project.xml 
Log Message:
Added Objects utility class, to provide things like a safe version of the object equals() method.

Index: project.xml
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-util/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- project.xml	9 Jan 2004 05:08:59 -0000	1.3
+++ project.xml	2 Feb 2004 03:03:49 -0000	1.4
@@ -5,7 +5,7 @@
   <id>commonjava-util</id>
   <name>CommonJava General Utilities</name>
   <groupId>commonjava</groupId>
-  <currentVersion>2.0-2</currentVersion>
+  <currentVersion>2.0-3</currentVersion>
   <organization>
     <name>CommonJava Open Component Project</name>
     <url>http://www.commonjava.org</url>

[CJ-dev] commonjava-projects/commonjava-util/src/java/org/commonjava/util Objects.java,NONE,1.1

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-util/src/java/org/commonjava/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22709/src/java/org/commonjava/util

Added Files:
	Objects.java 
Log Message:
Added Objects utility class, to provide things like a safe version of the object equals() method.

--- NEW FILE: Objects.java ---
/* Created on Feb 1, 2004 */
package org.commonjava.util;

/**
 * @author jdcasey
 */
public final class Objects {

  /** Utilities class; deny construction.
   */
  private Objects() {
  }
  
  public static boolean safeEquals(Object primary, Object secondary){
    if(primary == secondary){return true;}
    else{
      return (primary != null && primary.equals(secondary));
    }
  }

}

[CJ-dev] commonjava-projects/commonjava-lang/src/java/org/commonjava/lang LongID.java,1.1,1.2 IntegerID.java,1.1,1.2 StringID.java,1.1,1.2

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29313/src/java/org/commonjava/lang

Modified Files:
	LongID.java IntegerID.java StringID.java 
Log Message:
umm...forgot that these other ID classes are abstract, and will need to have an implementation of the read/writeObject stuff, since the concrete implementations won't have access to the internal representation of the IDs.

Index: LongID.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang/LongID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LongID.java	18 Sep 2003 01:10:42 -0000	1.1
+++ LongID.java	2 Feb 2004 02:32:47 -0000	1.2
@@ -11,6 +11,9 @@
 
 package org.commonjava.lang;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 /** Identifier abstract implementation that encapsulates a long for the 
@@ -68,4 +71,19 @@
   public long getID(){
     return ID.longValue();
   }
+  
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.AbstractID#readObject(java.io.ObjectInputStream)
+   */
+  protected void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    this.ID = (Long)in.readObject();
+  }
+
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.AbstractID#writeObject(java.io.ObjectOutputStream)
+   */
+  protected void writeObject(ObjectOutputStream out) throws IOException {
+    out.writeObject(ID);
+  }
+
 }
\ No newline at end of file

Index: IntegerID.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang/IntegerID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- IntegerID.java	18 Sep 2003 01:10:42 -0000	1.1
+++ IntegerID.java	2 Feb 2004 02:32:47 -0000	1.2
@@ -11,6 +11,9 @@
 
 package org.commonjava.lang;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 /** Representation of an identifier (like a primary key or something) that uses
@@ -76,4 +79,18 @@
     this.ID = id;
   }
 
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.AbstractID#readObject(java.io.ObjectInputStream)
+   */
+  protected void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    this.ID = (Integer)in.readObject();
+  }
+
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.AbstractID#writeObject(java.io.ObjectOutputStream)
+   */
+  protected void writeObject(ObjectOutputStream out) throws IOException {
+    out.writeObject(ID);
+  }
+
 }
\ No newline at end of file

Index: StringID.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang/StringID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StringID.java	18 Sep 2003 01:10:42 -0000	1.1
+++ StringID.java	2 Feb 2004 02:32:47 -0000	1.2
@@ -11,6 +11,9 @@
 
 package org.commonjava.lang;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 public abstract class StringID extends AbstractID implements Serializable, Comparable
@@ -64,4 +67,19 @@
   public String getID(){
     return ID;
   }
+  
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.AbstractID#readObject(java.io.ObjectInputStream)
+   */
+  protected void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    this.ID = (String)in.readObject();
+  }
+
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.AbstractID#writeObject(java.io.ObjectOutputStream)
+   */
+  protected void writeObject(ObjectOutputStream out) throws IOException {
+    out.writeObject(ID);
+  }
+
 }
\ No newline at end of file

[CJ-dev] commonjava-projects/commonjava-lang/src/java/org/commonjava/lang DateID.java,1.1,1.2 CompoundID.java,1.1,1.2 AbstractID.java,1.1,1.2

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18825/src/java/org/commonjava/lang

Modified Files:
	DateID.java CompoundID.java AbstractID.java 
Log Message:
Made AbstractID and CompoundID serializable.

Index: DateID.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang/DateID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DateID.java	18 Sep 2003 01:10:42 -0000	1.1
+++ DateID.java	2 Feb 2004 02:20:35 -0000	1.2
@@ -17,6 +17,9 @@
 
 package org.commonjava.lang;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.Date;
 
 /** Identifier (as in primary key) that uses a java.util.Date as its internal 
@@ -127,5 +130,17 @@
   public String toString(){
     return "Date ID: " + String.valueOf(date);
   }
+
+  /** Deserialize this data ID.
+   */
+  protected void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+    this.date = (Date)in.readObject();
+  }
+
+  /** Serialize this data ID.
+   */
+  protected void writeObject(ObjectOutputStream out) throws IOException {
+    out.writeObject(date);
+  }
   
 }
\ No newline at end of file

Index: CompoundID.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang/CompoundID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CompoundID.java	18 Sep 2003 01:10:42 -0000	1.1
+++ CompoundID.java	2 Feb 2004 02:20:35 -0000	1.2
@@ -17,12 +17,17 @@
 
 package org.commonjava.lang;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
 /** Container to wrapper identifiers that are made of multiple other identifiers.
  *  This is like a primary key that is actually two fields in a database.
  *
  * @author  John Casey
  */
-public abstract class CompoundID extends AbstractID {
+public abstract class CompoundID extends AbstractID implements Serializable{
   
   private AbstractID[] ids;
 
@@ -58,4 +63,21 @@
    */
   public abstract int hashCode();
   
+  /** Deserailize the ids which compose this compound id instance.
+   * 
+   */
+  protected void readObject(ObjectInputStream in) 
+  throws IOException, ClassNotFoundException
+  {
+    this.ids = (AbstractID[])in.readObject();
+  }
+  
+  /** Serailize the ids which compose this compound id instance.
+   * 
+   */
+  protected void writeObject(ObjectOutputStream out) 
+  throws IOException
+  {
+    out.writeObject(ids);
+  }
 }
\ No newline at end of file

Index: AbstractID.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/src/java/org/commonjava/lang/AbstractID.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AbstractID.java	18 Sep 2003 01:10:42 -0000	1.1
+++ AbstractID.java	2 Feb 2004 02:20:35 -0000	1.2
@@ -11,6 +11,9 @@
 
 package org.commonjava.lang;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 /**
@@ -68,4 +71,21 @@
 	 * @return Object  a primitive type wrapper
 	 */
 	public abstract Object getValue();
+  
+  /** Deserialize this abstract id implementation.
+   * 
+   * @param in The input stream from which to deserialize
+   * @throws IOException in case of an error reading from the stream
+   * @throws ClassNotFoundException in case of an error instantiating any member variables.
+   */
+  protected abstract void readObject(ObjectInputStream in) 
+  throws IOException, ClassNotFoundException;
+  
+  /** Serialize this abstract id implementation.
+   * 
+   * @param out the output stream to which this id should be serialized.
+   * @throws IOException in case of any errors writing to the output stream.
+   */
+  protected abstract void writeObject(ObjectOutputStream out)
+  throws IOException;
 }
\ No newline at end of file

[CJ-dev] commonjava-projects/commonjava-lang project.xml,1.1,1.2

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18825

Modified Files:
	project.xml 
Log Message:
Made AbstractID and CompoundID serializable.

Index: project.xml
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-lang/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- project.xml	18 Sep 2003 01:10:42 -0000	1.1
+++ project.xml	2 Feb 2004 02:20:35 -0000	1.2
@@ -5,7 +5,7 @@
   <id>commonjava-lang</id>
   <name>CommonJava Common Language Elements</name>
   <groupId>commonjava</groupId>
-  <currentVersion>2.0</currentVersion>
+  <currentVersion>2.0-1</currentVersion>
   <organization>
     <name>CommonJava Open Component Project</name>
     <url>http://www.commonjava.org</url>

[CJ-dev] commonjava-projects/commonjava-datasrc .classpath,1.4,1.5 project.xml,1.2,1.3

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8549

Modified Files:
	.classpath project.xml 
Log Message:
added unit test for connection pool by itself, using hsqldb.

Isolated the ConnectionPool to allow for single-pool direct
instantiations, instead of always having to work through the
manager...also improved the user/password logic for 
connection instantiation.

Index: .classpath
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/.classpath,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .classpath	20 Jan 2004 04:42:41 -0000	1.4
+++ .classpath	29 Jan 2004 03:54:32 -0000	1.5
@@ -10,5 +10,6 @@
     <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-io-2.0.jar"/>
     <classpathentry kind="var" path="MAVEN_REPO/commonjava/jars/commonjava-reflection-2.0.jar"/>
     <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar"/>
+    <classpathentry kind="var" path="MAVEN_REPO/hsqldb/jars/hsqldb-1.7.1.jar"/>
     <classpathentry kind="output" path="target/classes"/>
 </classpath>

Index: project.xml
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- project.xml	20 Jan 2004 04:42:41 -0000	1.2
+++ project.xml	29 Jan 2004 03:54:32 -0000	1.3
@@ -5,7 +5,7 @@
   <id>commonjava-datasrc</id>
   <name>CommonJava Data Source Objects</name>
   <groupId>commonjava</groupId>
-  <currentVersion>2.1</currentVersion>
+  <currentVersion>2.1-1</currentVersion>
   <organization>
     <name>CommonJava Open Component Project</name>
     <url>http://www.commonjava.org</url>
@@ -50,6 +50,12 @@
     </dependency>
 
     <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.7.1</version>
+    </dependency>
+
+    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.3</version>

[CJ-dev] commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql/config PoolConnectionInfo.java,1.1,1.2

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8549/src/java/org/commonjava/datasrc/sql/config

Modified Files:
	PoolConnectionInfo.java 
Log Message:
added unit test for connection pool by itself, using hsqldb.

Isolated the ConnectionPool to allow for single-pool direct
instantiations, instead of always having to work through the
manager...also improved the user/password logic for 
connection instantiation.

Index: PoolConnectionInfo.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql/config/PoolConnectionInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PoolConnectionInfo.java	20 Jan 2004 04:42:41 -0000	1.1
+++ PoolConnectionInfo.java	29 Jan 2004 03:54:31 -0000	1.2
@@ -16,6 +16,9 @@
 import java.sql.SQLException;
 import java.util.Properties;
 
+import org.commonjava.lang.Verifiable;
+import org.commonjava.util.Strings;
+
 /**
  * Contains database connection information attributes.
  *
@@ -25,10 +28,12 @@
  * @author James Lewis
  * @version 1.1
  */
-public class PoolConnectionInfo
+public class PoolConnectionInfo implements Verifiable
 {
   public static final int DEFAULT_MAX_SIZE = 10;
   public static final int DEFAULT_MIN_SIZE = 1;
+  public static final String USER_PROPERTY = "user";
+  public static final String PASSWORD_PROPERTY = "password"; 
   
   private String name;
 	private String driverName;
@@ -235,4 +240,11 @@
   public void setUser(String user) {
     this.user = user;
   }
+
+  /* (non-Javadoc)
+   * @see org.commonjava.lang.Verifiable#verifyValid()
+   */
+  public boolean verifyValid() {
+    return !Strings.empty(name) && !Strings.empty(driverName) && !Strings.empty(url);
+  }
 }
\ No newline at end of file

[CJ-dev] commonjava-projects/commonjava-datasrc/src/test testpool.xml,NONE,1.1

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8549/src/test

Added Files:
	testpool.xml 
Log Message:
added unit test for connection pool by itself, using hsqldb.

Isolated the ConnectionPool to allow for single-pool direct
instantiations, instead of always having to work through the
manager...also improved the user/password logic for 
connection instantiation.

--- NEW FILE: testpool.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<test xmlns="opl:test" xmlns:p="opl:properties" xmlns:ds="opl:datasrc">
    <sqlPool xmlns="opl:datasrc" name="testPool"
                                 driver="org.hsqldb.jdbcDriver"
                                 url="jdbc:hsqldb:testdb"
                                 user="sa"/>
</test>

[CJ-dev] commonjava-projects/commonjava-diff/src/java/org/commonjava/diff DiffOperation.java,1.2,1.3

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-diff/src/java/org/commonjava/diff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8299/src/java/org/commonjava/diff

Modified Files:
	DiffOperation.java 
Log Message:
made the DiffOperation serializable.

Index: DiffOperation.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-diff/src/java/org/commonjava/diff/DiffOperation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DiffOperation.java	22 Jan 2004 05:39:58 -0000	1.2
+++ DiffOperation.java	29 Jan 2004 03:52:47 -0000	1.3
@@ -30,6 +30,8 @@
  */
 public final class DiffOperation implements Comparable, Serializable{
   
+  static long serialVersionUID = 1;
+  
   private static final Log LOG = LogFactory.getLog(DiffOperation.class);
   
   private int offset;

[CJ-dev] commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql ConnectionPool.java,1.2,1.3 ConnectionPoolManager.java,1.2,1.3

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8549/src/java/org/commonjava/datasrc/sql

Modified Files:
	ConnectionPool.java ConnectionPoolManager.java 
Log Message:
added unit test for connection pool by itself, using hsqldb.

Isolated the ConnectionPool to allow for single-pool direct
instantiations, instead of always having to work through the
manager...also improved the user/password logic for 
connection instantiation.

Index: ConnectionPool.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql/ConnectionPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ConnectionPool.java	20 Jan 2004 04:42:41 -0000	1.2
+++ ConnectionPool.java	29 Jan 2004 03:54:30 -0000	1.3
@@ -25,6 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.commonjava.datasrc.sql.config.*;
+import org.commonjava.util.Strings;
 import org.commonjava.util.pool.VolatileObject;
 import org.commonjava.util.pool.VolatileObjectPool;
 
@@ -66,7 +67,7 @@
 	 *
 	 * @param PoolConnectionInfo  the connection information
 	 */
-	ConnectionPool(PoolConnectionInfo connInfo) throws ConnectionPoolException
+	public ConnectionPool(PoolConnectionInfo connInfo) throws ConnectionPoolException
 	{
 		String driverName = connInfo.getDriverName();
 
@@ -103,7 +104,7 @@
 	 * @throws ConnectionPoolException  if there are not valid connections
 	 *    and a new connection could not be established.
 	 */
-	Connection getConnection() throws ConnectionPoolException
+	public Connection getConnection() throws ConnectionPoolException
 	{
 		try
 		{
@@ -182,10 +183,29 @@
 
 		public ReusableConnection() throws SQLException
 		{
-			conn = DriverManager.getConnection(
-				connInfo.getUrl(),
-				connInfo.getProperties()
-			);
+      String user = connInfo.getUser();
+      if(user == null){
+        user = connInfo.getProperties().getProperty(PoolConnectionInfo.USER_PROPERTY);
+      }
+      
+      String password = connInfo.getPassword();
+      if(password == null){
+        password = connInfo.getProperties().getProperty(PoolConnectionInfo.PASSWORD_PROPERTY);
+      }
+      
+      if(!Strings.empty(user)){
+        conn = DriverManager.getConnection(
+          connInfo.getUrl(),
+          user,
+          password
+        );
+      }
+      else{
+        conn = DriverManager.getConnection(
+          connInfo.getUrl(),
+          connInfo.getProperties()
+        );
+      }
 		}
     
     private Connection getConnection(){

Index: ConnectionPoolManager.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/java/org/commonjava/datasrc/sql/ConnectionPoolManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ConnectionPoolManager.java	20 Jan 2004 04:42:41 -0000	1.2
+++ ConnectionPoolManager.java	29 Jan 2004 03:54:30 -0000	1.3
@@ -11,17 +11,13 @@
 
 package org.commonjava.datasrc.sql;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.commonjava.datasrc.sql.config.*;
+import org.commonjava.datasrc.sql.config.PoolConnectionInfo;
 
 /**
  * Create and manage all ConnectionPools.  ConnectionPool datasources
@@ -80,79 +76,28 @@
 	 * @return Connection  a database connection
 	 * @throws ConnectionPoolException  if a connection could not be established
 	 */
-	public synchronized Connection getConnection(String datasource)
+	public Connection getConnection(PoolConnectionInfo info)
 	throws ConnectionPoolException
 	{
     checkClosed();
     
-    ConnectionPool pool = (ConnectionPool)pools.get(datasource);
-
-    // if the pool is not already loaded, lazily create it
-    if(pool == null)
-    {
-      if(LOG.isDebugEnabled()){
-        LOG.debug("initializing pools");
-      }
+    ConnectionPool pool = null;
+    synchronized(pools){
+      pool = (ConnectionPool)pools.get(info);
       
-      // use the classloader to find the file in the classpath
-      ClassLoader cl = this.getClass().getClassLoader();
-      InputStream in = cl.getResourceAsStream(PERSISTENT_PROPERTIES);
-
-      if(in == null)
-      {
-        throw new ConnectionPoolException(
-          "fail to find " + PERSISTENT_PROPERTIES + " in the classpath"
-        );
-      }
-
-      try
+      // if the pool is not already loaded, lazily create it
+      if(pool == null)
       {
-        Properties properties = new Properties();
-        properties.load(in);
-
-        String key = CONN_POOL_DATASOURCE + "." + datasource;
-
-        String connProp = properties.getProperty(key);
-
-        if(connProp == null)
-          throw new ConnectionPoolException("No " + key + " found in " + PERSISTENT_PROPERTIES);
-
-        PoolConnectionInfo connInfo = new PoolConnectionInfo(connProp);
-
         if(LOG.isDebugEnabled()){
-          LOG.debug("creating connection pool");
-        }
-        
-        pool = new ConnectionPool(connInfo);
-        pools.put(datasource, pool);
-      }
-      catch(SQLException ex)
-      {
-        throw new ConnectionPoolException(
-          "Unexpected SQLException",
-          ex
-        );
-      }
-      catch(IOException ex)
-      {
-        throw new ConnectionPoolException(
-          "Failed to read " + PERSISTENT_PROPERTIES,
-          ex
-        );
-      }
-      finally
-      {
-        try
-        {
-          if(in != null)
-            in.close();
-        }
-        catch(IOException ignore)
-        {
+          LOG.debug("initializing pool for " + info.getName());
         }
+      
+        pool = new ConnectionPool(info);
+        pools.put(info, pool);
       }
     }
 
+
     if(LOG.isDebugEnabled()){
       LOG.debug("retrieving connection from pool");
     }
@@ -198,7 +143,8 @@
 
 		for(Iterator iter = pools.keySet().iterator(); iter.hasNext();)
 		{
-			String key = (String)iter.next();
+      PoolConnectionInfo info = (PoolConnectionInfo)iter.next();
+			String key = (String)info.getName();
 			buffer.append("datasource=");
 			buffer.append(key);
 			buffer.append("\n");

[CJ-dev] commonjava-projects/commonjava-datasrc/src/test/org/commonjava/datasrc/sql ConnectionPoolTest.java,NONE,1.1

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-datasrc/src/test/org/commonjava/datasrc/sql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8549/src/test/org/commonjava/datasrc/sql

Added Files:
	ConnectionPoolTest.java 
Log Message:
added unit test for connection pool by itself, using hsqldb.

Isolated the ConnectionPool to allow for single-pool direct
instantiations, instead of always having to work through the
manager...also improved the user/password logic for 
connection instantiation.

--- NEW FILE: ConnectionPoolTest.java ---
/* Created on Jan 28, 2004 */
package org.commonjava.datasrc.sql;

import java.sql.Connection;

import org.commonjava.datasrc.sql.config.PoolConnectionInfo;
import org.commonjava.opl.DocumentDriver;
import org.commonjava.opl.OPLEngine;
import org.commonjava.opl.ParseException;

import junit.framework.TestCase;

/**
 * @author jdcasey
 */
public class ConnectionPoolTest extends TestCase {

  /**
   * Constructor for ConnectionPoolTest.
   * @param arg0
   */
  public ConnectionPoolTest(String arg0) {
    super(arg0);
  }

  public void testGetConnection() throws ParseException, ConnectionPoolException {
    DocumentDriver driver = new DocumentDriver();
    PoolConnectionInfo info = (PoolConnectionInfo)OPLEngine.getInstance(driver).parse(
      "cprs:///testpool.xml"
    );
    
    ConnectionPool pool = new ConnectionPool(info);
    Connection conn = pool.getConnection();
  }

}

[CJ-dev] CVSROOT loginfo,1.2,1.3

[<joh...@co...>]

Update of /cvsroot/commonjava/CVSROOT
In directory sc8-pr-cvs1:/tmp/cvs-serv19855

Modified Files:
	loginfo 
Log Message:
why...won't...this...wig...come...off!!!!

Index: loginfo
===================================================================
RCS file: /cvsroot/commonjava/CVSROOT/loginfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- loginfo	22 Jan 2004 06:01:20 -0000	1.2
+++ loginfo	22 Jan 2004 06:04:11 -0000	1.3
@@ -25,4 +25,4 @@
 # or
 #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
 
-ALL /cvsroot/sitedocs/CVSROOT/cvstools/syncmail --cvsroot=/cvsroot/commonjava -u -f commonjava.org %{sVv} com...@li...
+ALL /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -u -f commonjava.org %{sVv} com...@li...

[CJ-dev] commonjava-projects/commonjava-diff project.xml,1.3,1.4

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-diff
In directory sc8-pr-cvs1:/tmp/cvs-serv19554

Modified Files:
	project.xml 
Log Message:
trivial change to test syncmail.

Index: project.xml
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-diff/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- project.xml	22 Jan 2004 05:49:17 -0000	1.3
+++ project.xml	22 Jan 2004 06:02:11 -0000	1.4
@@ -12,6 +12,7 @@
   </organization>
   <inceptionYear>2002</inceptionYear>
   <package>org.commonjava.diff</package>
+  
   <dependencies>
     <dependency>
       <groupId>commonjava</groupId>

[CJ-dev] %s

[<joh...@co...>]

[CJ-dev] %s

[<joh...@co...>]

[CJ-dev] hello (also: CVS access)

[John C. <jd...@00...>]

just wondering how everything is going for all the commonjava
groupies...I don't mind if you haven't had time to work on the project,
that's not why I'm sending this...

What I do want to ask is this:  Are you having trouble with anything? 
CVS access, etc?

Please let me know if there is anything I can do to support you.  I know
this codebase like the back of my hand, and should be able to guide you
through anything like that.  I don't know SF as well, but I will
definitely find the answers if I can. :)

Later,
John