svn commit: r1026712 - in /incubator/thrift/trunk/lib/java/test/org/apache/thrift/test: TestNonblockingServer.java TestServer.java

[roger]

Author: roger
Date: Sat Oct 23 23:35:46 2010
New Revision: 1026712

URL: http://svn.apache.org/viewvc?rev=1026712&view=rev
Log:
THRIFT-960 update to use AbstractServerArgs 

Modified:
    
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
    incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestServer.java

Modified: 
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java?rev=1026712&r1=1026711&r2=1026712&view=diff
==============================================================================
--- 
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
 (original)
+++ 
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
 Sat Oct 23 23:35:46 2010
@@ -22,6 +22,7 @@ package org.apache.thrift.test;
 import org.apache.thrift.server.THsHaServer;
 import org.apache.thrift.server.TNonblockingServer;
 import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.THsHaServer.Args;
 import org.apache.thrift.transport.TNonblockingServerSocket;
 import org.apache.thrift.server.ServerTestBase.TestHandler;
 
@@ -57,10 +58,10 @@ public class TestNonblockingServer exten
 
       if (hsha) {
         // HsHa Server
-        serverEngine = new THsHaServer(testProcessor, tServerSocket);
+        serverEngine = new THsHaServer(new 
Args(tServerSocket).processor(testProcessor));
       } else {
         // Nonblocking Server
-        serverEngine = new TNonblockingServer(testProcessor, tServerSocket);
+        serverEngine = new TNonblockingServer(new 
Args(tServerSocket).processor(testProcessor));
       }
 
       // Run it

Modified: 
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestServer.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestServer.java?rev=1026712&r1=1026711&r2=1026712&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestServer.java 
(original)
+++ incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestServer.java 
Sat Oct 23 23:35:46 2010
@@ -28,6 +28,8 @@ import java.util.Set;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.server.TServer;
+import org.apache.thrift.server.TServer.Args;
+import org.apache.thrift.server.TSimpleServer;
 import org.apache.thrift.server.TThreadPoolServer;
 import org.apache.thrift.transport.TServerSocket;
 import org.apache.thrift.server.ServerTestBase.TestHandler;
@@ -67,10 +69,10 @@ public class TestServer {
       TServer serverEngine;
 
       // Simple Server
-      // serverEngine = new TSimpleServer(testProcessor, tServerSocket);
+      serverEngine = new TSimpleServer(new 
Args(tServerSocket).processor(testProcessor));
 
       // ThreadPool Server
-      serverEngine = new TThreadPoolServer(testProcessor, tServerSocket, 
tProtocolFactory);
+      //serverEngine = new TThreadPoolServer(testProcessor, tServerSocket, 
tProtocolFactory);
 
       // Run it
       System.out.println("Starting the server on port " + port + "...");