You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/14 13:02:56 UTC
cvs commit: jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/xcommands Chat.java Echo.java
donaldp 02/05/14 04:02:56
Modified: demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver
AltrmiHelloWorldServer.java
AltrmiHelloWorldServerImpl.java
AltrmiHelloWorldServerTester.java
demo/src/java/org/apache/avalon/apps/demos/helloworldserver
HelloWorldHandler.java HelloWorldServerImpl.java
demo/src/java/org/apache/avalon/apps/demos/rmihelloworldserver
RMIHelloWorldClient.java
demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver
SOAPHelloWorldServer.java
SOAPHelloWorldServerTester.java
hsql/src/java/org/apache/avalon/hsql/blocks
DefaultHypersonicSQL.java HypersonicSQLHandler.java
hsql/src/java/org/apache/avalon/hsql/services
HypersonicSQL.java
xcommander/src/java/org/apache/avalon/xcommander
CommandHandler.java DefaultSAXHandler.java
DocumentHandler.java ElementHandler.java
XCommanderHandler.java XCommanderService.java
xcommander/src/java/org/apache/avalon/xcommander/saxhandlers
AbstractElementHandler.java
ArgumentsElementHandler.java
ArraylistElementHandler.java
BooleanElementHandler.java
CommandElementHandler.java
ConstructorElementHandler.java
DoubleElementHandler.java EmptyElementHandler.java
FloatElementHandler.java IntElementHandler.java
MethodElementHandler.java ObjectElementHandler.java
ReferenceElementHandler.java
StringElementHandler.java TypeElementHandler.java
xcommander/src/java/org/apache/avalon/xcommander/xcommands
Chat.java Echo.java
Log:
Restyled.
Revision Changes Path
1.2 +0 -2 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServer.java
Index: AltrmiHelloWorldServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AltrmiHelloWorldServer.java 4 Mar 2002 13:17:36 -0000 1.1
+++ AltrmiHelloWorldServer.java 14 May 2002 11:02:54 -0000 1.2
@@ -14,6 +14,4 @@
public interface AltrmiHelloWorldServer
{
String ROLE = AltrmiHelloWorldServer.class.getName();
-
-
}
1.5 +20 -25 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerImpl.java
Index: AltrmiHelloWorldServerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AltrmiHelloWorldServerImpl.java 12 May 2002 10:13:44 -0000 1.4
+++ AltrmiHelloWorldServerImpl.java 14 May 2002 11:02:54 -0000 1.5
@@ -7,26 +7,26 @@
*/
package org.apache.avalon.apps.demos.altrmihelloworldserver;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockContext;
-import org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer;
import org.apache.excalibur.altrmi.server.AltrmiPublisher;
/**
* This demo Server applications shows the use of Altrmi to publish the
* HelloWorld block's API to clients over TCP/IP.
*
- * HelloWorld would normally mount as just a HTTP hack showing a HTML
- * HelloWorld message to suitably forgiving Browsers. With the
+ * HelloWorld would normally mount as just a HTTP hack showing a HTML
+ * HelloWorld message to suitably forgiving Browsers. With the
* addition of this block and suitably assembled, the HelloWorld
* application is given more life.
*
@@ -37,32 +37,29 @@
*
************************************************************
************************************************************
- *
+ *
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
* @version 1.0
*/
public class AltrmiHelloWorldServerImpl
extends AbstractLogEnabled
- implements Block, AltrmiHelloWorldServer,
- Serviceable, Configurable, Initializable
+ implements Block, AltrmiHelloWorldServer, Serviceable, Configurable, Initializable
{
- protected HelloWorldServer mHelloWorldServer;
-
- protected AltrmiPublisher mAltrmiPublisher;
-
- protected BlockContext m_context;
-
+ protected HelloWorldServer mHelloWorldServer;
+ protected AltrmiPublisher mAltrmiPublisher;
+ protected BlockContext m_context;
protected String publicationName;
- public void initialize() throws Exception {
+ public void initialize() throws Exception
+ {
// being phased out.
//mAltrmiPublisher.publish(mHelloWorldServer, publicationName, HelloWorldServer.class);
- getLogger().info("HelloWorldServer published as " + publicationName);
+ getLogger().info( "HelloWorldServer published as " + publicationName );
// This is only to help newbies.....
- System.out.println("AltrmiHelloWorld server running. Use avalon-altrmidemo-tester.jar to connect to and test it");
+ System.out.println( "AltrmiHelloWorld server running. Use avalon-altrmidemo-tester.jar to connect to and test it" );
}
-
+
public void contextualize( final Context context )
{
m_context = (BlockContext)context;
@@ -71,17 +68,15 @@
public void configure( final Configuration configuration )
throws ConfigurationException
{
- publicationName = configuration.getChild("pub-name").getValue();
+ publicationName = configuration.getChild( "pub-name" ).getValue();
}
public void service( final ServiceManager serviceManager )
throws ServiceException
{
- getLogger().info("SOAPHelloWorldServer.compose()");
+ getLogger().info( "SOAPHelloWorldServer.compose()" );
mHelloWorldServer = (HelloWorldServer)serviceManager.lookup( HelloWorldServer.ROLE );
mAltrmiPublisher = (AltrmiPublisher)serviceManager.lookup( AltrmiPublisher.class.getName() );
-
}
-
}
1.4 +14 -16 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerTester.java
Index: AltrmiHelloWorldServerTester.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/altrmihelloworldserver/AltrmiHelloWorldServerTester.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AltrmiHelloWorldServerTester.java 3 Apr 2002 12:06:01 -0000 1.3
+++ AltrmiHelloWorldServerTester.java 14 May 2002 11:02:54 -0000 1.4
@@ -8,34 +8,32 @@
package org.apache.avalon.apps.demos.altrmihelloworldserver;
import org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer;
-import org.apache.excalibur.altrmi.client.AltrmiHostContext;
import org.apache.excalibur.altrmi.client.AltrmiFactory;
-import org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
+import org.apache.excalibur.altrmi.client.AltrmiHostContext;
import org.apache.excalibur.altrmi.client.impl.ServerClassAltrmiFactory;
-
+import org.apache.excalibur.altrmi.client.impl.socket.SocketObjectStreamHostContext;
/**
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
* @version 1.0
*/
public class AltrmiHelloWorldServerTester
-
{
- protected HelloWorldServer mHelloWorldServer;
-
- public static void main(String[] args) throws Exception
+ public static void main( String[] args ) throws Exception
{
- try {
- AltrmiHostContext arhc = new SocketObjectStreamHostContext("127.0.0.1", 8666);
- ServerClassAltrmiFactory af = new ServerClassAltrmiFactory(false);
- af.setHostContext(arhc);
- HelloWorldServer hws = (HelloWorldServer) af.lookup("helloworld");
- hws.setGreeting("Howdie Partner");
+ try
+ {
+ AltrmiHostContext arhc = new SocketObjectStreamHostContext( "127.0.0.1", 8666 );
+ ServerClassAltrmiFactory af = new ServerClassAltrmiFactory( false );
+ af.setHostContext( arhc );
+ final HelloWorldServer hws =
+ (HelloWorldServer)af.lookup( "helloworld" );
+ hws.setGreeting( "Howdie Partner" );
System.out.println( "The greeting on the HelloWorldServer block has been changed to 'Howdie Partner'. Point your browser to http://localhost:7666 to see it." );
- } catch (Throwable t) {
+ }
+ catch( final Throwable t )
+ {
t.printStackTrace();
}
-
}
-
}
1.4 +0 -1 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldHandler.java
Index: HelloWorldHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HelloWorldHandler.java 12 May 2002 11:36:36 -0000 1.3
+++ HelloWorldHandler.java 14 May 2002 11:02:54 -0000 1.4
@@ -26,7 +26,6 @@
implements ConnectionHandler
{
protected static int c_counter;
-
protected String m_greeting;
protected HelloWorldHandler( final String greeting )
1.5 +19 -21 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldServerImpl.java
Index: HelloWorldServerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/helloworldserver/HelloWorldServerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HelloWorldServerImpl.java 12 May 2002 10:13:44 -0000 1.4
+++ HelloWorldServerImpl.java 14 May 2002 11:02:54 -0000 1.5
@@ -10,21 +10,21 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.UnknownHostException;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
+import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
+import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
-import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
-import org.apache.avalon.cornerstone.services.sockets.SocketManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockContext;
@@ -35,16 +35,14 @@
*/
public class HelloWorldServerImpl
extends AbstractLogEnabled
- implements Block, HelloWorldServer,
- Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
+ implements Block, HelloWorldServer, Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
{
- protected SocketManager m_socketManager;
- protected ConnectionManager m_connectionManager;
-
- protected BlockContext m_context;
- protected String m_greeting = "Hello World";
- protected InetAddress m_bindTo;
- protected int m_port;
+ protected SocketManager m_socketManager;
+ protected ConnectionManager m_connectionManager;
+ protected BlockContext m_context;
+ protected String m_greeting = "Hello World";
+ protected InetAddress m_bindTo;
+ protected int m_port;
public void setGreeting( final String greeting )
{
@@ -59,7 +57,7 @@
public void configure( final Configuration configuration )
throws ConfigurationException
{
- m_port = configuration.getChild("port").getValueAsInteger( 8000 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 8000 );
try
{
@@ -75,7 +73,7 @@
public void service( final ServiceManager serviceManager )
throws ServiceException
{
- getLogger().info("HelloWorldServer.compose()");
+ getLogger().info( "HelloWorldServer.compose()" );
m_socketManager = (SocketManager)serviceManager.lookup( SocketManager.ROLE );
m_connectionManager = (ConnectionManager)serviceManager.lookup( ConnectionManager.ROLE );
@@ -91,7 +89,7 @@
m_connectionManager.connect( "HelloWorldListener", serverSocket, this );
// This is only to help newbies.....
- System.out.println("HelloWorld server running with a greeting of '"+m_greeting+"'. Point your browser to http://localhost:" + m_port + " to see its page");
+ System.out.println( "HelloWorld server running with a greeting of '" + m_greeting + "'. Point your browser to http://localhost:" + m_port + " to see its page" );
}
/**
@@ -111,7 +109,7 @@
/**
* Release a previously created ConnectionHandler e.g. for spooling.
*/
- public void releaseConnectionHandler(ConnectionHandler connectionHandler)
+ public void releaseConnectionHandler( ConnectionHandler connectionHandler )
{
}
}
1.2 +2 -3 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/rmihelloworldserver/RMIHelloWorldClient.java
Index: RMIHelloWorldClient.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/rmihelloworldserver/RMIHelloWorldClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RMIHelloWorldClient.java 4 Mar 2002 13:17:36 -0000 1.1
+++ RMIHelloWorldClient.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,9 +7,8 @@
*/
package org.apache.avalon.apps.demos.rmihelloworldserver;
-import java.rmi.RemoteException;
-import java.rmi.registry.Registry;
import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
/**
* Client for <code>RMIHelloWorldServer</code>.
@@ -27,6 +26,6 @@
final Registry registry = LocateRegistry.getRegistry( host, port );
final RMIHelloWorldServer server = (RMIHelloWorldServer)registry.lookup( "org/apache/avalon/cornerstone/demos/rmihelloworldserver/RMIHelloWorldServer" );
- System.out.println( "sayHello( " + yourName + " ): " + server.sayHello( yourName) );
+ System.out.println( "sayHello( " + yourName + " ): " + server.sayHello( yourName ) );
}
}
1.2 +0 -4 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver/SOAPHelloWorldServer.java
Index: SOAPHelloWorldServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver/SOAPHelloWorldServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPHelloWorldServer.java 4 Mar 2002 13:17:36 -0000 1.1
+++ SOAPHelloWorldServer.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,8 +7,6 @@
*/
package org.apache.avalon.apps.demos.soaphelloworldserver;
-import org.apache.avalon.phoenix.Service;
-
/**
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
* @version 1.0
@@ -16,6 +14,4 @@
public interface SOAPHelloWorldServer
{
String ROLE = SOAPHelloWorldServer.class.getName();
-
-
}
1.2 +11 -15 jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver/SOAPHelloWorldServerTester.java
Index: SOAPHelloWorldServerTester.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/demo/src/java/org/apache/avalon/apps/demos/soaphelloworldserver/SOAPHelloWorldServerTester.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPHelloWorldServerTester.java 4 Mar 2002 13:17:36 -0000 1.1
+++ SOAPHelloWorldServerTester.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,35 +7,31 @@
*/
package org.apache.avalon.apps.demos.soaphelloworldserver;
-import org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer;
import electric.registry.Registry;
import electric.registry.RegistryException;
+import org.apache.avalon.apps.demos.helloworldserver.HelloWorldServer;
/**
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
* @version 1.0
*/
public class SOAPHelloWorldServerTester
-
{
- protected HelloWorldServer mHelloWorldServer;
-
- public static void main(String[] args)
+ public static void main( final String[] args )
{
- String url = "http://127.0.0.1:7998/soap/helloworld.wsdl";
+ final String url = "http://127.0.0.1:7998/soap/helloworld.wsdl";
HelloWorldServer hws = null;
- try
+ try
{
- hws = (HelloWorldServer) Registry.bind( url, HelloWorldServer.class );
-
- } catch (RegistryException re)
+ hws =
+ (HelloWorldServer)Registry.bind( url, HelloWorldServer.class );
+ }
+ catch( final RegistryException re )
{
- System.err.println( "Opps some Glue problem " + re.getMessage());
+ System.err.println( "Opps some Glue problem " + re.getMessage() );
re.printStackTrace();
}
- hws.setGreeting("Howdie Partner");
- System.out.println( "The greeting on the HelloWorldServer block has been changed. Point your browser to http://localhost:7999 to see it." );
-
+ hws.setGreeting( "Howdie Partner" );
+ System.out.println( "The greeting on the HelloWorldServer block has been changed. Point your browser to http://localhost:7999 to see it." );
}
-
}
1.7 +44 -49 jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java
Index: DefaultHypersonicSQL.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultHypersonicSQL.java 13 May 2002 23:31:02 -0000 1.6
+++ DefaultHypersonicSQL.java 14 May 2002 11:02:55 -0000 1.7
@@ -7,54 +7,50 @@
*/
package org.apache.avalon.hsql.blocks;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.Context;
+import java.io.File;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.UnknownHostException;
+import java.sql.SQLException;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
+import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
+import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
+import org.apache.avalon.cornerstone.services.sockets.SocketManager;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.hsql.services.HypersonicSQL;
import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.BlockContext;
-import org.apache.avalon.hsql.services.HypersonicSQL;
-import org.apache.avalon.cornerstone.services.connection.ConnectionManager;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandlerFactory;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
-import org.apache.avalon.cornerstone.services.sockets.SocketManager;
-import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
import org.hsqldb.HsqlServerFactory;
import org.hsqldb.HsqlSocketRequestHandler;
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.net.ServerSocket;
-import java.sql.SQLException;
-
-
/**
* @author Paul Hammant <Pa...@yahoo.com>
* @version 1.0
*/
public class DefaultHypersonicSQL
extends AbstractLogEnabled
- implements Block, HypersonicSQL,
- Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
+ implements Block, HypersonicSQL, Contextualizable, Serviceable, Configurable, Initializable, ConnectionHandlerFactory
{
- protected SocketManager m_socketManager;
- protected ConnectionManager m_connectionManager;
+ protected SocketManager m_socketManager;
+ protected ConnectionManager m_connectionManager;
- protected BlockContext m_context;
+ protected BlockContext m_context;
- protected InetAddress m_bindTo;
- protected int m_port;
- protected String m_DatabaseName;
+ protected InetAddress m_bindTo;
+ protected int m_port;
+ protected String m_DatabaseName;
HsqlSocketRequestHandler m_HsqlSocketRequestHandler;
-
public void contextualize( final Context context )
{
m_context = (BlockContext)context;
@@ -63,29 +59,28 @@
public void configure( final Configuration configuration )
throws ConfigurationException
{
- m_port = configuration.getChild("port").getValueAsInteger( 9001 );
+ m_port = configuration.getChild( "port" ).getValueAsInteger( 9001 );
+
+ System.out.println( "Hypersonic SQL listening on port " + m_port );
+
+ Configuration db = configuration.getChild( "database" );
- System.out.println("Hypersonic SQL listening on port " + m_port);
+ String dbType = db.getAttribute( "type" );
+ String dbName = db.getAttribute( "name" );
- Configuration db = configuration.getChild("database");
-
- String dbType = db.getAttribute("type");
- String dbName = db.getAttribute("name");
-
- if (dbType.equals("contained"))
+ if( dbType.equals( "contained" ) )
{
- m_DatabaseName = m_context.getBaseDirectory().getAbsolutePath() + File.separator + dbName;
- }
- else
- {
- m_DatabaseName = dbName;
- }
-
-
+ m_DatabaseName = m_context.getBaseDirectory().getAbsolutePath() + File.separator + dbName;
+ }
+ else
+ {
+ m_DatabaseName = dbName;
+ }
+
try
{
- m_HsqlSocketRequestHandler = HsqlServerFactory.createHsqlServer(m_DatabaseName, true, false);
-
+ m_HsqlSocketRequestHandler = HsqlServerFactory.createHsqlServer( m_DatabaseName, true, false );
+
final String bindAddress = configuration.getChild( "bind" ).getValue();
m_bindTo = InetAddress.getByName( bindAddress );
}
@@ -93,7 +88,7 @@
{
throw new ConfigurationException( "Malformed bind parameter", unhe );
}
- catch( final SQLException sqle )
+ catch( final SQLException sqle )
{
throw new ConfigurationException( "Problem instatiating database", sqle );
}
@@ -102,7 +97,7 @@
public void service( final ServiceManager serviceManager )
throws ServiceException
{
- getLogger().info("HypersonicSQL.compose()");
+ getLogger().info( "HypersonicSQL.compose()" );
m_socketManager = (SocketManager)serviceManager.lookup( SocketManager.ROLE );
m_connectionManager = (ConnectionManager)serviceManager.lookup( ConnectionManager.ROLE );
@@ -127,7 +122,7 @@
public ConnectionHandler createConnectionHandler()
throws Exception
{
- final HypersonicSQLHandler handler = new HypersonicSQLHandler(m_HsqlSocketRequestHandler);
+ final HypersonicSQLHandler handler = new HypersonicSQLHandler( m_HsqlSocketRequestHandler );
setupLogger( handler );
return handler;
}
@@ -135,7 +130,7 @@
/**
* Release a previously created ConnectionHandler e.g. for spooling.
*/
- public void releaseConnectionHandler(ConnectionHandler connectionHandler)
+ public void releaseConnectionHandler( ConnectionHandler connectionHandler )
{
}
}
1.9 +7 -8 jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/HypersonicSQLHandler.java
Index: HypersonicSQLHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/HypersonicSQLHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HypersonicSQLHandler.java 13 May 2002 23:31:02 -0000 1.8
+++ HypersonicSQLHandler.java 14 May 2002 11:02:55 -0000 1.9
@@ -7,13 +7,11 @@
*/
package org.apache.avalon.hsql.blocks;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
-import org.hsqldb.HsqlSocketRequestHandler;
-
import java.io.IOException;
import java.net.Socket;
-
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.hsqldb.HsqlSocketRequestHandler;
/**
* This handles an individual incoming request.
@@ -44,12 +42,13 @@
final String remoteHost = socket.getInetAddress().getHostName();
final String remoteIP = socket.getInetAddress().getHostAddress();
- m_HsqlSocketRequestHandler.handleConnection(socket);
+ m_HsqlSocketRequestHandler.handleConnection( socket );
getLogger().debug( "AvalonDBConnection from " + remoteHost + " (" + remoteIP + ")" );
}
- public void trace( String s ) {
- getLogger().info( "HSQL-trace:" + s);
+ public void trace( final String message )
+ {
+ getLogger().info( "HSQL-trace:" + message );
}
}
1.2 +3 -5 jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/services/HypersonicSQL.java
Index: HypersonicSQL.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/services/HypersonicSQL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HypersonicSQL.java 17 Oct 2001 17:08:18 -0000 1.1
+++ HypersonicSQL.java 14 May 2002 11:02:55 -0000 1.2
@@ -11,14 +11,12 @@
* This service is a tightly coupled way to launch Hypersonic SQL inside Avalon
*
* Warning - HypersonicSQL (not itself distributed with Cornerstone) has it's own
- * server construction (threads, socket listeners, storage, etc). As such this is not a first
+ * server construction (threads, socket listeners, storage, etc). As such this is not a first
* class service for Avalon
- *
+ *
*
* @author <a href="mailto:Paul_Hammant@yahoo.com">Paul Hammant</a>
*/
-public interface HypersonicSQL
+public interface HypersonicSQL
{
-
-
}
1.2 +2 -16 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/CommandHandler.java
Index: CommandHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/CommandHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandHandler.java 25 Nov 2001 05:39:36 -0000 1.1
+++ CommandHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,30 +7,16 @@
*/
package org.apache.avalon.xcommander;
-import java.io.CharArrayWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import org.xml.sax.Attributes;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
-
/**
* Contains callback methods for handling requests and results of XCommands.
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public interface CommandHandler
+public interface CommandHandler
{
/** Provides the result returned from an XCommand. */
void handleCommand( String type, String identifier, Object results );
-
+
/** Asks for the class implementing the specified XCommand.
* You are encouraged to follow the java naming standard for
* XCommand names.
1.2 +20 -22 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/DefaultSAXHandler.java
Index: DefaultSAXHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/DefaultSAXHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultSAXHandler.java 25 Nov 2001 05:39:36 -0000 1.1
+++ DefaultSAXHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -11,7 +11,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.avalon.xcommander.saxhandlers.AbstractElementHandler;
import org.apache.avalon.xcommander.saxhandlers.ArgumentsElementHandler;
import org.apache.avalon.xcommander.saxhandlers.ArraylistElementHandler;
import org.apache.avalon.xcommander.saxhandlers.BooleanElementHandler;
@@ -25,7 +24,6 @@
import org.apache.avalon.xcommander.saxhandlers.ObjectElementHandler;
import org.apache.avalon.xcommander.saxhandlers.ReferenceElementHandler;
import org.apache.avalon.xcommander.saxhandlers.StringElementHandler;
-import org.apache.avalon.xcommander.saxhandlers.TypeElementHandler;
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
@@ -45,8 +43,8 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class DefaultSAXHandler
- extends DefaultHandler
+public class DefaultSAXHandler
+ extends DefaultHandler
implements ErrorHandler
{
// stack object containing element handlers in use
@@ -62,7 +60,7 @@
/**
* @param ch The supplied CommandHandler will receive the results of all XCommands.
*/
- DefaultSAXHandler( CommandHandler ch )
+ DefaultSAXHandler( CommandHandler ch )
{
parent = ch;
@@ -84,24 +82,24 @@
}
// SAX2 ContentHandler Functions
- public void startDocument()
+ public void startDocument()
throws SAXException
{
// the root handler is created...
stack.push( new DocumentHandler() );
}
- public void endDocument()
+ public void endDocument()
throws SAXException
{
final DocumentHandler documentHandler = (DocumentHandler)stack.pop();
documentHandler.executeCommand( parent );
}
- public void startElement( final String namespaceURI,
+ public void startElement( final String namespaceURI,
final String localName,
- final String qName,
- final Attributes atts )
+ final String qName,
+ final Attributes atts )
throws SAXException
{
ElementHandler el = null;
@@ -116,15 +114,15 @@
{
currObj = currClass.newInstance();
}
- catch ( Exception e )
+ catch( Exception e )
{
- throw new
+ throw new
SAXException( "Could not instantiate a class in DefaultSAXHandler.handlers",
e );
}
ElementHandler eh = (ElementHandler)currObj;
- if( eh.getLocalName().equals(localName) )
+ if( eh.getLocalName().equals( localName ) )
{
// we've got a correct ElementHandler!
el = eh;
@@ -137,13 +135,13 @@
// couldn't find an element anywhere.....
throw new SAXException( "No handler for xml element <" + localName + "> found." );
}
-
+
try
{
stack.peek().addChild( el );
stack.push( el );
el.start( atts );
- }
+ }
catch( final IllegalArgumentException iae )
{
// the parent will not accept elements of this type.
@@ -157,9 +155,9 @@
}
}
- public void endElement( final String namespaceURI,
+ public void endElement( final String namespaceURI,
final String localName,
- final String qName )
+ final String qName )
throws SAXException
{
stack.peek().end( contents.toString() );
@@ -167,30 +165,30 @@
stack.pop();
}
- public void characters( final char[] ch, final int start, final int length )
+ public void characters( final char[] ch, final int start, final int length )
throws SAXException
{
contents.write( ch, start, length );
}
// SAX2 ErrorHandler Functions
- public void warning( final SAXParseException spe )
+ public void warning( final SAXParseException spe )
throws SAXException
{
}
- public void error( final SAXParseException spe )
+ public void error( final SAXParseException spe )
throws SAXException
{
}
- public void fatalError( final SAXParseException spe )
+ public void fatalError( final SAXParseException spe )
throws SAXException
{
}
/** This is simply a safe wrapper for a LinkedList that implements a simple stack. */
- public class ElementHandlerStack
+ public class ElementHandlerStack
{
private LinkedList m_list = new LinkedList();
1.2 +7 -10 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/DocumentHandler.java
Index: DocumentHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/DocumentHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentHandler.java 25 Nov 2001 05:39:36 -0000 1.1
+++ DocumentHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,11 +7,8 @@
*/
package org.apache.avalon.xcommander;
-import java.io.CharArrayWriter;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import org.apache.avalon.xcommander.saxhandlers.CommandElementHandler;
import org.apache.avalon.xcommander.saxhandlers.EmptyElementHandler;
import org.xml.sax.Attributes;
@@ -30,7 +27,7 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class DocumentHandler
+public class DocumentHandler
implements ElementHandler
{
protected ArrayList children = new ArrayList();
@@ -46,13 +43,13 @@
}
/** a DocumentHandler takes CommandElementHandlers only. */
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
if( elementHandler instanceof CommandElementHandler )
{
children.add( elementHandler );
- }
+ }
else
{
throw new IllegalArgumentException();
@@ -83,8 +80,8 @@
* if the type attributes (when available) are equal. */
public boolean equalTypes( final ElementHandler elementHandler )
{
- if((elementHandler.getNamespaceURI() == this.getNamespaceURI()) &&
- (elementHandler.getLocalName() == this.getLocalName()))
+ if( ( elementHandler.getNamespaceURI() == this.getNamespaceURI() ) &&
+ ( elementHandler.getLocalName() == this.getLocalName() ) )
{
return true;
}
@@ -117,7 +114,7 @@
*
* @param ch The CommandHandler which is to receive the results of this document's XCommands.
*/
- public void executeCommand( final CommandHandler commandHandler )
+ public void executeCommand( final CommandHandler commandHandler )
throws SAXException
{
final Iterator it = children.iterator();
@@ -126,7 +123,7 @@
final ElementHandler elementHandler = (ElementHandler)it.next();
if( elementHandler instanceof CommandElementHandler )
{
- final CommandElementHandler commandElementHandler =
+ final CommandElementHandler commandElementHandler =
(CommandElementHandler)elementHandler;
commandElementHandler.executeCommand( commandHandler );
}
1.2 +1 -1 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/ElementHandler.java
Index: ElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/ElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementHandler.java 25 Nov 2001 05:39:36 -0000 1.1
+++ ElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -30,7 +30,7 @@
/** This method is called by the eh its parent when a child element is found.
*/
- void addChild( ElementHandler elementHandler )
+ void addChild( ElementHandler elementHandler )
throws IllegalArgumentException;
/** This method is called by the eh its parent when addChild() throws its
1.3 +19 -15 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderHandler.java
Index: XCommanderHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XCommanderHandler.java 12 May 2002 11:36:36 -0000 1.2
+++ XCommanderHandler.java 14 May 2002 11:02:55 -0000 1.3
@@ -16,9 +16,9 @@
import java.io.StringReader;
import java.net.Socket;
import java.net.SocketException;
+import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -35,7 +35,7 @@
{
protected final static String DEFAULT_PARSER = "org.apache.xerces.parsers.SAXParser";
protected final static String PARSER =
- System.getProperty("org.xml.sax.parser", DEFAULT_PARSER );
+ System.getProperty( "org.xml.sax.parser", DEFAULT_PARSER );
protected XMLReader m_parser;
protected XCommanderServer m_parent;
@@ -67,7 +67,7 @@
public void handleCommand( String type, String identifier, Object result )
{
- if(result instanceof GlobalResult)
+ if( result instanceof GlobalResult )
{
System.out.println( "Sending result " + result + " to main server." );
m_parent.handleCommand( type, identifier, result );
@@ -85,8 +85,8 @@
try
{
- final char[] end = new char[1];
- end[0] = '\u0000';
+ final char[] end = new char[ 1 ];
+ end[ 0 ] = '\u0000';
m_out.write( results ); // should be valid xml
m_out.write( end );
m_out.flush();
@@ -146,13 +146,13 @@
getLogger().info( "Connection from " + remoteHost + " ( " + remoteIP + " )" );
// notify XCommanderServer of the new client
- m_parent.addClient(this);
+ m_parent.addClient( this );
// read the input. When a zero byte is encountered,
// pass the input to the SAX parser.
String inputLine;
int streamResult;
- char buf[] = new char[1];
+ char buf[] = new char[ 1 ];
do
{
inputLine = "";
@@ -160,11 +160,10 @@
do
{
streamResult = m_in.read( buf, 0, 1 );
- inputLine += buf[0];
- }
- while( buf[0] != '\u0000' );
+ inputLine += buf[ 0 ];
+ } while( buf[ 0 ] != '\u0000' );
- inputLine = inputLine.substring(0,(inputLine.length()-1));
+ inputLine = inputLine.substring( 0, ( inputLine.length() - 1 ) );
if( -1 != inputLine.indexOf( "<command" ) )
{
@@ -174,8 +173,7 @@
}
m_parser.parse( new InputSource( new StringReader( inputLine ) ) );
}
- }
- while( streamResult != -1 );
+ } while( streamResult != -1 );
//Finish
m_out.flush();
@@ -206,13 +204,19 @@
}
finally
{
- try { socket.close(); }
+ try
+ {
+ socket.close();
+ }
catch( final IOException ioe )
{
getLogger().error( "Exception closing socket: " + ioe.getMessage() );
}
- try { m_parent.removeClient( this ); }
+ try
+ {
+ m_parent.removeClient( this );
+ }
catch( final Exception e )
{
}
1.3 +0 -2 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderService.java
Index: XCommanderService.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XCommanderService.java 18 Feb 2002 15:04:17 -0000 1.2
+++ XCommanderService.java 14 May 2002 11:02:55 -0000 1.3
@@ -7,8 +7,6 @@
*/
package org.apache.avalon.xcommander;
-import org.apache.avalon.phoenix.Service;
-
/**
* This is an empty service interface for the XCommander demo block.
*
1.2 +6 -6 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/AbstractElementHandler.java
Index: AbstractElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/AbstractElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ AbstractElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -8,7 +8,7 @@
package org.apache.avalon.xcommander.saxhandlers;
import java.util.ArrayList;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -17,8 +17,8 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public abstract class AbstractElementHandler
- implements ElementHandler
+public abstract class AbstractElementHandler
+ implements ElementHandler
{
protected ArrayList m_children = new ArrayList();
@@ -32,7 +32,7 @@
/** Override this method if you wish to be able to refuse the addition
* of an ElementHandler. */
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
m_children.add( elementHandler );
@@ -62,8 +62,8 @@
* if the type attributes (when available) are equal. */
public boolean equalTypes( final ElementHandler elementHandler )
{
- if((elementHandler.getNamespaceURI() == this.getNamespaceURI()) &&
- (elementHandler.getLocalName() == this.getLocalName()))
+ if( ( elementHandler.getNamespaceURI() == this.getNamespaceURI() ) &&
+ ( elementHandler.getLocalName() == this.getLocalName() ) )
{
return true;
}
1.2 +4 -4 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ArgumentsElementHandler.java
Index: ArgumentsElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ArgumentsElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArgumentsElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ ArgumentsElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -15,16 +15,16 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class ArgumentsElementHandler
+public class ArgumentsElementHandler
extends AbstractElementHandler
{
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
if( elementHandler instanceof TypeElementHandler )
{
m_children.add( elementHandler );
- }
+ }
else
{
throw new IllegalArgumentException();
1.2 +6 -6 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ArraylistElementHandler.java
Index: ArraylistElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ArraylistElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArraylistElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ ArraylistElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -17,19 +17,19 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class ArraylistElementHandler
- extends AbstractElementHandler
+public class ArraylistElementHandler
+ extends AbstractElementHandler
implements TypeElementHandler
{
private ArrayList values = new ArrayList();
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
if( elementHandler instanceof TypeElementHandler )
{
m_children.add( elementHandler );
- }
+ }
else
{
throw new IllegalArgumentException();
@@ -39,7 +39,7 @@
public void end( final String contents )
{
Iterator it = m_children.iterator();
- while ( it.hasNext() )
+ while( it.hasNext() )
{
TypeElementHandler typeElementHandler = (TypeElementHandler)it.next();
values.add( typeElementHandler.getTypeValue() );
1.2 +5 -5 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/BooleanElementHandler.java
Index: BooleanElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/BooleanElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ BooleanElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -15,13 +15,13 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class BooleanElementHandler
- extends AbstractElementHandler
- implements TypeElementHandler
+public class BooleanElementHandler
+ extends AbstractElementHandler
+ implements TypeElementHandler
{
private Boolean value;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
throw new IllegalArgumentException();
1.2 +23 -23 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/CommandElementHandler.java
Index: CommandElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/CommandElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommandElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ CommandElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,9 +7,9 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.CommandHandler;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -22,8 +22,8 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class CommandElementHandler
- extends AbstractElementHandler
+public class CommandElementHandler
+ extends AbstractElementHandler
{
/** This is the method we try to call if none is specified */
public final static String DEFAULT_METHODNAME = "toString";
@@ -33,17 +33,17 @@
private ConstructorElementHandler ceh;
private MethodElementHandler meh;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
if( elementHandler instanceof ConstructorElementHandler )
{
ceh = (ConstructorElementHandler)elementHandler;
}
- else if( elementHandler instanceof MethodElementHandler )
+ else if( elementHandler instanceof MethodElementHandler )
{
meh = (MethodElementHandler)elementHandler;
- }
+ }
else
{
throw new IllegalArgumentException();
@@ -52,8 +52,8 @@
public void start( final Attributes attributes )
{
- type = attributes.getValue( "","type" );
- identifier = attributes.getValue( "","identifier" );
+ type = attributes.getValue( "", "type" );
+ identifier = attributes.getValue( "", "identifier" );
}
/**
@@ -63,7 +63,7 @@
*
* @param ch This receives the results of the XCommand.
*/
- public void executeCommand( final CommandHandler commandHandler )
+ public void executeCommand( final CommandHandler commandHandler )
throws SAXException
{
// try to find the specified role
@@ -72,8 +72,8 @@
if( handlerClass == null )
{
- throw new SAXException( "the <command> " + identifier +
- " could not be executed - unable to " +
+ throw new SAXException( "the <command> " + identifier +
+ " could not be executed - unable to " +
"find the specified role: " + type + "!" );
}
@@ -82,14 +82,14 @@
if( null != ceh ) // otherwise, we assume a static method
{
- try
+ try
{
// try to get an object from the constructor specified
// by ceh
o = handlerClass.getConstructor( ceh.getArgumentTypes() ).
newInstance( ceh.getArguments() );
- }
+ }
catch( final Exception e )
{
// we'll try to use a static method
@@ -102,30 +102,30 @@
{
final Method m = handlerClass.getMethod( meh.getName(), meh.getArgumentTypes() );
result = m.invoke( o, meh.getArguments() );
- }
+ }
catch( final Exception e )
{
- throw new SAXException( "the <command> " + identifier +
- " could not be executed - unable " +
+ throw new SAXException( "the <command> " + identifier +
+ " could not be executed - unable " +
"to find the specified method!", e );
}
- }
+ }
else
{
- Class[] arr = new Class[0];
+ Class[] arr = new Class[ 0 ];
try
{
final Method m = handlerClass.getMethod( DEFAULT_METHODNAME, arr );
result = m.invoke( o, null );
- }
+ }
catch( final Exception e )
{
- throw new SAXException( "the <command> " + identifier +
- " could not be executed - unable to " +
+ throw new SAXException( "the <command> " + identifier +
+ " could not be executed - unable to " +
"find the default method!", e );
}
}
-
+
commandHandler.handleCommand( type, identifier, result );
}
1.2 +1 -4 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ConstructorElementHandler.java
Index: ConstructorElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ConstructorElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConstructorElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ ConstructorElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,9 +7,6 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.apache.avalon.xcommander.*;
import org.xml.sax.Attributes;
/**
@@ -17,7 +14,7 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class ConstructorElementHandler
+public class ConstructorElementHandler
extends MethodElementHandler
{
public void start( final Attributes attributes )
1.2 +4 -4 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/DoubleElementHandler.java
Index: DoubleElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/DoubleElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DoubleElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ DoubleElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -15,13 +15,13 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class DoubleElementHandler
- extends AbstractElementHandler
+public class DoubleElementHandler
+ extends AbstractElementHandler
implements TypeElementHandler
{
private Double value;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
throw new IllegalArgumentException();
1.2 +1 -1 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/EmptyElementHandler.java
Index: EmptyElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/EmptyElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmptyElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ EmptyElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -12,7 +12,7 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class EmptyElementHandler
+public class EmptyElementHandler
extends AbstractElementHandler
{
}
1.2 +3 -3 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/FloatElementHandler.java
Index: FloatElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/FloatElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FloatElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ FloatElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -16,12 +16,12 @@
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
public class FloatElementHandler
- extends AbstractElementHandler
+ extends AbstractElementHandler
implements TypeElementHandler
{
private Float value;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
throw new IllegalArgumentException();
1.2 +4 -4 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/IntElementHandler.java
Index: IntElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/IntElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ IntElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -15,13 +15,13 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class IntElementHandler
- extends AbstractElementHandler
+public class IntElementHandler
+ extends AbstractElementHandler
implements TypeElementHandler
{
private Integer value;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
throw new IllegalArgumentException();
1.2 +13 -12 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/MethodElementHandler.java
Index: MethodElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/MethodElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MethodElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ MethodElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -9,7 +9,7 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -17,19 +17,20 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class MethodElementHandler
+public class MethodElementHandler
extends AbstractElementHandler
{
protected ArgumentsElementHandler aeh;
protected String name;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
if( elementHandler instanceof ArgumentsElementHandler )
{
aeh = (ArgumentsElementHandler)elementHandler;
- } else
+ }
+ else
{
throw new IllegalArgumentException();
}
@@ -47,39 +48,39 @@
public Class[] getArgumentTypes()
{
- if ( aeh != null )
+ if( aeh != null )
{
ArrayList types = new ArrayList();
Iterator it = aeh.getChildren().iterator();
while( it.hasNext() )
{
TypeElementHandler teh = (TypeElementHandler)it.next();
- types.add(teh.getTypeClass());
+ types.add( teh.getTypeClass() );
}
- return (Class[])types.toArray(new Class[0]);
+ return (Class[])types.toArray( new Class[ 0 ] );
}
else
{
- return new Class[0];
+ return new Class[ 0 ];
}
}
public Object[] getArguments()
{
- if ( aeh != null )
+ if( aeh != null )
{
ArrayList values = new ArrayList();
Iterator it = aeh.getChildren().iterator();
while( it.hasNext() )
{
TypeElementHandler teh = (TypeElementHandler)it.next();
- values.add(teh.getTypeValue());
+ values.add( teh.getTypeValue() );
}
return values.toArray();
- }
+ }
else
{
- return new Object[0];
+ return new Object[ 0 ];
}
}
1.2 +6 -6 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ObjectElementHandler.java
Index: ObjectElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ObjectElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ ObjectElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -15,21 +15,21 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class ObjectElementHandler
- extends AbstractElementHandler
+public class ObjectElementHandler
+ extends AbstractElementHandler
implements TypeElementHandler
{
private ConstructorElementHandler ceh;
private Object obj;
private String type;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
if( elementHandler instanceof ConstructorElementHandler )
{
ceh = (ConstructorElementHandler)elementHandler;
- }
+ }
else
{
throw new IllegalArgumentException();
@@ -53,7 +53,7 @@
obj = handlerClass.getConstructor( ceh.getArgumentTypes() ).
newInstance( ceh.getArguments() );
}
- }
+ }
catch( final Exception e )
{
}
1.2 +7 -8 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ReferenceElementHandler.java
Index: ReferenceElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/ReferenceElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReferenceElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ ReferenceElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,25 +7,24 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
-import org.apache.avalon.xcommander.*;
-
/**
*
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class ReferenceElementHandler
- extends AbstractElementHandler
- implements TypeElementHandler
+public class ReferenceElementHandler
+ extends AbstractElementHandler
+ implements TypeElementHandler
{
private Object value = null;
- public void addChild( ElementHandler eh )
+ public void addChild( ElementHandler eh )
throws IllegalArgumentException
{
- throw new IllegalArgumentException();
+ throw new IllegalArgumentException();
}
public void end( String contents )
@@ -34,7 +33,7 @@
try
{
value = cl.loadClass( contents );
- }
+ }
catch( final ClassNotFoundException cnfe )
{
value = cl.getResource( contents );
1.2 +4 -4 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/StringElementHandler.java
Index: StringElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/StringElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ StringElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.xcommander.saxhandlers;
-import org.apache.avalon.xcommander.*;
+import org.apache.avalon.xcommander.ElementHandler;
import org.xml.sax.Attributes;
/**
@@ -15,13 +15,13 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class StringElementHandler
- extends AbstractElementHandler
+public class StringElementHandler
+ extends AbstractElementHandler
implements TypeElementHandler
{
private String value;
- public void addChild( final ElementHandler elementHandler )
+ public void addChild( final ElementHandler elementHandler )
throws IllegalArgumentException
{
throw new IllegalArgumentException();
1.2 +3 -2 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/TypeElementHandler.java
Index: TypeElementHandler.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/saxhandlers/TypeElementHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeElementHandler.java 25 Nov 2001 05:39:37 -0000 1.1
+++ TypeElementHandler.java 14 May 2002 11:02:55 -0000 1.2
@@ -10,14 +10,15 @@
import org.apache.avalon.xcommander.ElementHandler;
/**
- * Classes that implement this interface can be subelements
+ * Classes that implement this interface can be subelements
* of <constructor>s and <method>s.
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public interface TypeElementHandler
+public interface TypeElementHandler
extends ElementHandler
{
Class getTypeClass();
+
Object getTypeValue();
}
1.2 +7 -10 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/xcommands/Chat.java
Index: Chat.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/xcommands/Chat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Chat.java 25 Nov 2001 05:39:37 -0000 1.1
+++ Chat.java 14 May 2002 11:02:56 -0000 1.2
@@ -7,9 +7,6 @@
*/
package org.apache.avalon.xcommander.xcommands;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import org.apache.avalon.xcommander.GlobalResult;
import org.apache.avalon.xcommander.XCommand;
@@ -19,7 +16,7 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class Chat
+public class Chat
implements XCommand
{
public GlobalResult addUser( String user )
@@ -37,7 +34,7 @@
return new Message( msg );
}
- private class AddUser
+ private class AddUser
implements GlobalResult
{
String m_name;
@@ -49,11 +46,11 @@
public String toString()
{
- return "<chat action=\"addUser\">"+m_name+"</chat>";
+ return "<chat action=\"addUser\">" + m_name + "</chat>";
}
}
- private class RemoveUser
+ private class RemoveUser
implements GlobalResult
{
String m_name;
@@ -65,11 +62,11 @@
public String toString()
{
- return "<chat action=\"removeUser\">"+m_name+"</chat>";
+ return "<chat action=\"removeUser\">" + m_name + "</chat>";
}
}
- private class Message
+ private class Message
implements GlobalResult
{
String m_msg;
@@ -81,7 +78,7 @@
public String toString()
{
- return "<chat action=\"message\">"+m_msg+"</chat>";
+ return "<chat action=\"message\">" + m_msg + "</chat>";
}
}
}
1.2 +1 -1 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/xcommands/Echo.java
Index: Echo.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/xcommands/Echo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Echo.java 25 Nov 2001 05:39:37 -0000 1.1
+++ Echo.java 14 May 2002 11:02:56 -0000 1.2
@@ -14,7 +14,7 @@
*
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
-public class Echo
+public class Echo
implements XCommand
{
private String m_string;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>