CVS: jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld HelloWorldHandler.java,1.3,1.4 HelloWorldServerImpl.java,1.6,1.7
mauro-yCVjj/[email protected] Fri, 7 Nov 2003 13:29:15 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld
In directory hogshead.codehaus.org:/tmp/cvs-serv11024/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld
Modified Files:
HelloWorldHandler.java HelloWorldServerImpl.java
Log Message:
Upgraded to use jcomponent-netserve
Index: HelloWorldHandler.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld/HelloWorldHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HelloWorldHandler.java 31 Aug 2003 04:07:09 -0000 1.3
+++ HelloWorldHandler.java 7 Nov 2003 19:29:12 -0000 1.4
@@ -94,7 +94,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.phoenix.BlockContext;
-import org.jcomponent.netserve.connection.ConnectionHandler;
+import org.jcomponent.netserve.connection.RequestHandler;
+
/**
* This handles an individual incoming request. It outputs a greeting as html.
@@ -104,7 +105,7 @@
*/
final class HelloWorldHandler
extends AbstractLogEnabled
- implements ConnectionHandler
+ implements RequestHandler
{
private static int c_counter;
private String m_greeting;
@@ -125,14 +126,13 @@
* @exception IOException if an error reading from socket occurs
*/
public void handleConnection( final Socket socket )
- throws IOException
{
final String remoteHost = socket.getInetAddress().getHostName();
final String remoteIP = socket.getInetAddress().getHostAddress();
- final PrintWriter out = new PrintWriter( socket.getOutputStream(), true );
try
{
+ final PrintWriter out = new PrintWriter( socket.getOutputStream(), true );
out.println( "<html><body><b>" + m_greeting + "!</b><br> Requests so far = " +
++c_counter + "<br>" );
out.println( "you are " + remoteHost + " at " + remoteIP + "<br>" );
@@ -180,4 +180,10 @@
m_context.requestShutdown();
}
}
+
+ /**
+ * Shutdown the handler and any requests currently being handled.
+ */
+ public void shutdown(long timeout) {
+ }
}
Index: HelloWorldServerImpl.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld/HelloWorldServerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HelloWorldServerImpl.java 17 Oct 2003 08:05:48 -0000 1.6
+++ HelloWorldServerImpl.java 7 Nov 2003 19:29:12 -0000 1.7
@@ -103,9 +103,8 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.BlockContext;
-import org.jcomponent.netserve.connection.ConnectionManager;
-import org.jcomponent.netserve.connection.ConnectionHandlerManager;
-import org.jcomponent.netserve.connection.ConnectionHandler;
+import org.jcomponent.netserve.connection.RequestHandler;
+import org.jcomponent.netserve.connection.SocketAcceptorManager;
import org.jcomponent.netserve.sockets.ServerSocketFactory;
/**
@@ -120,11 +119,10 @@
public final class HelloWorldServerImpl
extends AbstractLogEnabled
implements HelloWorldServer, HelloWorldServerMBean, Contextualizable,
- Serviceable, Configurable, Initializable, Disposable,
- ConnectionHandlerManager
+ Serviceable, Configurable, Initializable, Disposable
{
private ServerSocketFactory m_socketManager;
- private ConnectionManager m_connectionManager;
+ private SocketAcceptorManager m_socketAcceptorManager;
private BlockContext m_context;
private String m_greeting = "Hello World";
private InetAddress m_bindTo;
@@ -173,7 +171,7 @@
getLogger().info( "HelloWorldServer.compose()" );
m_socketManager = (ServerSocketFactory)serviceManager.lookup( ServerSocketFactory.class.getName() );
- m_connectionManager = (ConnectionManager)serviceManager.lookup( ConnectionManager.class.getName() );
+ m_socketAcceptorManager = (SocketAcceptorManager)serviceManager.lookup( SocketAcceptorManager.class.getName() );
}
public void initialize()
@@ -181,7 +179,7 @@
{
m_serverSocket = m_socketManager.createServerSocket( m_port, 5, m_bindTo );
- m_connectionManager.connect( m_connectionName, m_serverSocket, this );
+ m_socketAcceptorManager.connect( m_connectionName, m_serverSocket, createHandler() );
// This is only to help newbies.....
System.out.println( "HelloWorld server running with a greeting of '" + m_greeting + "'. Point your browser to http://localhost:" + m_port + " to see its page" );
@@ -191,7 +189,7 @@
{
try
{
- m_connectionManager.disconnect( m_connectionName, true );
+ m_socketAcceptorManager.disconnect( m_connectionName );
}
catch( final Exception e )
{
@@ -208,7 +206,7 @@
}
}
- public ConnectionHandler aquireHandler()
+ public RequestHandler createHandler()
throws Exception
{
final HelloWorldHandler handler =
@@ -217,10 +215,4 @@
return handler;
}
- /**
- * Release a previously created ConnectionHandler e.g. for spooling.
- */
- public void releaseHandler( ConnectionHandler handler )
- {
- }
}