You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2005/05/11 21:41:08 UTC
svn commit: r169684 [1/3] - in /incubator/derby/code/trunk/java:
drda/org/apache/derby/drda/ drda/org/apache/derby/impl/drda/
engine/org/apache/derby/iapi/jdbc/
Author: kmarsden
Date: Wed May 11 12:40:57 2005
New Revision: 169684
URL: http://svn.apache.org/viewcvs?rev=169684&view=rev
Log:
Rename DB2jServerImpl.java to NetworkServer
contributed by Dag Wanvik
Modified:
incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=169684&r1=169683&r2=169684&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Wed May 11 12:40:57 2005
@@ -26,7 +26,7 @@
import java.util.Properties;
import org.apache.derby.iapi.reference.Property;
-import org.apache.derby.impl.drda.DB2jServerImpl;
+import org.apache.derby.impl.drda.NetworkServerControlImpl;
/**
NetworkServerControl provides the ability to start a Network Server or
@@ -166,7 +166,7 @@
public final static int DEFAULT_PORTNUMBER = 1527;
- private DB2jServerImpl serverImpl;
+ private NetworkServerControlImpl serverImpl;
// constructor
@@ -194,7 +194,7 @@
public NetworkServerControl(InetAddress address,int portNumber) throws Exception
{
- serverImpl = new DB2jServerImpl(address,
+ serverImpl = new NetworkServerControlImpl(address,
portNumber);
}
@@ -219,7 +219,7 @@
public NetworkServerControl() throws Exception
{
- serverImpl = new DB2jServerImpl();
+ serverImpl = new NetworkServerControlImpl();
}
@@ -231,7 +231,7 @@
* See class comments for more information
*/
public static void main(String args[]) {
- DB2jServerImpl.execute(args);
+ NetworkServerControlImpl.execute(args);
}
Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=169684&r1=169683&r2=169684&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/ClientThread.java Wed May 11 12:40:57 2005
@@ -26,22 +26,22 @@
class ClientThread extends Thread {
- DB2jServerImpl parent;
+ NetworkServerControlImpl parent;
ServerSocket serverSocket;
private int timeSlice;
private int connNum;
private String traceDir;
private boolean traceAll;
- protected ClientThread (DB2jServerImpl dsi, ServerSocket ss) {
+ protected ClientThread (NetworkServerControlImpl nsi, ServerSocket ss) {
// Create a more meaningful name for this thread (but preserve its
// thread id from the default name).
- DB2jServerImpl.setUniqueThreadName(this, "NetworkServerThread");
+ NetworkServerControlImpl.setUniqueThreadName(this, "NetworkServerThread");
- parent=dsi;
+ parent=nsi;
serverSocket=ss;
- timeSlice=dsi.getTimeSlice();
+ timeSlice=nsi.getTimeSlice();
traceDir=parent.getTraceDirectory();
traceAll=parent.getTraceAll();
}