You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/14 12:26:47 UTC
cvs commit: jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/extension2 ExtensionTestClass2.java
donaldp 02/05/14 03:26:46
Modified: simpleserver/src/java/org/apache/avalon/simpleserver
DummyClass.java PacketPokingTest.java
SimpleApplicationListener.java
SimpleBlockListener.java SimpleServer.java
SimpleService.java
simpleserver/src/java/org/apache/avalon/simpleserver/extension1
ExtensionTestClass1.java
simpleserver/src/java/org/apache/avalon/simpleserver/extension2
ExtensionTestClass2.java
Log:
Removed unused imports n restyled.
Revision Changes Path
1.2 +1 -1 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/DummyClass.java
Index: DummyClass.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/DummyClass.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyClass.java 21 Nov 2001 17:26:00 -0000 1.1
+++ DummyClass.java 14 May 2002 10:26:46 -0000 1.2
@@ -19,7 +19,7 @@
public class DummyClass
implements Serializable
{
- private String m_name;
+ private String m_name;
public void setName( final String name )
{
1.2 +1 -1 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/PacketPokingTest.java
Index: PacketPokingTest.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/PacketPokingTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PacketPokingTest.java 21 Nov 2001 17:26:00 -0000 1.1
+++ PacketPokingTest.java 14 May 2002 10:26:46 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.simpleserver;
-import java.net.DatagramSocket;
import java.net.DatagramPacket;
+import java.net.DatagramSocket;
import java.net.InetAddress;
/**
1.2 +16 -11 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleApplicationListener.java
Index: SimpleApplicationListener.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleApplicationListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleApplicationListener.java 26 Jan 2002 08:05:17 -0000 1.1
+++ SimpleApplicationListener.java 14 May 2002 10:26:46 -0000 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.avalon.simpleserver;
-import org.apache.avalon.phoenix.ApplicationListener;
import org.apache.avalon.phoenix.ApplicationEvent;
+import org.apache.avalon.phoenix.ApplicationListener;
/**
* This is a simple application listener to demonstrate deployment.
@@ -17,23 +17,28 @@
*/
public class SimpleApplicationListener extends SimpleBlockListener implements ApplicationListener
{
- public void applicationStarting(ApplicationEvent event) throws Exception {
- System.out.println("'" + event.getName() + "' applicationStarting");
+ public void applicationStarting( ApplicationEvent event ) throws Exception
+ {
+ System.out.println( "'" + event.getName() + "' applicationStarting" );
}
- public void applicationStarted() {
- System.out.println("applicationStarted");
+ public void applicationStarted()
+ {
+ System.out.println( "applicationStarted" );
}
- public void applicationStopping() {
- System.out.println("applicationStopping");
+ public void applicationStopping()
+ {
+ System.out.println( "applicationStopping" );
}
- public void applicationStopped() {
- System.out.println("applicationStopped");
+ public void applicationStopped()
+ {
+ System.out.println( "applicationStopped" );
}
- public void applicationFailure(Exception e) {
- System.out.println("applicationFailure");
+ public void applicationFailure( Exception e )
+ {
+ System.out.println( "applicationFailure" );
}
}
1.5 +2 -2 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleBlockListener.java
Index: SimpleBlockListener.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleBlockListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleBlockListener.java 26 Jan 2002 08:05:17 -0000 1.4
+++ SimpleBlockListener.java 14 May 2002 10:26:46 -0000 1.5
@@ -7,11 +7,11 @@
*/
package org.apache.avalon.simpleserver;
-import org.apache.avalon.phoenix.BlockEvent;
-import org.apache.avalon.phoenix.BlockListener;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.phoenix.BlockEvent;
+import org.apache.avalon.phoenix.BlockListener;
/**
* This is a simple block listener to demonstrate deployment.
1.6 +49 -33 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleServer.java
Index: SimpleServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleServer.java 12 May 2002 11:36:36 -0000 1.5
+++ SimpleServer.java 14 May 2002 10:26:46 -0000 1.6
@@ -7,11 +7,16 @@
*/
package org.apache.avalon.simpleserver;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.io.PrintWriter;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
import java.net.ProtocolException;
import java.net.ServerSocket;
-import java.net.DatagramSocket;
-import java.net.DatagramPacket;
import java.net.Socket;
import java.net.SocketException;
import java.util.Iterator;
@@ -19,33 +24,32 @@
import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
-import org.apache.avalon.cornerstone.services.scheduler.CronTimeTrigger;
+import org.apache.avalon.cornerstone.services.packet.PacketHandler;
+import org.apache.avalon.cornerstone.services.packet.PacketHandlerFactory;
+import org.apache.avalon.cornerstone.services.packet.PacketManager;
import org.apache.avalon.cornerstone.services.scheduler.PeriodicTimeTrigger;
import org.apache.avalon.cornerstone.services.scheduler.Target;
import org.apache.avalon.cornerstone.services.scheduler.TimeScheduler;
import org.apache.avalon.cornerstone.services.scheduler.TimeTrigger;
import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.avalon.cornerstone.services.sockets.SocketManager;
-import org.apache.avalon.cornerstone.services.packet.PacketManager;
-import org.apache.avalon.cornerstone.services.packet.PacketHandler;
-import org.apache.avalon.cornerstone.services.packet.PacketHandlerFactory;
import org.apache.avalon.cornerstone.services.store.ObjectRepository;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockContext;
+import org.apache.avalon.simpleserver.classes.ClassesTest;
import org.apache.avalon.simpleserver.extension1.ExtensionTestClass1;
import org.apache.avalon.simpleserver.extension2.ExtensionTestClass2;
-import org.apache.avalon.simpleserver.classes.ClassesTest;
/**
* This is a demo block used to demonstrate a simple server using Avalon. The
@@ -62,19 +66,19 @@
public class SimpleServer
extends AbstractLogEnabled
implements Block, SimpleService, Contextualizable, Serviceable, Configurable, Initializable,
- ConnectionHandlerFactory, ConnectionHandler, Target, PacketHandler, PacketHandlerFactory
+ ConnectionHandlerFactory, ConnectionHandler, Target, PacketHandler, PacketHandlerFactory
{
- private TimeScheduler m_timeScheduler;
- private Configuration m_configuration;
- private SocketManager m_socketManager;
- private ConnectionManager m_connectionManager;
- private Store m_testStore;
- private ObjectRepository m_repository;
- private PacketManager m_packetManager;
-
- private PrintWriter m_out;
- private int m_count;
- private BlockContext m_context;
+ private TimeScheduler m_timeScheduler;
+ private Configuration m_configuration;
+ private SocketManager m_socketManager;
+ private ConnectionManager m_connectionManager;
+ private Store m_testStore;
+ private ObjectRepository m_repository;
+ private PacketManager m_packetManager;
+
+ private PrintWriter m_out;
+ private int m_count;
+ private BlockContext m_context;
public void contextualize( final Context context )
{
@@ -200,7 +204,7 @@
/**
* Release a previously created ConnectionHandler e.g. for spooling.
*/
- public void releaseConnectionHandler(ConnectionHandler connectionHandler)
+ public void releaseConnectionHandler( ConnectionHandler connectionHandler )
{
}
@@ -223,7 +227,7 @@
final BufferedReader in =
new BufferedReader( new InputStreamReader( socket.getInputStream() ), 1024 );
m_out =
- new PrintWriter( new BufferedOutputStream( socket.getOutputStream()), true );
+ new PrintWriter( new BufferedOutputStream( socket.getOutputStream() ), true );
remoteHost = socket.getInetAddress().getHostName();
remoteIP = socket.getInetAddress().getHostAddress();
@@ -234,7 +238,7 @@
m_out.println( "Welcome to the Avalon Demo Server!" );
// Handle connection
- while( parseCommand( in.readLine()) )
+ while( parseCommand( in.readLine() ) )
{
// timeServer.resetAlarm(this.toString());
}
@@ -262,7 +266,10 @@
}
finally
{
- try { socket.close(); }
+ try
+ {
+ socket.close();
+ }
catch( final IOException ioe )
{
getLogger().error( "Exception closing socket: " + ioe.getMessage() );
@@ -309,7 +316,7 @@
command = commandLine.nextToken();
if( arguments > 1 )
{
- argument = fullcommand.substring(command.length() + 1);
+ argument = fullcommand.substring( command.length() + 1 );
}
if( command.equalsIgnoreCase( "TEST" ) )
@@ -319,21 +326,30 @@
final DummyClass write = new DummyClass();
write.setName( argument );
- try { m_repository.put( argument, write ); }
+ try
+ {
+ m_repository.put( argument, write );
+ }
catch( final Exception e )
{
getLogger().warn( "Exception putting into repository: " + e );
}
m_out.println( "Dummy written, trying for read" );
- try { final Iterator it = m_repository.list(); }
+ try
+ {
+ final Iterator it = m_repository.list();
+ }
catch( Exception e )
{
getLogger().warn( "Exception reading from repository: " + e, e );
}
DummyClass read = null;
- try { read = (DummyClass) m_repository.get(argument); }
+ try
+ {
+ read = (DummyClass)m_repository.get( argument );
+ }
catch( final Exception e )
{
getLogger().warn( "Exception reading from repository: " + e, e );
@@ -358,7 +374,7 @@
while( it.hasNext() )
{
String k = (String)it.next();
- String txt = (String) m_repository.get( k );
+ String txt = (String)m_repository.get( k );
m_out.println( "Msg " + k + " was " + txt );
}
m_out.println( "That's All folks!" );
@@ -373,7 +389,7 @@
while( it.hasNext() )
{
Object ignore = it.next();
- c=c+1;
+ c = c + 1;
}
m_out.println( "Number of messages in repository is: " + c );
1.3 +0 -2 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleService.java
Index: SimpleService.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/SimpleService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleService.java 18 Feb 2002 15:04:17 -0000 1.2
+++ SimpleService.java 14 May 2002 10:26:46 -0000 1.3
@@ -7,8 +7,6 @@
*/
package org.apache.avalon.simpleserver;
-import org.apache.avalon.phoenix.Service;
-
/**
* This is an empty service interface for the SimpleServer demo block
*
1.2 +1 -1 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/extension1/ExtensionTestClass1.java
Index: ExtensionTestClass1.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/extension1/ExtensionTestClass1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionTestClass1.java 21 Nov 2001 17:26:00 -0000 1.1
+++ ExtensionTestClass1.java 14 May 2002 10:26:46 -0000 1.2
@@ -10,7 +10,7 @@
import java.io.Serializable;
/**
- * A simple class to test loading an extension that
+ * A simple class to test loading an extension that
* is contained within the .sar.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
1.2 +1 -1 jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/extension2/ExtensionTestClass2.java
Index: ExtensionTestClass2.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/simpleserver/src/java/org/apache/avalon/simpleserver/extension2/ExtensionTestClass2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExtensionTestClass2.java 21 Nov 2001 17:26:00 -0000 1.1
+++ ExtensionTestClass2.java 14 May 2002 10:26:46 -0000 1.2
@@ -10,7 +10,7 @@
import java.io.Serializable;
/**
- * A simple class to test loading an extension that
+ * A simple class to test loading an extension that
* is contained within the central extension repository.
*
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>