You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2003/10/13 19:23:47 UTC

cvs commit: jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/datasources PerUserPoolDataSourceFactory.java SharedPoolDataSourceFactory.java

dirkv       2003/10/13 10:23:47

  Modified:    dbcp/src/java/org/apache/commons/dbcp/datasources
                        PerUserPoolDataSourceFactory.java
                        SharedPoolDataSourceFactory.java
  Log:
  fix license
  remove unused imports
  
  Revision  Changes    Path
  1.2       +6 -12     jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSourceFactory.java
  
  Index: PerUserPoolDataSourceFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSourceFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PerUserPoolDataSourceFactory.java	13 Oct 2003 05:06:00 -0000	1.1
  +++ PerUserPoolDataSourceFactory.java	13 Oct 2003 17:23:47 -0000	1.2
  @@ -26,8 +26,8 @@
    *    any, must include the following acknowledgement:
    *       "This product includes software developed by the
    *        Apache Software Foundation - http://www.apache.org/"
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  + *    Alternately, this acknowledgement may appear in the software itself,
  + *    if and wherever such third-party acknowledgements normally appear.
    *
    * 4. The names "The Jakarta Project", "Commons", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  @@ -36,7 +36,7 @@
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  + *    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
  @@ -62,16 +62,10 @@
   package org.apache.commons.dbcp.datasources;
   
   import java.io.IOException;
  -import java.util.Hashtable;
   import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Iterator;
   
  -import javax.naming.Context;
  -import javax.naming.Name;
   import javax.naming.RefAddr;
   import javax.naming.Reference;
  -import javax.naming.spi.ObjectFactory;
   
   /**
    * A JNDI ObjectFactory which creates <code>SharedPoolDataSource</code>s
  
  
  
  1.2       +6 -14     jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSourceFactory.java
  
  Index: SharedPoolDataSourceFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSourceFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SharedPoolDataSourceFactory.java	13 Oct 2003 05:06:00 -0000	1.1
  +++ SharedPoolDataSourceFactory.java	13 Oct 2003 17:23:47 -0000	1.2
  @@ -26,8 +26,8 @@
    *    any, must include the following acknowledgement:
    *       "This product includes software developed by the
    *        Apache Software Foundation - http://www.apache.org/"
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  + *    Alternately, this acknowledgement may appear in the software itself,
  + *    if and wherever such third-party acknowledgements normally appear.
    *
    * 4. The names "The Jakarta Project", "Commons", and "Apache Software
    *    Foundation" must not be used to endorse or promote products derived
  @@ -36,7 +36,7 @@
    *
    * 5. Products derived from this software may not be called "Apache"
    *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  + *    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
  @@ -61,16 +61,8 @@
   
   package org.apache.commons.dbcp.datasources;
   
  -import java.util.Hashtable;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -
  -import javax.naming.Context;
  -import javax.naming.Name;
   import javax.naming.RefAddr;
   import javax.naming.Reference;
  -import javax.naming.spi.ObjectFactory;
   
   /**
    * A JNDI ObjectFactory which creates <code>SharedPoolDataSource</code>s
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org