donaldp 01/04/16 20:12:20
Modified: lib avalonapi.jar phoenix-client.jar
src/java/org/apache/cornerstone/blocks/connection
Connection.java DefaultConnectionManager.java
src/java/org/apache/cornerstone/blocks/datasource
DefaultDataSourceSelector.java
src/java/org/apache/cornerstone/blocks/masterstore
AbstractFileRepository.java
FileStoreObjectInputStream.java
File_Persistent_Stream_Repository.java
ResettableFileInputStream.java
src/java/org/apache/cornerstone/blocks/packet Acceptor.java
DefaultPacketManager.java
src/java/org/apache/cornerstone/blocks/scheduler
DefaultTimeScheduler.java TimeScheduledEntry.java
src/java/org/apache/cornerstone/blocks/security
DefaultRoleManager.java
src/java/org/apache/cornerstone/blocks/sockets
DefaultServerSocketFactory.java
DefaultSocketFactory.java DefaultSocketManager.java
TLSServerSocketFactory.java
src/java/org/apache/cornerstone/demos/helloworldserver
HelloWorldHandler.java HelloWorldServerImpl.java
src/java/org/apache/cornerstone/demos/httpproxy
AbstractHttpProxyServer.java
DefaultHttpAuditingProxyServer.java
DefaultHttpFilteringProxyServer.java
HttpAuditingProxyHandler.java
HttpAuditingProxyServer.java
HttpBlockedDomainException.java
HttpFilteringProxyHandler.java
HttpFilteringProxyServer.java
HttpGetRequestWrapper.java
HttpPostRequestWrapper.java HttpProxyHandler.java
HttpProxyServer.java
HttpRequestValidationException.java
HttpRequestWrapper.java
src/java/org/apache/cornerstone/demos/simpleserver
DummyClass.java SimpleServer.java
SimpleService.java
src/java/org/apache/cornerstone/services/connection
AbstractHandlerFactory.java AbstractService.java
ConnectionHandler.java ConnectionManager.java
DefaultHandlerFactory.java
src/java/org/apache/cornerstone/services/datasource
DataSourceSelector.java
src/java/org/apache/cornerstone/services/packet
PacketHandler.java PacketManager.java
src/java/org/apache/cornerstone/services/scheduler
CronTimeTrigger.java PeriodicTimeTrigger.java
Trigger.java
src/java/org/apache/cornerstone/services/scheduler/test
CronTimeTriggerTestlet.java
src/java/org/apache/cornerstone/services/security
AuthorizationManager.java Realm.java
RoleManager.java
src/java/org/apache/cornerstone/services/sockets
ServerSocketFactory.java SocketFactory.java
SocketManager.java
src/java/org/apache/cornerstone/services/store
Repository.java Store.java StreamRepository.java
Log:
Updated to excalibur hierarchy
Revision Changes Path
1.12 +367 -389 jakarta-avalon-cornerstone/lib/avalonapi.jar
<<Binary file>>
1.2 +20 -32 jakarta-avalon-cornerstone/lib/phoenix-client.jar
<<Binary file>>
1.3 +13 -13
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/Connection.java
Index: Connection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/Connection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Connection.java 2001/03/15 10:39:28 1.2
+++ Connection.java 2001/04/17 03:11:33 1.3
@@ -14,14 +14,14 @@
import java.util.Iterator;
import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.Component;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
/**
- * Support class for the DefaultConnectionManager.
+ * Support class for the DefaultConnectionManager.
* This manages an individual ServerSocket.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
class Connection
@@ -35,7 +35,7 @@
protected Thread m_thread;
- public Connection( final ServerSocket serverSocket,
+ public Connection( final ServerSocket serverSocket,
final ConnectionHandlerFactory handlerFactory,
final ThreadPool threadPool )
{
@@ -74,7 +74,7 @@
{
final Socket socket = m_serverSocket.accept();
final ConnectionHandler handler =
m_handlerFactory.createConnectionHandler();
- final ConnectionRunner runner =
+ final ConnectionRunner runner =
new ConnectionRunner( socket, m_runners, handler );
setupLogger( runner );
m_threadPool.execute( runner );
@@ -90,7 +90,7 @@
}
}
}
-
+
class ConnectionRunner
extends AbstractLoggable
implements Runnable, Component
@@ -100,8 +100,8 @@
protected ArrayList m_runners;
protected ConnectionHandler m_handler;
- ConnectionRunner( final Socket socket,
- final ArrayList runners,
+ ConnectionRunner( final Socket socket,
+ final ArrayList runners,
final ConnectionHandler handler )
{
m_socket = socket;
@@ -119,7 +119,7 @@
m_thread = null;
}
}
-
+
public void run()
{
try
@@ -129,7 +129,7 @@
getLogger().debug( "Starting connection on " + m_socket );
setupLogger( m_handler );
- m_handler.handleConnection( m_socket );
+ m_handler.handleConnection( m_socket );
getLogger().debug( "Ending connection on " + m_socket );
}
catch( final Exception e )
@@ -139,11 +139,11 @@
finally
{
try { m_socket.close(); }
- catch( final IOException ioe )
- {
+ catch( final IOException ioe )
+ {
getLogger().warn( "Error shutting down connection", ioe );
}
-
+
m_runners.remove( this );
}
}
1.3 +18 -18
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/DefaultConnectionManager.java
Index: DefaultConnectionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/connection/DefaultConnectionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultConnectionManager.java 2001/03/16 13:16:44 1.2
+++ DefaultConnectionManager.java 2001/04/17 03:11:33 1.3
@@ -16,12 +16,12 @@
import org.apache.avalon.Context;
import org.apache.avalon.Contextualizable;
import org.apache.avalon.Disposable;
-import org.apache.phoenix.Block;
-import org.apache.phoenix.BlockContext;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.cornerstone.services.connection.ConnectionManager;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.phoenix.Block;
+import org.apache.phoenix.BlockContext;
/**
* This is the service through which ConnectionManagement occurs.
@@ -39,7 +39,7 @@
{
m_context = (BlockContext)context;
}
-
+
public void dispose()
throws Exception
{
@@ -53,16 +53,16 @@
/**
* Start managing a connection.
- * Management involves accepting connections and farming them out to threads
+ * Management involves accepting connections and farming them out to threads
* from pool to be handled.
*
* @param name the name of connection
- * @param socket the ServerSocket from which to
+ * @param socket the ServerSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @param threadPool the thread pool to use
* @exception Exception if an error occurs
*/
- public void connect( String name,
+ public void connect( String name,
ServerSocket socket,
ConnectionHandlerFactory handlerFactory,
ThreadPool threadPool )
@@ -70,7 +70,7 @@
{
if( null != m_connections.get( name ) )
{
- throw new IllegalArgumentException( "Connection already exists with
name " +
+ throw new IllegalArgumentException( "Connection already exists with
name " +
name );
}
@@ -79,24 +79,24 @@
m_connections.put( name, runner );
threadPool.execute( runner );
}
-
+
/**
- * Start managing a connection.
+ * Start managing a connection.
* This is similar to other connect method except that it uses default thread
pool.
*
* @param name the name of connection
- * @param socket the ServerSocket from which to
+ * @param socket the ServerSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @exception Exception if an error occurs
*/
- public void connect( String name,
- ServerSocket socket,
+ public void connect( String name,
+ ServerSocket socket,
ConnectionHandlerFactory handlerFactory )
throws Exception
{
connect( name, socket, handlerFactory, m_context.getDefaultThreadPool() );
}
-
+
/**
* This shuts down all handlers and socket, waiting for each to gracefully
shutdown.
*
@@ -108,11 +108,11 @@
{
disconnect( name, false );
}
-
+
/**
- * This shuts down all handlers and socket.
- * If tearDown is true then it will forcefully shutdown all connections and try
- * to return as soon as possible. Otherwise it will behave the same as
+ * This shuts down all handlers and socket.
+ * If tearDown is true then it will forcefully shutdown all connections and try
+ * to return as soon as possible. Otherwise it will behave the same as
* void disconnect( String name );
*
* @param name the name of connection
1.3 +7 -7
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/datasource/DefaultDataSourceSelector.java
Index: DefaultDataSourceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultDataSourceSelector.java 2001/04/12 11:14:56 1.2
+++ DefaultDataSourceSelector.java 2001/04/17 03:11:34 1.3
@@ -12,12 +12,12 @@
import java.util.Map;
import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.Component;
-import org.apache.avalon.component.ComponentException;
import org.apache.avalon.Disposable;
import org.apache.avalon.Initializable;
+import org.apache.avalon.component.ComponentException;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.cornerstone.services.datasource.DataSourceSelector;
import org.apache.phoenix.Block;
@@ -42,7 +42,7 @@
{
m_dataSources = new HashMap();
- final Configuration[] dataSourceConfs =
+ final Configuration[] dataSourceConfs =
m_configuration.getChild( "data-sources" ).getChildren( "data-source" );
for ( int i = 0; i < dataSourceConfs.length; i++ )
@@ -54,13 +54,13 @@
final String driver = dataSourceConf.getChild( "driver" ).getValue();
Class.forName( driver );
- final DataSourceComponent component =
+ final DataSourceComponent component =
(DataSourceComponent)Class.forName( clazz ).newInstance();
setupLogger( component, name );
component.configure( dataSourceConf );
m_dataSources.put( name, component );
- if( getLogger().isInfoEnabled() )
+ if( getLogger().isInfoEnabled() )
{
getLogger().info( "DataSource " + name + " ready" );
}
@@ -73,7 +73,7 @@
final Iterator keys = m_dataSources.keySet().iterator();
while ( keys.hasNext() )
{
- final DataSourceComponent dsc =
+ final DataSourceComponent dsc =
(DataSourceComponent)m_dataSources.get( keys.next() );
if ( dsc instanceof Disposable )
{
@@ -97,7 +97,7 @@
{
throw new ComponentException( "Unable to provide implementation for " +
hint );
}
-
+
return component;
}
1.6 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/AbstractFileRepository.java
Index: AbstractFileRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/AbstractFileRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractFileRepository.java 2001/04/16 09:51:54 1.5
+++ AbstractFileRepository.java 2001/04/17 03:11:35 1.6
@@ -28,7 +28,7 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.util.io.ExtensionFileFilter;
+import org.apache.excalibur.io.ExtensionFileFilter;
import org.apache.cornerstone.services.store.Repository;
import org.apache.phoenix.Block;
import org.apache.phoenix.BlockContext;
1.4 +7 -7
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/FileStoreObjectInputStream.java
Index: FileStoreObjectInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/FileStoreObjectInputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileStoreObjectInputStream.java 2001/04/16 09:51:32 1.3
+++ FileStoreObjectInputStream.java 2001/04/17 03:11:36 1.4
@@ -11,9 +11,9 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.StreamCorruptedException;
import java.io.ObjectStreamClass;
import java.io.OutputStream;
+import java.io.StreamCorruptedException;
/**
* A special ObjectInputStream to handle highly transient classes hosted
@@ -21,23 +21,23 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Hammant</a>
*/
-class FileStoreObjectInputStream
+class FileStoreObjectInputStream
extends ObjectInputStream
{
private ClassLoader m_classLoader;
- public FileStoreObjectInputStream( final ClassLoader classLoader,
- final InputStream inputStream )
+ public FileStoreObjectInputStream( final ClassLoader classLoader,
+ final InputStream inputStream )
throws IOException, StreamCorruptedException
{
super( inputStream );
m_classLoader = classLoader;
}
- protected Class resolveClass( final ObjectStreamClass objectStreamClass )
+ protected Class resolveClass( final ObjectStreamClass objectStreamClass )
throws IOException, ClassNotFoundException
{
- final Class clazz =
+ final Class clazz =
Class.forName( objectStreamClass.getName(), false, m_classLoader );
if( null != clazz )
@@ -47,7 +47,7 @@
else
{
// classloader knows not of class, let the super classloader do it
- return super.resolveClass( objectStreamClass );
+ return super.resolveClass( objectStreamClass );
}
}
}
1.5 +15 -15
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/File_Persistent_Stream_Repository.java
Index: File_Persistent_Stream_Repository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/File_Persistent_Stream_Repository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- File_Persistent_Stream_Repository.java 2001/04/16 09:51:55 1.4
+++ File_Persistent_Stream_Repository.java 2001/04/17 03:11:36 1.5
@@ -13,18 +13,18 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
+import org.apache.excalibur.io.IOUtil;
import org.apache.cornerstone.services.store.StreamRepository;
-import org.apache.avalon.util.io.IOUtil;
/**
* Implementation of a StreamRepository to a File.
- * TODO: -retieve(String key) should return a FilterInputStream to allow
+ * TODO: -retieve(String key) should return a FilterInputStream to allow
* mark and reset methods. (working not like BufferedInputStream!!!)
*
* @author Federico Barbieri <[EMAIL PROTECTED]>
*/
-public class File_Persistent_Stream_Repository
- extends AbstractFileRepository
+public class File_Persistent_Stream_Repository
+ extends AbstractFileRepository
implements StreamRepository
{
protected final HashMap m_inputs = new HashMap();
@@ -42,11 +42,11 @@
{
try
{
- final ResettableFileInputStream stream =
+ final ResettableFileInputStream stream =
new ResettableFileInputStream( getFile( key ) );
final Object o = m_inputs.get( key );
- if( null == o )
+ if( null == o )
{
m_inputs.put( key, stream );
}
@@ -63,7 +63,7 @@
}
return stream;
- }
+ }
catch( final IOException ioe )
{
final String message = "Exception caught while retrieving a stream ";
@@ -71,10 +71,10 @@
throw new RuntimeException( message+ ": " + ioe );
}
}
-
+
/**
* Store the given object and associates it to the given key
- */
+ */
public synchronized OutputStream put( final String key )
{
try
@@ -83,7 +83,7 @@
final BufferedOutputStream stream = new BufferedOutputStream(
outputStream );
final Object o = m_outputs.get( key );
- if( null == o )
+ if( null == o )
{
m_outputs.put( key, stream );
}
@@ -100,7 +100,7 @@
}
return stream;
- }
+ }
catch( final IOException ioe )
{
final String message = "Exception caught while storing a stream ";
@@ -108,7 +108,7 @@
throw new RuntimeException( message+ ": " + ioe );
}
}
-
+
public void remove( final String key )
{
Object o = m_inputs.remove( key );
@@ -122,7 +122,7 @@
{
final ArrayList list = (ArrayList)o;
final int size = list.size();
-
+
for( int i = 0; i < size; i++ )
{
IOUtil.shutdownStream( (InputStream)list.get( i ) );
@@ -141,7 +141,7 @@
{
final ArrayList list = (ArrayList)o;
final int size = list.size();
-
+
for( int i = 0; i < size; i++ )
{
IOUtil.shutdownStream( (OutputStream)list.get( 0 ) );
@@ -152,5 +152,5 @@
super.remove( key );
}
}
+
-
1.2 +19 -19
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/ResettableFileInputStream.java
Index: ResettableFileInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/ResettableFileInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResettableFileInputStream.java 2001/02/26 13:57:44 1.1
+++ ResettableFileInputStream.java 2001/04/17 03:11:36 1.2
@@ -16,7 +16,7 @@
/**
* @author Federico Barbieri <[EMAIL PROTECTED]>
*/
-public class ResettableFileInputStream
+public class ResettableFileInputStream
extends InputStream
{
protected static final int DEFAULT_BUFFER_SIZE = 1024;
@@ -29,19 +29,19 @@
protected boolean m_isMarkSet;
public ResettableFileInputStream( final File file )
- throws IOException
+ throws IOException
{
this( file.getCanonicalPath() );
}
-
+
public ResettableFileInputStream( final String filename )
- throws IOException
+ throws IOException
{
this( filename, DEFAULT_BUFFER_SIZE );
}
-
+
public ResettableFileInputStream( final String filename, final int bufferSize )
- throws IOException
+ throws IOException
{
m_bufferSize = bufferSize;
m_filename = filename;
@@ -49,30 +49,30 @@
m_inputStream = newStream();
}
-
+
public void mark( final int readLimit )
{
m_isMarkSet = true;
m_mark = m_position;
m_inputStream.mark( readLimit );
}
-
+
public boolean markSupported()
{
return true;
}
-
+
public void reset()
- throws IOException
+ throws IOException
{
if( !m_isMarkSet )
{
throw new IOException( "Unmarked Stream" );
}
- try
+ try
{
m_inputStream.reset();
- }
+ }
catch( final IOException ioe )
{
try
@@ -81,7 +81,7 @@
m_inputStream = newStream();
m_inputStream.skip( m_mark );
m_position = m_mark;
- }
+ }
catch( final Exception e )
{
throw new IOException( "Cannot reset current Stream: " +
e.getMessage() );
@@ -100,28 +100,28 @@
{
return m_inputStream.available();
}
-
+
public void close() throws IOException
{
m_inputStream.close();
}
-
+
public int read() throws IOException
{
m_position++;
return m_inputStream.read();
}
-
+
public int read( final byte[] bytes, final int offset, final int length )
- throws IOException
+ throws IOException
{
final int count = m_inputStream.read( bytes, offset, length );
m_position += count;
return count;
}
-
+
public long skip( final long count )
- throws IOException
+ throws IOException
{
m_position += count;
return m_inputStream.skip( count );
1.3 +13 -13
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/Acceptor.java
Index: Acceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/Acceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Acceptor.java 2001/04/02 00:07:55 1.2
+++ Acceptor.java 2001/04/17 03:11:38 1.3
@@ -8,20 +8,20 @@
package org.apache.cornerstone.blocks.packet;
import java.io.IOException;
-import java.net.DatagramSocket;
import java.net.DatagramPacket;
+import java.net.DatagramSocket;
import java.util.ArrayList;
import java.util.Iterator;
import org.apache.avalon.AbstractLoggable;
import org.apache.avalon.Component;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.cornerstone.services.packet.PacketHandler;
import org.apache.cornerstone.services.packet.PacketHandlerFactory;
/**
- * Support class for the DefaultPacketManager.
+ * Support class for the DefaultPacketManager.
* This manages an individual DatagramSocket.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
class Acceptor
@@ -35,7 +35,7 @@
protected Thread m_thread;
- public Acceptor( final DatagramSocket datagramSocket,
+ public Acceptor( final DatagramSocket datagramSocket,
final PacketHandlerFactory handlerFactory,
final ThreadPool threadPool )
{
@@ -74,7 +74,7 @@
{
//TODO: packets hould really be pooled...
DatagramPacket packet = null;
-
+
try
{
final int size = m_datagramSocket.getReceiveBufferSize();
@@ -83,13 +83,13 @@
}
catch( final IOException ioe )
{
- getLogger().error( "Failed to get receive buffer size for
datagram socket",
+ getLogger().error( "Failed to get receive buffer size for
datagram socket",
ioe );
}
m_datagramSocket.receive( packet );
final PacketHandler handler =
m_handlerFactory.createPacketHandler();
- final PacketHandlerRunner runner =
+ final PacketHandlerRunner runner =
new PacketHandlerRunner( packet, m_runners, handler );
setupLogger( runner );
m_threadPool.execute( runner );
@@ -105,7 +105,7 @@
}
}
}
-
+
class PacketHandlerRunner
extends AbstractLoggable
implements Runnable, Component
@@ -115,8 +115,8 @@
protected ArrayList m_runners;
protected PacketHandler m_handler;
- PacketHandlerRunner( final DatagramPacket packet,
- final ArrayList runners,
+ PacketHandlerRunner( final DatagramPacket packet,
+ final ArrayList runners,
final PacketHandler handler )
{
m_packet = packet;
@@ -134,7 +134,7 @@
m_thread = null;
}
}
-
+
public void run()
{
try
@@ -147,7 +147,7 @@
getLogger().debug( "Starting connection on " + m_packet );
}
- m_handler.handlePacket( m_packet );
+ m_handler.handlePacket( m_packet );
if( getLogger().isDebugEnabled() )
{
1.2 +16 -16
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/DefaultPacketManager.java
Index: DefaultPacketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/packet/DefaultPacketManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPacketManager.java 2001/03/30 04:08:03 1.1
+++ DefaultPacketManager.java 2001/04/17 03:11:39 1.2
@@ -15,7 +15,7 @@
import org.apache.avalon.Context;
import org.apache.avalon.Contextualizable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.cornerstone.services.packet.PacketHandler;
import org.apache.cornerstone.services.packet.PacketHandlerFactory;
import org.apache.cornerstone.services.packet.PacketManager;
@@ -38,7 +38,7 @@
{
m_context = (BlockContext)context;
}
-
+
public void dispose()
throws Exception
{
@@ -52,16 +52,16 @@
/**
* Start managing a DatagramSocket.
- * Management involves accepting packets and farming them out to threads
+ * Management involves accepting packets and farming them out to threads
* from pool to be handled.
*
* @param name the name of acceptor
- * @param socket the DatagramSocket from which to
+ * @param socket the DatagramSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @param threadPool the thread pool to use
* @exception Exception if an error occurs
*/
- public synchronized void connect( final String name,
+ public synchronized void connect( final String name,
final DatagramSocket socket,
final PacketHandlerFactory handlerFactory,
final ThreadPool threadPool )
@@ -69,7 +69,7 @@
{
if( null != m_acceptors.get( name ) )
{
- throw new IllegalArgumentException( "Acceptor already exists with name
" +
+ throw new IllegalArgumentException( "Acceptor already exists with name
" +
name );
}
@@ -78,24 +78,24 @@
m_acceptors.put( name, acceptor );
threadPool.execute( acceptor );
}
-
+
/**
- * Start managing a DatagramSocket.
+ * Start managing a DatagramSocket.
* This is similar to other connect method except that it uses default thread
pool.
*
* @param name the name of DatagramSocket
- * @param socket the DatagramSocket from which to
+ * @param socket the DatagramSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @exception Exception if an error occurs
*/
- public synchronized void connect( final String name,
- final DatagramSocket socket,
+ public synchronized void connect( final String name,
+ final DatagramSocket socket,
final PacketHandlerFactory handlerFactory )
throws Exception
{
connect( name, socket, handlerFactory, m_context.getDefaultThreadPool() );
}
-
+
/**
* This shuts down all handlers and socket, waiting for each to gracefully
shutdown.
*
@@ -107,11 +107,11 @@
{
disconnect( name, false );
}
-
+
/**
- * This shuts down all handlers and socket.
- * If tearDown is true then it will forcefully shutdown all acceptors and try
- * to return as soon as possible. Otherwise it will behave the same as
+ * This shuts down all handlers and socket.
+ * If tearDown is true then it will forcefully shutdown all acceptors and try
+ * to return as soon as possible. Otherwise it will behave the same as
* void disconnect( String name );
*
* @param name the name of acceptor
1.6 +4 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/DefaultTimeScheduler.java
Index: DefaultTimeScheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/DefaultTimeScheduler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultTimeScheduler.java 2001/04/16 08:46:39 1.5
+++ DefaultTimeScheduler.java 2001/04/17 03:11:40 1.6
@@ -14,10 +14,10 @@
import org.apache.avalon.Initializable;
import org.apache.avalon.Startable;
import org.apache.avalon.Stoppable;
-import org.apache.avalon.util.collections.BinaryHeap;
-import org.apache.avalon.util.collections.PriorityQueue;
-import org.apache.avalon.util.collections.SynchronizedPriorityQueue;
-import org.apache.avalon.util.thread.ThreadContext;
+import org.apache.excalibur.collections.BinaryHeap;
+import org.apache.excalibur.collections.PriorityQueue;
+import org.apache.excalibur.collections.SynchronizedPriorityQueue;
+import org.apache.excalibur.thread.ThreadContext;
import org.apache.cornerstone.services.scheduler.Target;
import org.apache.cornerstone.services.scheduler.TimeScheduler;
import org.apache.cornerstone.services.scheduler.TimeTrigger;
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/TimeScheduledEntry.java
Index: TimeScheduledEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/scheduler/TimeScheduledEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimeScheduledEntry.java 2001/02/22 07:52:16 1.1
+++ TimeScheduledEntry.java 2001/04/17 03:11:40 1.2
@@ -7,8 +7,8 @@
*/
package org.apache.cornerstone.blocks.scheduler;
-import org.apache.cornerstone.services.scheduler.TimeTrigger;
import org.apache.cornerstone.services.scheduler.Target;
+import org.apache.cornerstone.services.scheduler.TimeTrigger;
/**
* Class use internally to package to hold scheduled time entries.
1.2 +4 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/security/DefaultRoleManager.java
Index: DefaultRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/security/DefaultRoleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultRoleManager.java 2001/02/22 07:52:16 1.1
+++ DefaultRoleManager.java 2001/04/17 03:11:42 1.2
@@ -14,14 +14,14 @@
/**
* Service to manager the role mappings for principals.
- *
- * This currently assumes principal is the prime dimension
+ *
+ * This currently assumes principal is the prime dimension
* which could be wrong. It could be that roles are a primary
- * aspect and
+ * aspect and
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public class DefaultRoleManager
+public class DefaultRoleManager
implements Block, RoleManager
{
protected Hashtable m_principals = new Hashtable();
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultServerSocketFactory.java
Index: DefaultServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultServerSocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultServerSocketFactory.java 2001/02/22 07:52:17 1.1
+++ DefaultServerSocketFactory.java 2001/04/17 03:11:43 1.2
@@ -50,7 +50,7 @@
}
/**
- * Creates a socket on a particular network interface on specified port
+ * Creates a socket on a particular network interface on specified port
* with a specified backLog.
*
* @param port the port
1.3 +4 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultSocketFactory.java
Index: DefaultSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSocketFactory.java 2001/03/16 13:16:45 1.2
+++ DefaultSocketFactory.java 2001/04/17 03:11:44 1.3
@@ -35,7 +35,7 @@
}
/**
- * Create a socket and connect to remote address specified
+ * Create a socket and connect to remote address specified
* originating from specified local address.
*
* @param address the remote address
@@ -45,9 +45,9 @@
* @return the socket
* @exception IOException if an error occurs
*/
- public Socket createSocket( final InetAddress address,
- final int port,
- final InetAddress localAddress,
+ public Socket createSocket( final InetAddress address,
+ final int port,
+ final InetAddress localAddress,
final int localPort )
throws IOException
{
1.4 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultSocketManager.java
Index: DefaultSocketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/DefaultSocketManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSocketManager.java 2001/04/12 11:15:07 1.3
+++ DefaultSocketManager.java 2001/04/17 03:11:44 1.4
@@ -64,7 +64,7 @@
for( int i = 0; i < serverSockets.length; i++ )
{
- final Configuration element = serverSockets[ i ];
+ final Configuration element = serverSockets[ i ];
final String name = element.getAttribute( "name" );
final String className = element.getAttribute( "class" );
1.2 +23 -23
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/TLSServerSocketFactory.java
Index: TLSServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/sockets/TLSServerSocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TLSServerSocketFactory.java 2001/02/22 07:52:17 1.1
+++ TLSServerSocketFactory.java 2001/04/17 03:11:44 1.2
@@ -48,15 +48,15 @@
protected String m_keyStoreFile;
protected String m_keyStorePassword;
- protected String m_keyStoreType;
- protected String m_keyStoreProtocol;
- protected String m_keyStoreAlgorithm;
+ protected String m_keyStoreType;
+ protected String m_keyStoreProtocol;
+ protected String m_keyStoreAlgorithm;
protected boolean m_keyStoreAuthenticateClients;
public void contextualize( final Context context )
{
final BlockContext blockContext = (BlockContext)context;
- m_baseDirectory = blockContext.getBaseDirectory();
+ m_baseDirectory = blockContext.getBaseDirectory();
}
/**
@@ -83,39 +83,39 @@
m_keyStoreType = keyStore.getChild( "type" ).getValue( "JKS" );
m_keyStoreProtocol = keyStore.getChild( "protocol" ).getValue( "TLS" );
m_keyStoreAlgorithm = keyStore.getChild( "algorithm" ).getValue( "SunX509"
);
- m_keyStoreAuthenticateClients =
+ m_keyStoreAuthenticateClients =
keyStore.getChild( "authenticate-client" ).getValueAsBoolean( false );
}
- public void init()
- throws Exception
+ public void init()
+ throws Exception
{
final KeyStore keyStore = initKeyStore();
initSSLFactory( keyStore );
}
- protected KeyStore initKeyStore()
- throws Exception
+ protected KeyStore initKeyStore()
+ throws Exception
{
try
{
final KeyStore keyStore = KeyStore.getInstance( m_keyStoreType );
- final File keyStoreFile = new File( m_baseDirectory, m_keyStoreFile );
+ final File keyStoreFile = new File( m_baseDirectory, m_keyStoreFile );
final FileInputStream input = new FileInputStream( keyStoreFile );
keyStore.load( input, m_keyStorePassword.toCharArray() );
getLogger().info( "Keystore loaded from: " + keyStoreFile );
-
+
return keyStore;
- }
- catch( final Exception e )
+ }
+ catch( final Exception e )
{
getLogger().error( "Exception loading keystore from: " +
m_keyStoreFile, e );
throw e;
}
}
- protected void initSSLFactory( final KeyStore keyStore )
+ protected void initSSLFactory( final KeyStore keyStore )
throws Exception
{
/*
@@ -125,19 +125,19 @@
// set up key manager to do server authentication
final SSLContext sslContext = SSLContext.getInstance( m_keyStoreProtocol );
- final KeyManagerFactory keyManagerFactory =
+ final KeyManagerFactory keyManagerFactory =
KeyManagerFactory.getInstance( m_keyStoreAlgorithm );
keyManagerFactory.init( keyStore, m_keyStorePassword.toCharArray() );
- sslContext.init( keyManagerFactory.getKeyManagers(),
- null,
+ sslContext.init( keyManagerFactory.getKeyManagers(),
+ null,
new java.security.SecureRandom() );
-
+
// Create socket factory
m_factory = sslContext.getServerSocketFactory();
}
-
+
/**
* Creates a socket on specified port.
*
@@ -170,7 +170,7 @@
}
/**
- * Creates a socket on a particular network interface on specified port
+ * Creates a socket on a particular network interface on specified port
* with a specified backLog.
*
* @param port the port
@@ -182,16 +182,16 @@
public ServerSocket createServerSocket( int port, int backLog, InetAddress
bindAddress )
throws IOException
{
- final ServerSocket serverSocket =
+ final ServerSocket serverSocket =
m_factory.createServerSocket( port, backLog, bindAddress );
initServerSocket( serverSocket );
return serverSocket;
}
- protected void initServerSocket( final ServerSocket serverSocket )
+ protected void initServerSocket( final ServerSocket serverSocket )
{
final SSLServerSocket socket = (SSLServerSocket)serverSocket;
-
+
// Enable all available cipher suites when the socket is connected
final String[] cipherSuites = socket.getSupportedCipherSuites();
socket.setEnabledCipherSuites( cipherSuites );
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldHandler.java
Index: HelloWorldHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloWorldHandler.java 2001/02/22 07:51:54 1.1
+++ HelloWorldHandler.java 2001/04/17 03:11:47 1.2
@@ -68,7 +68,7 @@
}
catch( final IOException ioe )
{
- getLogger().debug( "Exception in HelloWorld handling socket to " +
remoteHost ,
+ getLogger().debug( "Exception in HelloWorld handling socket to " +
remoteHost ,
ioe );
}
catch( final Exception e )
1.2 +9 -9
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldServerImpl.java
Index: HelloWorldServerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/helloworldserver/HelloWorldServerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloWorldServerImpl.java 2001/02/22 07:51:54 1.1
+++ HelloWorldServerImpl.java 2001/04/17 03:11:47 1.2
@@ -33,10 +33,10 @@
* @author Federico Barbieri <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HelloWorldServerImpl
+public class HelloWorldServerImpl
extends AbstractLoggable
- implements Block, HelloWorldServer,
- Contextualizable, Composer, Configurable, Initializable,
ConnectionHandlerFactory
+ implements Block, HelloWorldServer,
+ Contextualizable, Composer, Configurable, Initializable,
ConnectionHandlerFactory
{
protected SocketManager m_socketManager;
protected ConnectionManager m_connectionManager;
@@ -61,18 +61,18 @@
{
m_port = configuration.getChild("port").getValueAsInt( 8000 );
- try
- {
+ try
+ {
final String bindAddress = configuration.getChild( "bind" ).getValue();
- m_bindTo = InetAddress.getByName( bindAddress );
+ m_bindTo = InetAddress.getByName( bindAddress );
}
- catch( final UnknownHostException unhe )
+ catch( final UnknownHostException unhe )
{
throw new ConfigurationException( "Malformed bind parameter", unhe );
}
}
- public void compose( final ComponentManager componentManager )
+ public void compose( final ComponentManager componentManager )
throws ComponentManagerException
{
getLogger().info("HelloWorldServer.compose()");
@@ -106,5 +106,5 @@
final HelloWorldHandler handler = new HelloWorldHandler( m_greeting );
setupLogger( handler );
return handler;
- }
+ }
}
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/AbstractHttpProxyServer.java
Index: AbstractHttpProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/AbstractHttpProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractHttpProxyServer.java 2001/02/22 07:51:54 1.1
+++ AbstractHttpProxyServer.java 2001/04/17 03:11:49 1.2
@@ -36,7 +36,7 @@
public abstract class AbstractHttpProxyServer
extends AbstractLoggable
implements Block, Contextualizable, Composer, Configurable, Service,
- Initializable, ConnectionHandlerFactory
+ Initializable, ConnectionHandlerFactory
{
protected SocketManager m_socketManager;
protected ConnectionManager m_connectionManager;
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/DefaultHttpAuditingProxyServer.java
Index: DefaultHttpAuditingProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/DefaultHttpAuditingProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultHttpAuditingProxyServer.java 2001/02/22 07:51:54 1.1
+++ DefaultHttpAuditingProxyServer.java 2001/04/17 03:11:49 1.2
@@ -14,11 +14,11 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class DefaultHttpAuditingProxyServer
+public class DefaultHttpAuditingProxyServer
extends AbstractHttpProxyServer
implements HttpAuditingProxyServer
{
- public DefaultHttpAuditingProxyServer()
+ public DefaultHttpAuditingProxyServer()
{
super("Auditing");
}
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/DefaultHttpFilteringProxyServer.java
Index: DefaultHttpFilteringProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/DefaultHttpFilteringProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultHttpFilteringProxyServer.java 2001/02/22 07:51:54 1.1
+++ DefaultHttpFilteringProxyServer.java 2001/04/17 03:11:49 1.2
@@ -210,7 +210,7 @@
}
}
- public String[] getBlockedDomains()
+ public String[] getBlockedDomains()
{
return new String[] {"TODO"}; // TODO PH
}
@@ -218,7 +218,7 @@
/**
* List the domains for which cookies are not sent.
*/
- public String[] getCookieSuppressedDomains()
+ public String[] getCookieSuppressedDomains()
{
return new String[] {"TODO"}; // TODO PH
}
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpAuditingProxyHandler.java
Index: HttpAuditingProxyHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpAuditingProxyHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpAuditingProxyHandler.java 2001/02/22 07:51:54 1.1
+++ HttpAuditingProxyHandler.java 2001/04/17 03:11:50 1.2
@@ -15,7 +15,7 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpAuditingProxyHandler
+public class HttpAuditingProxyHandler
extends HttpProxyHandler
{
protected HttpAuditingProxyHandler( final String forwardToAnotherProxy )
@@ -23,7 +23,7 @@
super( forwardToAnotherProxy);
}
- protected void validateRequest()
+ protected void validateRequest()
throws HttpRequestValidationException
{
// no validate, just log.
1.2 +2 -3
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpAuditingProxyServer.java
Index: HttpAuditingProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpAuditingProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpAuditingProxyServer.java 2001/02/22 07:51:54 1.1
+++ HttpAuditingProxyServer.java 2001/04/17 03:11:50 1.2
@@ -11,8 +11,7 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public interface HttpAuditingProxyServer
- extends HttpProxyServer
+public interface HttpAuditingProxyServer
+ extends HttpProxyServer
{
}
-
1.2 +1 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpBlockedDomainException.java
Index: HttpBlockedDomainException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpBlockedDomainException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpBlockedDomainException.java 2001/02/22 07:51:54 1.1
+++ HttpBlockedDomainException.java 2001/04/17 03:11:50 1.2
@@ -11,7 +11,7 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpBlockedDomainException
+public class HttpBlockedDomainException
extends HttpRequestValidationException
{
/**
@@ -24,4 +24,3 @@
super( "Access to " + domainName + "has been blocked" );
}
}
-
1.2 +6 -6
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpFilteringProxyHandler.java
Index: HttpFilteringProxyHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpFilteringProxyHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpFilteringProxyHandler.java 2001/02/22 07:51:54 1.1
+++ HttpFilteringProxyHandler.java 2001/04/17 03:11:51 1.2
@@ -15,7 +15,7 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpFilteringProxyHandler
+public class HttpFilteringProxyHandler
extends HttpProxyHandler
{
// used for callbacks
@@ -41,7 +41,7 @@
* @throws HttpRequestValidationException
*
*/
- protected void validateRequest()
+ protected void validateRequest()
throws HttpRequestValidationException
{
final String domainName = httpRequestWrapper.getServerName();
@@ -70,12 +70,12 @@
final String domainName = httpRequestWrapper.getServerName();
final String httpRequest = super.getOutgoingHttpRequest( anotherProxy );
- if( !proxyServer.cookieAllowed( domainName ) )
+ if( !proxyServer.cookieAllowed( domainName ) )
{
- final String request =
+ final String request =
getHttpRequestWithoutCookie( httpRequest,
httpRequestWrapper.getURL() );
return request.trim() + "\r\n\r\n";
- }
+ }
else
{
return httpRequest;
@@ -94,7 +94,7 @@
if( !line.startsWith("Cookie:") )
{
newHttpRequest.append( line ).append( "\r\n" );
- }
+ }
else
{
getLogger().info( "Cookie supressed for url :" + url.toString() );
1.2 +0 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpFilteringProxyServer.java
Index: HttpFilteringProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpFilteringProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpFilteringProxyServer.java 2001/02/22 07:51:54 1.1
+++ HttpFilteringProxyServer.java 2001/04/17 03:11:51 1.2
@@ -45,4 +45,3 @@
*/
String[] getCookieSuppressedDomains();
}
-
1.2 +5 -5
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpGetRequestWrapper.java
Index: HttpGetRequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpGetRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpGetRequestWrapper.java 2001/02/22 07:51:54 1.1
+++ HttpGetRequestWrapper.java 2001/04/17 03:11:51 1.2
@@ -15,16 +15,16 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpGetRequestWrapper
+public class HttpGetRequestWrapper
extends HttpRequestWrapper
{
- protected HttpGetRequestWrapper( final Logger logger, final String rq )
+ protected HttpGetRequestWrapper( final Logger logger, final String rq )
throws IOException
{
super( logger, rq );
}
- protected HttpGetRequestWrapper( final Logger logger, final InputStream is )
+ protected HttpGetRequestWrapper( final Logger logger, final InputStream is )
throws IOException
{
super( logger );
@@ -33,7 +33,7 @@
byte[] bytes = new byte[ SEGLEN ];
int bytesRead = is.read( bytes );
- do
+ do
{
wholeBuffer += new String( bytes, 0, bytesRead );
@@ -41,7 +41,7 @@
{
bytesRead = is.read( bytes );
}
- }
+ }
while( !wholeBuffer.endsWith( EOF ) );
super.setRequest( wholeBuffer );
1.2 +9 -9
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpPostRequestWrapper.java
Index: HttpPostRequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpPostRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpPostRequestWrapper.java 2001/02/22 07:51:54 1.1
+++ HttpPostRequestWrapper.java 2001/04/17 03:11:51 1.2
@@ -15,9 +15,10 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpPostRequestWrapper extends HttpRequestWrapper {
-
- protected HttpPostRequestWrapper( final Logger logger, final String rq )
+public class HttpPostRequestWrapper
+ extends HttpRequestWrapper
+{
+ protected HttpPostRequestWrapper( final Logger logger, final String rq )
throws IOException
{
super( logger, rq );
@@ -37,7 +38,7 @@
int contLen;
int lenAfterContent;
- do
+ do
{
wholeBuffer += new String( bytes, 0, bytesRead );
@@ -46,18 +47,18 @@
contLen = getContentLength( tmpRqst );
lenAfterContent = getLengthAfterContent( tmpRqst );
- if( -1 == wholeBuffer.indexOf( EOF ) )
+ if( -1 == wholeBuffer.indexOf( EOF ) )
{
bytesRead = is.read( bytes );
}
- }
- while( ( lenAfterContent < contLen ) &&
+ }
+ while( ( lenAfterContent < contLen ) &&
( -1 == wholeBuffer.indexOf( EOF ) ) );
super.setRequest( wholeBuffer );
}
- private int getContentLength( final String rqst )
+ private int getContentLength( final String rqst )
{
int firstDigit = rqst.indexOf("CONTENT-LENGTH:") + 16;
@@ -82,4 +83,3 @@
return 0;
}
}
-
1.2 +31 -33
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpProxyHandler.java
Index: HttpProxyHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpProxyHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpProxyHandler.java 2001/02/22 07:51:54 1.1
+++ HttpProxyHandler.java 2001/04/17 03:11:52 1.2
@@ -59,31 +59,31 @@
validateRequest();
forwardRequest();
- }
- catch( final HttpRequestValidationException hrve )
+ }
+ catch( final HttpRequestValidationException hrve )
{
write403Page();
getLogger().info( hrve.getMessage() );
- }
- catch( final SocketException se )
+ }
+ catch( final SocketException se )
{
getLogger().debug( "Socket to " + clientHost + " closed remotely.", se
);
- }
- catch( final InterruptedIOException iioe )
+ }
+ catch( final InterruptedIOException iioe )
{
getLogger().debug( "Socket to " + clientHost + " timeout.", iioe );
- }
- catch( final IOException ioe )
+ }
+ catch( final IOException ioe )
{
getLogger().debug( "Exception in proxy handling socket to " +
clientHost, ioe );
- }
+ }
catch( final Exception e )
{
getLogger().debug( "Exception in proxy opening socket", e );
- }
+ }
finally
{
- try { clientSocket.close(); }
+ try { clientSocket.close(); }
catch( final IOException ioe )
{
getLogger().error( "Exception closing client socket ", ioe );
@@ -91,7 +91,7 @@
if( null != serverSocket )
{
- try { serverSocket.close(); }
+ try { serverSocket.close(); }
catch( final IOException ioe )
{
getLogger().error( "Exception closing server socket ", ioe );
@@ -100,7 +100,7 @@
}
}
- protected Socket makeOutgoingSocket()
+ protected Socket makeOutgoingSocket()
throws IOException
{
if( !forwardToAnotherProxy.equals("") )
@@ -112,7 +112,7 @@
forwardToAnotherProxy.length() ) );
return new Socket( toName, toPort );
- }
+ }
else
{
return new Socket( httpRequestWrapper.getServerInetAddress(),
@@ -125,14 +125,14 @@
if( anotherProxy )
{
return httpRequestWrapper.getNakedHttpRequest().trim() + "\r\n\r\n";
- }
+ }
else
{
return httpRequestWrapper.getHttpRequest().trim() + "\r\n\r\n";
}
}
- public final void forwardRequest()
+ public final void forwardRequest()
throws IOException
{
String request = getOutgoingHttpRequest( (
!forwardToAnotherProxy.equals("") ) );
@@ -153,15 +153,15 @@
{
pLength = serverIS.read( page );
- if( -1 != pLength )
+ if( -1 != pLength )
{
bufToClient.write( page, 0, pLength );
}
- }
+ }
while( -1 != pLength );
bufToClient.close();
- }
+ }
catch( final Exception e )
{
// general catch is deliberate, see writeErrorPage(..)
@@ -169,32 +169,32 @@
}
}
- private void writeErrorPage( final Exception e )
+ private void writeErrorPage( final Exception e )
throws IOException
{
final PrintWriter output = new PrintWriter( clientSocket.getOutputStream()
);
-
- output.println( "<html><body>Unable to reach <b>" +
httpRequestWrapper.getServerName() +
+
+ output.println( "<html><body>Unable to reach <b>" +
httpRequestWrapper.getServerName() +
":" + httpRequestWrapper.getServerPort() + "</b> at the
moment." );
output.println( "<br />This Message is bought to you by the Avalon demo
proxy server." );
- output.println( "<br />If you had a direct connection to the net, you would
not see " +
+ output.println( "<br />If you had a direct connection to the net, you would
not see " +
"this message, your browser would instead tell you it could
not reach" +
" the site.<br />");
if( e instanceof UnknownHostException )
{
- output.println( "<br />The probable cause is that the domain name does
not exist," +
+ output.println( "<br />The probable cause is that the domain name does
not exist," +
" of the route to it is severed." );
- }
+ }
else if( e instanceof ConnectException )
{
output.println( "<br />The probable cause is that the machine at domain
name is" +
" not running a service at the port number in question
(HTTP or" +
" any other)." );
- }
+ }
else
{
- output.println( "<br />The cause is unknown, this may help though: " +
+ output.println( "<br />The cause is unknown, this may help though: " +
e.getMessage() );
}
@@ -205,21 +205,19 @@
// Block the resource, buy using http code 403.
// "403 Forbidden Resource is not available, regardless of authorization."
- private void write403Page()
+ private void write403Page()
{
try
{
final PrintWriter output = new PrintWriter(
clientSocket.getOutputStream() );
- output.println( "<html><head><title>Blocked</title></head>" +
+ output.println( "<html><head><title>Blocked</title></head>" +
"<body>Blocked</body></html>" );
output.flush();
output.close();
- }
+ }
catch( final IOException ioe ) {}
}
-
- protected abstract void validateRequest()
+ protected abstract void validateRequest()
throws HttpRequestValidationException;
}
-
1.2 +2 -3
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpProxyServer.java
Index: HttpProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpProxyServer.java 2001/02/22 07:51:54 1.1
+++ HttpProxyServer.java 2001/04/17 03:11:52 1.2
@@ -16,7 +16,6 @@
public interface HttpProxyServer
extends Service
{
- // nothing here yet, but there could be a way of chaining proxy servers
- // without sockets.....
+ // nothing here yet, but there could be a way of chaining proxy servers
+ // without sockets.....
}
-
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpRequestValidationException.java
Index: HttpRequestValidationException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpRequestValidationException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpRequestValidationException.java 2001/02/22 07:51:54 1.1
+++ HttpRequestValidationException.java 2001/04/17 03:11:52 1.2
@@ -11,14 +11,14 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpRequestValidationException
+public class HttpRequestValidationException
extends Exception
{
/**
* Constructor HttpRequestValidationException
* Thrown when somethod failed during the handlers validation stage.
*/
- public HttpRequestValidationException( final String message )
+ public HttpRequestValidationException( final String message )
{
super( message );
}
1.2 +22 -23
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpRequestWrapper.java
Index: HttpRequestWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/httpproxy/HttpRequestWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpRequestWrapper.java 2001/02/22 07:51:54 1.1
+++ HttpRequestWrapper.java 2001/04/17 03:11:53 1.2
@@ -19,7 +19,7 @@
* @author Paul Hammant <[EMAIL PROTECTED]>
* @version 1.0
*/
-public class HttpRequestWrapper
+public class HttpRequestWrapper
{
protected final static String EOF = "\r\n\r\n";
protected final static int SEGLEN = 2048;
@@ -28,19 +28,19 @@
protected String m_request;
protected URL m_url;
- protected HttpRequestWrapper( final Logger logger )
+ protected HttpRequestWrapper( final Logger logger )
{
m_logger = logger;
}
- protected HttpRequestWrapper( final Logger logger, final String request )
+ protected HttpRequestWrapper( final Logger logger, final String request )
throws IOException
{
this( logger );
setRequest( request );
}
- protected void setRequest( final String request )
+ protected void setRequest( final String request )
throws IOException
{
m_request = request;
@@ -48,14 +48,14 @@
try
{
m_url = new URL( getURLFromHttpHeader() );
- }
+ }
catch( final MalformedURLException mfue )
{
m_logger.error( "URL from http header is malformed", mfue );
}
}
- public final URL getURL()
+ public final URL getURL()
{
return m_url;
}
@@ -64,21 +64,21 @@
* Method getServerInetAddress
* The server's internet address.
*/
- public final InetAddress getServerInetAddress()
+ public final InetAddress getServerInetAddress()
throws UnknownHostException
{
return InetAddress.getByName( m_url.getHost() );
}
- private String getURLFromHttpHeader()
+ private String getURLFromHttpHeader()
{
try
{
int hostStart = m_request.indexOf( " " ) + 1;
- return m_request.substring( hostStart,
+ return m_request.substring( hostStart,
m_request.indexOf( " ", hostStart ) );
- }
+ }
catch( final StringIndexOutOfBoundsException sioobe )
{
m_logger.error( "Unable to find URL in http header", sioobe );
@@ -91,7 +91,7 @@
* Method getServerName
* The server's domain name
*/
- public String getServerName()
+ public String getServerName()
{
return m_url.getHost();
}
@@ -100,7 +100,7 @@
* Method getServerPort
* The port on the server where the http requests should be sent.
*/
- public int getServerPort()
+ public int getServerPort()
{
final int port = m_url.getPort();
@@ -111,7 +111,7 @@
* Method getNakedHttpRequest
* Used to forward requests to another proxy server
*/
- public final String getNakedHttpRequest()
+ public final String getNakedHttpRequest()
{
return m_request;
}
@@ -120,14 +120,14 @@
* Method getHttpRequest
* Get the address without the proxy extras
*/
- public String getHttpRequest()
+ public String getHttpRequest()
{
// strip out proxy info.
- int hostEnd = 1 +
+ int hostEnd = 1 +
m_request.indexOf( "/", m_request.indexOf( "//" ) + 2 );
-
- return
- m_request.substring( 0, m_request.indexOf("http://") ) + "/" +
+
+ return
+ m_request.substring( 0, m_request.indexOf("http://") ) + "/" +
m_request.substring( hostEnd, m_request.length() );
}
@@ -136,9 +136,9 @@
* Factory to create the right sub class of HttpRequestWrapper.
*
*/
- static HttpRequestWrapper createHttpRequestWrapper( final Logger logger,
+ static HttpRequestWrapper createHttpRequestWrapper( final Logger logger,
final InputStream is )
- throws IOException
+ throws IOException
{
byte[] threeBytes = new byte[3];
int bytes = is.read( threeBytes );
@@ -150,14 +150,13 @@
final String reqType = new String( threeBytes, 0, bytes );
- if( reqType.equals("POS") )
+ if( reqType.equals("POS") )
{
return new HttpPostRequestWrapper( logger, is );
- }
+ }
else
{
return new HttpGetRequestWrapper( logger, is );
}
}
}
-
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/DummyClass.java
Index: DummyClass.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/DummyClass.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DummyClass.java 2001/02/22 07:51:55 1.1
+++ DummyClass.java 2001/04/17 03:12:00 1.2
@@ -16,7 +16,7 @@
*
* @author Charles Benett <[EMAIL PROTECTED]>
*/
-public class DummyClass
+public class DummyClass
implements Serializable
{
private String m_name;
@@ -26,7 +26,7 @@
m_name = name;
}
- public String getName()
+ public String getName()
{
return m_name;
}
1.3 +43 -43
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.java
Index: SimpleServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleServer.java 2001/03/13 04:51:58 1.2
+++ SimpleServer.java 2001/04/17 03:12:01 1.3
@@ -8,8 +8,8 @@
package org.apache.cornerstone.demos.simpleserver;
import java.io.*;
-import java.net.ServerSocket;
import java.net.ProtocolException;
+import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
import java.util.Iterator;
@@ -19,23 +19,23 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.Composer;
+import org.apache.avalon.Initializable;
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.Initializable;
-import org.apache.phoenix.Block;
-import org.apache.cornerstone.services.store.Store;
-import org.apache.cornerstone.services.store.ObjectRepository;
-import org.apache.cornerstone.services.sockets.SocketManager;
-import org.apache.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.cornerstone.services.connection.ConnectionHandler;
import org.apache.cornerstone.services.connection.ConnectionHandlerFactory;
import org.apache.cornerstone.services.connection.ConnectionManager;
-import org.apache.cornerstone.services.scheduler.TimeScheduler;
-import org.apache.cornerstone.services.scheduler.Target;
import org.apache.cornerstone.services.scheduler.CronTimeTrigger;
import org.apache.cornerstone.services.scheduler.PeriodicTimeTrigger;
+import org.apache.cornerstone.services.scheduler.Target;
+import org.apache.cornerstone.services.scheduler.TimeScheduler;
import org.apache.cornerstone.services.scheduler.TimeTrigger;
+import org.apache.cornerstone.services.sockets.ServerSocketFactory;
+import org.apache.cornerstone.services.sockets.SocketManager;
+import org.apache.cornerstone.services.store.ObjectRepository;
+import org.apache.cornerstone.services.store.Store;
+import org.apache.phoenix.Block;
/**
* This is a demo block used to demonstrate a simple server using Avalon. The
@@ -49,10 +49,10 @@
* @author Federico Barbieri <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public class SimpleServer
- extends AbstractLoggable
+public class SimpleServer
+ extends AbstractLoggable
implements Block, SimpleService, Composer, Configurable, Initializable,
- ConnectionHandlerFactory, ConnectionHandler, Target
+ ConnectionHandlerFactory, ConnectionHandler, Target
{
protected TimeScheduler m_timeScheduler;
protected Configuration m_configuration;
@@ -67,7 +67,7 @@
public void compose( final ComponentManager componentManager )
throws ComponentManagerException
{
- m_testStore =
+ m_testStore =
(Store)componentManager.lookup(
"org.apache.cornerstone.services.store.Store" );
m_socketManager = (SocketManager)componentManager.
@@ -86,13 +86,13 @@
m_configuration = configuration;
}
- public void init()
+ public void init()
throws Exception
{
getLogger().info( "init Demo ..." );
final Configuration repConf = m_configuration.getChild( "repository" );
- getLogger().info( "Want to use repository in:" +
+ getLogger().info( "Want to use repository in:" +
repConf.getAttribute( "destinationURL" ) );
m_repository = (ObjectRepository)m_testStore.select( repConf );
getLogger().info( "Got repository" );
@@ -111,7 +111,7 @@
final int port = m_configuration.getChild( "port" ).getValueAsInt();
getLogger().info( "Want to open port on:" + port );
- final ServerSocketFactory factory =
+ final ServerSocketFactory factory =
m_socketManager.getServerSocketFactory( "plain" );
final ServerSocket serverSocket = factory.createServerSocket( port );
@@ -133,7 +133,7 @@
{
//Can return this because the ConnectionHandler is thread safe
return this;
- }
+ }
/**
* Handle a connection.
@@ -151,49 +151,49 @@
try
{
- final BufferedReader in =
+ final BufferedReader in =
new BufferedReader( new InputStreamReader( socket.getInputStream()
), 1024 );
- m_out =
+ m_out =
new PrintWriter( new BufferedOutputStream(
socket.getOutputStream()), true );
remoteHost = socket.getInetAddress().getHostName();
remoteIP = socket.getInetAddress().getHostAddress();
getLogger().info( "Connection from " + remoteHost + " ( " + remoteIP +
" )" );
-
+
//Greet connection
m_out.println( "Welcome to the Avalon Demo Server!" );
-
+
// Handle connection
while( parseCommand( in.readLine()) )
{
// timeServer.resetAlarm(this.toString());
}
-
+
//Finish
m_out.flush();
socket.close();
- }
+ }
catch( final SocketException se )
{
getLogger().info( "Socket to " + remoteHost + " closed remotely." );
- }
+ }
catch( final InterruptedIOException iioe )
{
getLogger().info( "Socket to " + remoteHost + " timeout." );
}
- catch( IOException ioe )
+ catch( IOException ioe )
{
- getLogger().info( "Exception handling socket to " + remoteHost + ":" +
+ getLogger().info( "Exception handling socket to " + remoteHost + ":" +
ioe.getMessage() );
- }
+ }
catch( final Exception e )
{
getLogger().info( "Exception on socket: " + e.getMessage() );
- }
+ }
finally
{
- try { socket.close(); }
+ try { socket.close(); }
catch( final IOException ioe )
{
getLogger().error( "Exception closing socket: " + ioe.getMessage()
);
@@ -208,7 +208,7 @@
try
{
m_timeScheduler.removeTrigger( "try" );
- }
+ }
catch( final Exception e )
{
e.printStackTrace();
@@ -219,7 +219,7 @@
}
protected boolean parseCommand( String command )
- throws Exception
+ throws Exception
{
if( null == command )
{
@@ -231,18 +231,18 @@
StringTokenizer commandLine = new StringTokenizer( command.trim() );
int arguments = commandLine.countTokens();
String argument = null;
- if( 0 == arguments )
+ if( 0 == arguments )
{
return true;
}
String fullcommand = command;
command = commandLine.nextToken();
- if( arguments > 1 )
+ if( arguments > 1 )
{
argument = fullcommand.substring(command.length() + 1);
}
-
+
if( command.equalsIgnoreCase( "TEST" ) )
{
m_out.println( "You said 'TEST'" );
@@ -250,21 +250,21 @@
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 );
@@ -272,7 +272,7 @@
m_out.println( "Recovered: " + read.getName() );
return true;
- }
+ }
else if( command.equalsIgnoreCase( "PUT" ) )
{
m_out.println( "You said 'PUT'" );
@@ -280,12 +280,12 @@
m_repository.put( key, argument );
return true;
}
- else if( command.equalsIgnoreCase( "LIST" ) )
+ else if( command.equalsIgnoreCase( "LIST" ) )
{
m_out.println( "You said 'LIST'" );
final Iterator it = m_repository.list();
-
+
while( it.hasNext() )
{
String k = (String)it.next();
@@ -294,13 +294,13 @@
}
m_out.println( "That's All folks!" );
return true;
- }
+ }
else if( command.equalsIgnoreCase( "COUNT" ) )
{
m_out.println( "You said 'COUNT'" );
Iterator it = m_repository.list();
int c = 0;
-
+
while( it.hasNext() )
{
Object ignore = it.next();
@@ -309,7 +309,7 @@
m_out.println( "Number of messages in repository is: " + c );
return true;
- }
+ }
else
{
m_out.println( "Only valid commands are: PUT, LIST or COUNT." );
1.2 +1 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleService.java
Index: SimpleService.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/demos/simpleserver/SimpleService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleService.java 2001/02/22 07:51:55 1.1
+++ SimpleService.java 2001/04/17 03:12:01 1.2
@@ -14,10 +14,7 @@
*
* @author Charles Benett <[EMAIL PROTECTED]>
*/
-public interface SimpleService
+public interface SimpleService
extends Service
{
}
-
-
-
1.5 +4 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractHandlerFactory.java
Index: AbstractHandlerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractHandlerFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractHandlerFactory.java 2001/03/04 00:00:33 1.4
+++ AbstractHandlerFactory.java 2001/04/17 03:12:03 1.5
@@ -26,17 +26,17 @@
*/
public abstract class AbstractHandlerFactory
extends AbstractLoggable
- implements Component, Contextualizable, Composer, Configurable,
ConnectionHandlerFactory
+ implements Component, Contextualizable, Composer, Configurable,
ConnectionHandlerFactory
{
protected Context m_context;
protected ComponentManager m_componentManager;
protected Configuration m_configuration;
-
+
public void contextualize( final Context context )
{
m_context = context;
}
-
+
public void compose( final ComponentManager componentManager )
throws ComponentManagerException
{
@@ -91,6 +91,6 @@
* @return the new ConnectionHandler
* @exception Exception if an error occurs
*/
- protected abstract ConnectionHandler newHandler()
+ protected abstract ConnectionHandler newHandler()
throws Exception;
}
1.3 +9 -9
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractService.java
Index: AbstractService.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/AbstractService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractService.java 2001/03/07 03:49:15 1.2
+++ AbstractService.java 2001/04/17 03:12:03 1.3
@@ -22,7 +22,7 @@
import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.configuration.ConfigurationException;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.cornerstone.services.sockets.ServerSocketFactory;
import org.apache.cornerstone.services.sockets.SocketManager;
import org.apache.log.Logger;
@@ -36,7 +36,7 @@
*/
public abstract class AbstractService
extends AbstractLoggable
- implements Block, Contextualizable, Composer, Configurable, Initializable,
Disposable
+ implements Block, Contextualizable, Composer, Configurable, Initializable,
Disposable
{
protected ConnectionManager m_connectionManager;
protected SocketManager m_socketManager;
@@ -69,7 +69,7 @@
((Loggable)m_factory).setLogger( logger );
}
}
-
+
public void contextualize( final Context context )
{
final String name = getThreadPoolName();
@@ -85,7 +85,7 @@
((Contextualizable)m_factory).contextualize( context );
}
}
-
+
public void compose( final ComponentManager componentManager )
throws ComponentManagerException
{
@@ -110,7 +110,7 @@
}
}
- public void init()
+ public void init()
throws Exception
{
if( m_factory instanceof Initializable )
@@ -124,21 +124,21 @@
sb.append( m_serverSocketType );
sb.append( ':' );
sb.append( m_port );
-
+
if( null != m_bindTo )
{
sb.append( '/' );
sb.append( m_bindTo );
}
-
+
m_connectionName = sb.toString();
}
- final ServerSocketFactory factory =
+ final ServerSocketFactory factory =
m_socketManager.getServerSocketFactory( m_serverSocketType );
ServerSocket serverSocket = null;
-
+
if( null == m_bindTo )
{
serverSocket = factory.createServerSocket( m_port );
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/ConnectionHandler.java
Index: ConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/ConnectionHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionHandler.java 2001/02/22 07:51:35 1.1
+++ ConnectionHandler.java 2001/04/17 03:12:04 1.2
@@ -28,7 +28,7 @@
* @exception IOException if an error reading from socket occurs
* @exception ProtocolException if an error handling connection occurs
*/
- void handleConnection( Socket connection )
+ void handleConnection( Socket connection )
throws IOException, ProtocolException;
}
1.2 +12 -12
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/ConnectionManager.java
Index: ConnectionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/ConnectionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectionManager.java 2001/02/22 07:51:35 1.1
+++ ConnectionManager.java 2001/04/17 03:12:04 1.2
@@ -8,12 +8,12 @@
package org.apache.cornerstone.services.connection;
import java.net.ServerSocket;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.phoenix.Service;
-import org.apache.avalon.util.thread.ThreadPool;
/**
* This is the service through which ConnectionManagement occurs.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface ConnectionManager
@@ -21,32 +21,32 @@
{
/**
* Start managing a connection.
- * Management involves accepting connections and farming them out to threads
+ * Management involves accepting connections and farming them out to threads
* from pool to be handled.
*
* @param name the name of connection
- * @param socket the ServerSocket from which to
+ * @param socket the ServerSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @param threadPool the thread pool to use
* @exception Exception if an error occurs
*/
- void connect( String name,
+ void connect( String name,
ServerSocket socket,
ConnectionHandlerFactory handlerFactory,
ThreadPool threadPool )
throws Exception;
/**
- * Start managing a connection.
+ * Start managing a connection.
* This is similar to other connect method except that it uses default thread
pool.
*
* @param name the name of connection
- * @param socket the ServerSocket from which to
+ * @param socket the ServerSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @exception Exception if an error occurs
*/
- void connect( String name,
- ServerSocket socket,
+ void connect( String name,
+ ServerSocket socket,
ConnectionHandlerFactory handlerFactory )
throws Exception;
@@ -60,9 +60,9 @@
throws Exception;
/**
- * This shuts down all handlers and socket.
- * If tearDown is true then it will forcefully shutdown all connections and try
- * to return as soon as possible. Otherwise it will behave the same as
+ * This shuts down all handlers and socket.
+ * If tearDown is true then it will forcefully shutdown all connections and try
+ * to return as soon as possible. Otherwise it will behave the same as
* void disconnect( String name );
*
* @param name the name of connection
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/DefaultHandlerFactory.java
Index: DefaultHandlerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/connection/DefaultHandlerFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultHandlerFactory.java 2001/03/04 00:01:29 1.1
+++ DefaultHandlerFactory.java 2001/04/17 03:12:04 1.2
@@ -28,7 +28,7 @@
* @return the new ConnectionHandler
* @exception Exception if an error occurs
*/
- protected ConnectionHandler newHandler()
+ protected ConnectionHandler newHandler()
throws Exception
{
return (ConnectionHandler)m_handlerClass.newInstance();
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/datasource/DataSourceSelector.java
Index: DataSourceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/datasource/DataSourceSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataSourceSelector.java 2001/04/02 00:08:11 1.1
+++ DataSourceSelector.java 2001/04/17 03:12:06 1.2
@@ -9,7 +9,7 @@
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentSelector;
-import org.apache.avalon.util.datasource.DataSourceComponent;
+import org.apache.excalibur.datasource.DataSourceComponent;
import org.apache.phoenix.Service;
/**
@@ -21,7 +21,7 @@
extends Service, ComponentSelector
{
/**
- *
+ *
* @param the name of data source
* @return data source
*/
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/packet/PacketHandler.java
Index: PacketHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/packet/PacketHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PacketHandler.java 2001/03/30 04:08:03 1.1
+++ PacketHandler.java 2001/04/17 03:12:07 1.2
@@ -28,7 +28,7 @@
* @exception IOException if an error reading from socket occurs
* @exception ProtocolException if an error handling connection occurs
*/
- void handlePacket( DatagramPacket packet )
+ void handlePacket( DatagramPacket packet )
throws IOException, ProtocolException;
}
1.2 +11 -11
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/packet/PacketManager.java
Index: PacketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/packet/PacketManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PacketManager.java 2001/03/30 04:08:03 1.1
+++ PacketManager.java 2001/04/17 03:12:08 1.2
@@ -8,12 +8,12 @@
package org.apache.cornerstone.services.packet;
import java.net.DatagramSocket;
-import org.apache.avalon.util.thread.ThreadPool;
+import org.apache.excalibur.thread.ThreadPool;
import org.apache.phoenix.Service;
/**
* This is the service through which Datagram ConnectionManagement occurs.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public interface PacketManager
@@ -21,23 +21,23 @@
{
/**
* Start managing a connection.
- * Management involves accepting connections and farming them out to threads
+ * Management involves accepting connections and farming them out to threads
* from pool to be handled.
*
* @param name the name of connection
- * @param socket the ServerSocket from which to
+ * @param socket the ServerSocket from which to
* @param handlerFactory the factory from which to aquire handlers
* @param threadPool the thread pool to use
* @exception Exception if an error occurs
*/
- void connect( String name,
+ void connect( String name,
DatagramSocket socket,
PacketHandlerFactory handlerFactory,
ThreadPool threadPool )
throws Exception;
/**
- * Start managing a connection.
+ * Start managing a connection.
* This is similar to other connect method except that it uses default thread
pool.
*
* @param name the name of connection
@@ -45,8 +45,8 @@
* @param handlerFactory the factory from which to aquire handlers
* @exception Exception if an error occurs
*/
- void connect( String name,
- DatagramSocket socket,
+ void connect( String name,
+ DatagramSocket socket,
PacketHandlerFactory handlerFactory )
throws Exception;
@@ -60,9 +60,9 @@
throws Exception;
/**
- * This shuts down all handlers and socket.
- * If tearDown is true then it will forcefully shutdown all connections and try
- * to return as soon as possible. Otherwise it will behave the same as
+ * This shuts down all handlers and socket.
+ * If tearDown is true then it will forcefully shutdown all connections and try
+ * to return as soon as possible. Otherwise it will behave the same as
* void disconnect( String name );
*
* @param name the name of connection
1.4 +31 -31
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/CronTimeTrigger.java
Index: CronTimeTrigger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/CronTimeTrigger.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CronTimeTrigger.java 2001/03/19 06:27:49 1.3
+++ CronTimeTrigger.java 2001/04/17 03:12:09 1.4
@@ -26,7 +26,7 @@
protected final int m_month;
protected final int m_dayOfWeek;
protected final int m_year;
-
+
/**
* Constructor for CronTimeTrigger.
* Day is either day of week or day of month depending on value of isDayOfWeek.
@@ -37,14 +37,14 @@
* @param hour hour at which job is scheduled. (0-23 or -1 for every hour)
* @param month the month at which job is scheduled. (0-11 or -1 for every
month)
* @param year the year when job is scheduled (-1 implies every year)
- * @param day the day
- * @param isDayOfWeek true if day is a day of week or false if day is day of
month
+ * @param day the day
+ * @param isDayOfWeek true if day is a day of week or false if day is day of
month
*/
- public CronTimeTrigger( final int minute,
- final int hour,
- final int day,
+ public CronTimeTrigger( final int minute,
+ final int hour,
+ final int day,
final int month,
- final int year,
+ final int year,
final boolean isDayOfWeek )
{
m_minute = minute;
@@ -55,12 +55,12 @@
if( isDayOfWeek )
{
m_dayOfMonth = -1;
- m_dayOfWeek = day;
+ m_dayOfWeek = day;
}
else
{
m_dayOfMonth = day;
- m_dayOfWeek = -1;
+ m_dayOfWeek = -1;
}
}
@@ -71,14 +71,14 @@
*/
public long getTimeAfter( final long time )
{
- //first create calendars
+ //first create calendars
final Date timeMarker = new Date( time );
- final GregorianCalendar relativeTo = new GregorianCalendar();
+ final GregorianCalendar relativeTo = new GregorianCalendar();
relativeTo.setTime( timeMarker );
relativeTo.set( Calendar.SECOND, 0 );
final GregorianCalendar next = (GregorianCalendar)relativeTo.clone();
-
+
if( -1 != m_minute ) next.set( Calendar.MINUTE, m_minute );
else
{
@@ -93,20 +93,20 @@
}
}
- if( -1 != m_hour )
+ if( -1 != m_hour )
{
next.set( Calendar.HOUR_OF_DAY, m_hour );
if( -1 == m_minute ) next.set( Calendar.MINUTE, 0 );
}
- if( -1 != m_month )
+ if( -1 != m_month )
{
next.set( Calendar.MONTH, m_month );
if( -1 == m_hour ) next.set( Calendar.HOUR_OF_DAY, 0 );
if( -1 == m_minute ) next.set( Calendar.MINUTE, 0 );
}
- if( -1 != m_year )
+ if( -1 != m_year )
{
next.set( Calendar.YEAR, m_year );
if( -1 == m_month ) next.set( Calendar.MONTH, 0 );
@@ -117,8 +117,8 @@
//use zeroed constant to make if statements easier to read
final int minute = ( -1 != m_minute ) ? m_minute : 0;
final int rminute = relativeTo.get( Calendar.MINUTE );
-
- if( -1 == m_year && -1 == m_month && -1 == m_hour &&
+
+ if( -1 == m_year && -1 == m_month && -1 == m_hour &&
-1 != m_minute && rminute >= minute )
{
//for every hour jobs and job is done this hour
@@ -135,7 +135,7 @@
//System.out.println("relativeTo=" + rhour + ":" + rminute );
if( -1 == m_dayOfMonth && -1 == m_dayOfWeek &&
- (
+ (
//for when past hour that was scheduled to run
( -1 != m_hour && rhour > hour ) ||
@@ -143,9 +143,9 @@
//when hour is not specified
( -1 == m_hour && rhour == 24 && rminute >= minute ) ||
- //for when you are past time of day where both minute and
+ //for when you are past time of day where both minute and
//hour are specified
- ( -1 != m_hour && rhour == hour && rminute >= minute )
+ ( -1 != m_hour && rhour == hour && rminute >= minute )
)
)
{
@@ -164,14 +164,14 @@
( relativeTo.get( Calendar.DAY_OF_MONTH ) == dayOfMonth &&
( relativeTo.get( Calendar.HOUR_OF_DAY ) > hour ||
( relativeTo.get( Calendar.HOUR_OF_DAY ) == hour &&
- ( relativeTo.get( Calendar.MINUTE ) >= minute ) ) ) ) ) ) )
)
+ ( relativeTo.get( Calendar.MINUTE ) >= minute ) ) ) ) ) ) )
)
{
next.add( Calendar.YEAR, 1 );
}
if( -1 != m_year )
{
- //if past current year or already executed job this year then
+ //if past current year or already executed job this year then
//bail out
if( relativeTo.get( Calendar.YEAR ) > m_year ||
( relativeTo.get( Calendar.YEAR )== m_year &&
@@ -190,7 +190,7 @@
//schedule weekly jobs
if( -1 != m_dayOfWeek )
{
- final int dayWait =
+ final int dayWait =
( 7 + m_dayOfWeek - relativeTo.get( Calendar.DAY_OF_WEEK ) ) % 7;
if( 0 != dayWait )
@@ -198,8 +198,8 @@
next.add( Calendar.DAY_OF_YEAR, dayWait );
}
else if( relativeTo.get( Calendar.HOUR_OF_DAY ) > hour ||
- ( relativeTo.get( Calendar.HOUR_OF_DAY ) == hour &&
- relativeTo.get( Calendar.MINUTE ) >= minute ) )
+ ( relativeTo.get( Calendar.HOUR_OF_DAY ) == hour &&
+ relativeTo.get( Calendar.MINUTE ) >= minute ) )
{
//if job scheduled for today has passed then schedule on next week
next.add( Calendar.DAY_OF_YEAR, 7 );
@@ -209,21 +209,21 @@
else if( -1 != m_dayOfMonth )
{
next.set( Calendar.DAY_OF_MONTH, m_dayOfMonth );
-
+
//if this months job has already run then schedule next week
if ( m_month == -1 &&
( relativeTo.get( Calendar.DAY_OF_MONTH ) > m_dayOfMonth ||
( relativeTo.get( Calendar.DAY_OF_MONTH ) == m_dayOfMonth &&
( relativeTo.get( Calendar.HOUR_OF_DAY ) > hour ||
- ( relativeTo.get( Calendar.HOUR_OF_DAY ) == hour &&
- relativeTo.get( Calendar.MINUTE ) >= minute ) ) ) ) )
+ ( relativeTo.get( Calendar.HOUR_OF_DAY ) == hour &&
+ relativeTo.get( Calendar.MINUTE ) >= minute ) ) ) ) )
{
next.roll( Calendar.MONTH, true );
}
}
-
+
//return time in millis
- return next.getTime().getTime();
+ return next.getTime().getTime();
}
/**
@@ -280,7 +280,7 @@
sb.append( m_dayOfWeek );
sb.append( " " );
}
-
+
sb.append("]");
return sb.toString();
1.6 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/PeriodicTimeTrigger.java
Index: PeriodicTimeTrigger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/PeriodicTimeTrigger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PeriodicTimeTrigger.java 2001/03/22 03:47:24 1.5
+++ PeriodicTimeTrigger.java 2001/04/17 03:12:10 1.6
@@ -19,7 +19,7 @@
protected final long m_offset;
protected final long m_period;
private long m_triggerTime;
-
+
public PeriodicTimeTrigger( final int offset, final int period )
{
m_offset = offset;
@@ -94,7 +94,7 @@
sb.append( m_period );
sb.append( " " );
}
-
+
sb.append("]");
return sb.toString();
1.3 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/Trigger.java
Index: Trigger.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/Trigger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Trigger.java 2001/03/19 06:27:49 1.2
+++ Trigger.java 2001/04/17 03:12:10 1.3
@@ -17,7 +17,7 @@
public interface Trigger
{
/**
- * Reset the Trigger. The Triggers can be time-based,
+ * Reset the Trigger. The Triggers can be time-based,
* event-based or other.
*/
void reset();
1.2 +30 -30
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/test/CronTimeTriggerTestlet.java
Index: CronTimeTriggerTestlet.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/scheduler/test/CronTimeTriggerTestlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CronTimeTriggerTestlet.java 2001/02/22 07:51:36 1.1
+++ CronTimeTriggerTestlet.java 2001/04/17 03:12:12 1.2
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE file.
- */
+/*
+ * Copyright (C) The Apache Software Foundation. All rights reserved.
+ *
+ * This software is published under the terms of the Apache Software License
+ * version 1.1, a copy of which has been included with this distribution in
+ * the LICENSE file.
+ */
package org.apache.cornerstone.services.scheduler.test;
-
+
import java.util.Calendar;
import java.util.Date;
-import org.apache.cornerstone.services.scheduler.CronTimeTrigger;
-import org.apache.testlet.AbstractTestlet;
-
-/**
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- */
-public final class CronTimeTriggerTestlet
- extends AbstractTestlet
+import org.apache.cornerstone.services.scheduler.CronTimeTrigger;
+import org.apache.testlet.AbstractTestlet;
+
+/**
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
+ */
+public final class CronTimeTriggerTestlet
+ extends AbstractTestlet
{
protected final static long MINUTE = 60000;
protected final static long HOUR = 60 * MINUTE;
@@ -30,7 +30,7 @@
final Calendar now = Calendar.getInstance();
now.set( Calendar.SECOND, 0 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
@@ -50,7 +50,7 @@
final Calendar now = Calendar.getInstance();
now.set( Calendar.SECOND, 0 );
now.set( Calendar.MINUTE, 2 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
long delta = next - time;
@@ -73,12 +73,12 @@
public void testDays()
{
final CronTimeTrigger trigger = new CronTimeTrigger( 51, 5, -1, -1, -1,
true );
-
+
final Calendar now = Calendar.getInstance();
now.set( Calendar.SECOND, 0 );
now.set( Calendar.MINUTE, 2 );
now.set( Calendar.HOUR_OF_DAY, 3 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
long delta = next - time;
@@ -107,7 +107,7 @@
now.set( Calendar.SECOND, 0 );
now.set( Calendar.MINUTE, 2 );
now.set( Calendar.HOUR_OF_DAY, 3 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
long delta = next - time;
@@ -167,7 +167,7 @@
now.set( Calendar.HOUR_OF_DAY, 3 );
now.set( Calendar.DAY_OF_WEEK, 3 );
now.set( Calendar.MONTH, 0 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
long delta = next - time;
@@ -196,7 +196,7 @@
now.set( Calendar.MINUTE, 2 );
now.set( Calendar.HOUR_OF_DAY, 3 );
now.set( Calendar.DAY_OF_MONTH, 1 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
long delta = next - time;
@@ -214,7 +214,7 @@
month = (month + 1) % 12;
now.setTime( new Date( next ) );
-
+
assert( "Minute", now.get( Calendar.MINUTE ) == 3 );
assert( "Hour of Day", now.get( Calendar.HOUR_OF_DAY ) == 5 );
assert( "Day of month", now.get( Calendar.DAY_OF_MONTH ) == 2 );
@@ -236,13 +236,13 @@
now.set( Calendar.HOUR_OF_DAY, 3 );
now.set( Calendar.DAY_OF_MONTH, 1 );
now.set( Calendar.MONTH, 3 );
-
+
long time = now.getTime().getTime();
long next = trigger.getTimeAfter( time );
long delta = next - time;
now.setTime( new Date( next ) );
-
+
assert( "Minute", now.get( Calendar.MINUTE ) == 0 );
assert( "Hour of Day", now.get( Calendar.HOUR_OF_DAY ) == 0 );
assert( "Day of month", now.get( Calendar.DAY_OF_MONTH ) == 1 );
@@ -256,9 +256,9 @@
now.setTime( new Date( next ) );
//System.out.println( "day/Month hr:min " + now.get(
Calendar.DAY_OF_MONTH ) +
- //"/" + now.get( Calendar.MONTH ) + " " +
+ //"/" + now.get( Calendar.MONTH ) + " " +
//now.get( Calendar.HOUR ) + ":" + now.get( Calendar.MINUTE ) );
-
+
assert( "Minute", now.get( Calendar.MINUTE ) == 0 );
assert( "Hour of Day", now.get( Calendar.HOUR_OF_DAY ) == 0 );
assert( "Day of month", now.get( Calendar.DAY_OF_MONTH ) == 1 );
@@ -287,7 +287,7 @@
long delta = next - time;
now.setTime( new Date( next ) );
-
+
assert( "Minute", now.get( Calendar.MINUTE ) == 0 );
assert( "Hour of Day", now.get( Calendar.HOUR_OF_DAY ) == 0 );
assert( "Day of month", now.get( Calendar.DAY_OF_MONTH ) == 1 );
1.2 +4 -4
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/security/AuthorizationManager.java
Index: AuthorizationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/security/AuthorizationManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AuthorizationManager.java 2001/02/22 07:51:36 1.1
+++ AuthorizationManager.java 2001/04/17 03:12:13 1.2
@@ -7,20 +7,20 @@
*/
package org.apache.cornerstone.services.security;
-import java.security.Permission;
import java.security.AccessControlException;
+import java.security.Permission;
import java.security.Principal;
import org.apache.phoenix.Service;
/**
- * Service to manage authorization.
+ * Service to manage authorization.
* May be succeeded by JAAS in the the future.
*
* Warning: This is experimental and will most likely change in the future.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public interface AuthorizationManager
+public interface AuthorizationManager
extends Service
{
//Permissions getPermissions( Principal principal );
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/security/Realm.java
Index: Realm.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/security/Realm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Realm.java 2001/02/22 07:51:36 1.1
+++ Realm.java 2001/04/17 03:12:13 1.2
@@ -12,9 +12,9 @@
import org.apache.phoenix.Service;
/**
- * Interface for a Realm.
+ * Interface for a Realm.
* A Realm is a grouping of principals. The names of principals are guarenteed
- * to be unique within a realm. Sample realms may be
+ * to be unique within a realm. Sample realms may be
* <ul>
* <li>unix domain</li>
* <li>NT domain</li>
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/security/RoleManager.java
Index: RoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/security/RoleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleManager.java 2001/02/22 07:51:36 1.1
+++ RoleManager.java 2001/04/17 03:12:14 1.2
@@ -15,10 +15,10 @@
* TODO: This should be refactored to be per-Realm.
*
* Warning: This is experimental and will most likely change in the future.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public interface RoleManager
+public interface RoleManager
extends Service
{
boolean isPrincipalInRole( Principal principal, String role );
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/ServerSocketFactory.java
Index: ServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/ServerSocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerSocketFactory.java 2001/02/22 07:51:36 1.1
+++ ServerSocketFactory.java 2001/04/17 03:12:15 1.2
@@ -42,7 +42,7 @@
throws IOException;
/**
- * Creates a socket on a particular network interface on specified port
+ * Creates a socket on a particular network interface on specified port
* with a specified backLog.
*
* @param port the port
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketFactory.java
Index: SocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SocketFactory.java 2001/02/22 07:51:36 1.1
+++ SocketFactory.java 2001/04/17 03:12:16 1.2
@@ -32,7 +32,7 @@
throws IOException;
/**
- * Create a socket and connect to remote address specified
+ * Create a socket and connect to remote address specified
* originating from specified local address.
*
* @param address the remote address
@@ -42,7 +42,7 @@
* @return the socket
* @exception IOException if an error occurs
*/
- Socket createSocket( InetAddress address, int port,
+ Socket createSocket( InetAddress address, int port,
InetAddress localAddress, int localPort )
throws IOException;
}
1.4 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketManager.java
Index: SocketManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/sockets/SocketManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketManager.java 2001/04/12 11:15:16 1.3
+++ SocketManager.java 2001/04/17 03:12:16 1.4
@@ -12,10 +12,10 @@
/**
* Service to manager the socket factories.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
-public interface SocketManager
+public interface SocketManager
extends Service
{
/**
1.2 +1 -1
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Repository.java
Index: Repository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Repository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Repository.java 2001/03/13 04:52:01 1.1
+++ Repository.java 2001/04/17 03:12:18 1.2
@@ -14,7 +14,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
*/
-public interface Repository
+public interface Repository
extends Component
{
Repository getChildRepository( String childName );
1.2 +3 -3
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Store.java
Index: Store.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/Store.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Store.java 2001/03/13 04:52:01 1.1
+++ Store.java 2001/04/17 03:12:18 1.2
@@ -19,8 +19,8 @@
extends Service, ComponentSelector
{
/**
- * This method accept a Configuration object as hint and return the
- * corresponding Repository.
+ * This method accept a Configuration object as hint and return the
+ * corresponding Repository.
* The Configuration must be in the form of:
* <repository destinationURL="[URL of this repository]"
* type="[repository type ex. OBJECT or STREAM or MAIL etc.]"
@@ -28,6 +28,6 @@
* [addition configuration]
* </repository>
*/
- Component select( Object hint )
+ Component select( Object hint )
throws ComponentManagerException;
}
1.2 +2 -2
jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/StreamRepository.java
Index: StreamRepository.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/services/store/StreamRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamRepository.java 2001/03/13 04:52:01 1.1
+++ StreamRepository.java 2001/04/17 03:12:19 1.2
@@ -12,11 +12,11 @@
import java.util.Iterator;
/**
- * Repository for Streams
+ * Repository for Streams
*
* @author <a href="mailto:[EMAIL PROTECTED]">Federico Barbieri</a>
*/
-public interface StreamRepository
+public interface StreamRepository
extends Repository
{
OutputStream put( String key );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
