svn commit: r171242 - in /incubator/derby/code/trunk/java/client/org/apache/derby: client/ClientBaseDataSource.java client/ClientDataSourceFactory.java client/am/Configuration.java client/net/NetConnection.java jdbc/ClientBaseDataSource.java jdbc/ClientDataSource.java

[jb...@apache.org]

Author: jboynes
Date: Sat May 21 12:39:36 2005
New Revision: 171242

URL: http://svn.apache.org/viewcvs?rev=171242&view=rev
Log:
move ClientBaseDataSource to jdbc package so properties can be included in API JavaDoc

Added:
    incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java
      - copied, changed from r169699, incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientBaseDataSource.java
Removed:
    incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientBaseDataSource.java
Modified:
    incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientDataSourceFactory.java
    incubator/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
    incubator/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
    incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java

Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientDataSourceFactory.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientDataSourceFactory.java?rev=171242&r1=171241&r2=171242&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientDataSourceFactory.java (original)
+++ incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientDataSourceFactory.java Sat May 21 12:39:36 2005
@@ -43,7 +43,6 @@
  * @see ClientDataSource
  */
 public class ClientDataSourceFactory implements javax.naming.spi.ObjectFactory {
-    static final String className__ = "org.apache.derby.jdbc.ClientDataSourceFactory";
 
     public ClientDataSourceFactory() {
     }

Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java?rev=171242&r1=171241&r2=171242&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java (original)
+++ incubator/derby/code/trunk/java/client/org/apache/derby/client/am/Configuration.java Sat May 21 12:39:36 2005
@@ -33,7 +33,7 @@
 
     public static int traceFileSuffixIndex__ = 0;
 
-    public static int traceLevel__ = org.apache.derby.client.ClientBaseDataSource.TRACE_ALL;
+    public static int traceLevel__ = org.apache.derby.jdbc.ClientBaseDataSource.TRACE_ALL;
 
     public static String traceFile__ = null;
 

Modified: incubator/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=171242&r1=171241&r2=171242&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original)
+++ incubator/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Sat May 21 12:39:36 2005
@@ -19,7 +19,7 @@
 */
 package org.apache.derby.client.net;
 
-import org.apache.derby.client.ClientBaseDataSource;
+import org.apache.derby.jdbc.ClientBaseDataSource;
 import org.apache.derby.client.am.CallableStatement;
 import org.apache.derby.client.am.DatabaseMetaData;
 import org.apache.derby.client.am.DisconnectException;

Copied: incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java (from r169699, incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientBaseDataSource.java)
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java?p2=incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java&p1=incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientBaseDataSource.java&r1=169699&r2=171242&rev=171242&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/client/org/apache/derby/client/ClientBaseDataSource.java (original)
+++ incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Sat May 21 12:39:36 2005
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.client.ClientBaseDataSource
+   Derby - Class org.apache.derby.jdbc.ClientBaseDataSource
 
    Copyright (c) 2001, 2005 The Apache Software Foundation or its licensors, where applicable.
 
@@ -18,7 +18,7 @@
 
 */
 
-package org.apache.derby.client;
+package org.apache.derby.jdbc;
 
 import java.io.Serializable;
 import java.io.PrintWriter;
@@ -43,6 +43,7 @@
 import org.apache.derby.client.am.Connection;
 import org.apache.derby.client.net.NetConfiguration;
 import org.apache.derby.client.net.NetLogWriter;
+import org.apache.derby.client.ClientDataSourceFactory;
 
 /**
  * Base class for client-side DataSource implementations.
@@ -317,7 +318,7 @@
         // in the reference using the StringRefAddr class.
         // This is all the information needed to reconstruct a ClientBaseDataSource object.
 
-        Reference ref = new Reference(this.getClass().getName(), ClientDataSourceFactory.className__, null);
+        Reference ref = new Reference(this.getClass().getName(), ClientDataSourceFactory.class.getName(), null);
 
         Class clz = getClass();
         Field[] fields = clz.getFields();

Modified: incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java?rev=171242&r1=171241&r2=171242&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java (original)
+++ incubator/derby/code/trunk/java/client/org/apache/derby/jdbc/ClientDataSource.java Sat May 21 12:39:36 2005
@@ -24,7 +24,6 @@
 import java.sql.SQLException;
 import javax.sql.DataSource;
 
-import org.apache.derby.client.ClientBaseDataSource;
 import org.apache.derby.client.am.LogWriter;
 import org.apache.derby.client.net.NetConnection;
 import org.apache.derby.client.net.NetLogWriter;