CVS: jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld HelloWorldHandler.java,1.4,1.5 HelloWorldServer.java,1.3,1.4 HelloWorldServerImpl.java,1.7,1.8 HelloWorldServerMBean.java,1.3,1.4
Peter Donald <pdonald-yCVjj/[email protected]> Wed, 3 Dec 2003 04:45:06 -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-serv21491/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld Modified Files: HelloWorldHandler.java HelloWorldServer.java HelloWorldServerImpl.java HelloWorldServerMBean.java Log Message: Styled codebase Index: HelloWorldHandler.java =================================================================== RCS file: /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld/HelloWorldHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- HelloWorldHandler.java 7 Nov 2003 19:29:12 -0000 1.4 +++ HelloWorldHandler.java 3 Dec 2003 10:44:32 -0000 1.5 @@ -91,15 +91,14 @@ import java.io.PrintWriter; import java.net.Socket; import java.net.SocketException; - import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.phoenix.BlockContext; import org.jcomponent.netserve.connection.RequestHandler; - /** * This handles an individual incoming request. It outputs a greeting as html. - * @author Paul Hammant <Paul_Hammant-/[email protected]> + * + * @author Paul Hammant <Paul_Hammant-/[email protected]> * @author Federico Barbieri <[email protected]> * @version 1.0 */ @@ -119,11 +118,11 @@ } /** - * Handle a connection. - * This handler is responsible for processing connections as they occur. + * Handle a connection. This handler is responsible for processing + * connections as they occur. * * @param socket the connection - * @exception IOException if an error reading from socket occurs + * @throws IOException if an error reading from socket occurs */ public void handleConnection( final Socket socket ) { @@ -132,8 +131,11 @@ try { - final PrintWriter out = new PrintWriter( socket.getOutputStream(), true ); - out.println( "<html><body><b>" + m_greeting + "!</b><br> Requests so far = " + + 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>" ); out.println( "<p>The application will shutdown after 10 requests" ); @@ -143,16 +145,20 @@ } catch( final SocketException se ) { - getLogger().debug( "Socket to " + remoteHost + " closed remotely in HelloWorld", se ); + getLogger().debug( + "Socket to " + remoteHost + " closed remotely in HelloWorld", + se ); } catch( final InterruptedIOException iioe ) { - getLogger().debug( "Socket to " + remoteHost + " timeout in HelloWorld", iioe ); + getLogger().debug( + "Socket to " + remoteHost + " timeout in HelloWorld", iioe ); } catch( final IOException ioe ) { - getLogger().debug( "Exception in HelloWorld handling socket to " + remoteHost, - ioe ); + getLogger().debug( + "Exception in HelloWorld handling socket to " + remoteHost, + ioe ); } catch( final Exception e ) { @@ -170,7 +176,8 @@ } } - getLogger().info( "Connection from " + remoteHost + " (" + remoteIP + ")" ); + getLogger().info( + "Connection from " + remoteHost + " (" + remoteIP + ")" ); // A test of shutting down a block & app programatically. @@ -181,9 +188,10 @@ } } - /** - * Shutdown the handler and any requests currently being handled. - */ - public void shutdown(long timeout) { - } + /** + * Shutdown the handler and any requests currently being handled. + */ + public void shutdown( long timeout ) + { + } } Index: HelloWorldServer.java =================================================================== RCS file: /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld/HelloWorldServer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- HelloWorldServer.java 2 Sep 2003 04:36:58 -0000 1.3 +++ HelloWorldServer.java 3 Dec 2003 10:44:32 -0000 1.4 @@ -87,7 +87,7 @@ package org.jcontainer.loom.demos.helloworld; /** - * @author Paul Hammant <Paul_Hammant-/[email protected]> + * @author Paul Hammant <Paul_Hammant-/[email protected]> * @version 1.0 */ public interface HelloWorldServer Index: HelloWorldServerImpl.java =================================================================== RCS file: /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld/HelloWorldServerImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- HelloWorldServerImpl.java 7 Nov 2003 19:29:12 -0000 1.7 +++ HelloWorldServerImpl.java 3 Dec 2003 10:44:32 -0000 1.8 @@ -90,7 +90,6 @@ import java.net.InetAddress; import java.net.ServerSocket; import java.net.UnknownHostException; - import org.apache.avalon.framework.activity.Disposable; import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.configuration.Configurable; @@ -108,18 +107,17 @@ import org.jcomponent.netserve.sockets.ServerSocketFactory; /** + * @author Paul Hammant <Paul_Hammant-/[email protected]> + * @author Federico Barbieri <[email protected]> + * @version 1.0 * @dna.component * @dna.service type="HelloWorldServer" * @mx.interface topic="HelloWorldServer" name="org.jcontainer.loom.demos.helloworld.HelloWorldServerMBean" - * - * @author Paul Hammant <Paul_Hammant-/[email protected]> - * @author Federico Barbieri <[email protected]> - * @version 1.0 */ public final class HelloWorldServerImpl extends AbstractLogEnabled implements HelloWorldServer, HelloWorldServerMBean, Contextualizable, - Serviceable, Configurable, Initializable, Disposable + Serviceable, Configurable, Initializable, Disposable { private ServerSocketFactory m_socketManager; private SocketAcceptorManager m_socketAcceptorManager; @@ -152,12 +150,14 @@ try { - final String bindAddress = configuration.getChild( "bind" ).getValue(); + final String bindAddress = configuration.getChild( "bind" ) + .getValue(); m_bindTo = InetAddress.getByName( bindAddress ); } catch( final UnknownHostException unhe ) { - throw new ConfigurationException( "Malformed bind parameter", unhe ); + throw new ConfigurationException( "Malformed bind parameter", + unhe ); } } @@ -170,19 +170,31 @@ { getLogger().info( "HelloWorldServer.compose()" ); - m_socketManager = (ServerSocketFactory)serviceManager.lookup( ServerSocketFactory.class.getName() ); - m_socketAcceptorManager = (SocketAcceptorManager)serviceManager.lookup( SocketAcceptorManager.class.getName() ); + m_socketManager = + (ServerSocketFactory)serviceManager.lookup( + ServerSocketFactory.class.getName() ); + m_socketAcceptorManager = + (SocketAcceptorManager)serviceManager.lookup( + SocketAcceptorManager.class.getName() ); } public void initialize() throws Exception { - m_serverSocket = m_socketManager.createServerSocket( m_port, 5, m_bindTo ); + m_serverSocket = + m_socketManager.createServerSocket( m_port, 5, m_bindTo ); - m_socketAcceptorManager.connect( m_connectionName, m_serverSocket, createHandler() ); + 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" ); + System.out.println( + "HelloWorld server running with a greeting of '" + + m_greeting + + "'. Point your browser to http://localhost:" + + m_port + + " to see its page" ); } public void dispose() Index: HelloWorldServerMBean.java =================================================================== RCS file: /cvsroot/jcontainer/jcontainer/loom/demos/helloworld/src/java/org/jcontainer/loom/demos/helloworld/HelloWorldServerMBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- HelloWorldServerMBean.java 16 Oct 2003 09:23:57 -0000 1.3 +++ HelloWorldServerMBean.java 3 Dec 2003 10:44:32 -0000 1.4 @@ -86,17 +86,17 @@ */ package org.jcontainer.loom.demos.helloworld; - /** * Specifies methods to export via Management interface. * + * @author Huw Roberts <huw-/[email protected]> * @mx.component name="Greeting" - * @author Huw Roberts <huw-/[email protected]> */ public interface HelloWorldServerMBean { /** - * @mx.attribute description="The greeting that is returned to each HTTP request" + * @mx.attribute description="The greeting that is returned to each HTTP + * request" */ void setGreeting( final String greeting );