hammant 01/11/02 04:01:32
Modified: apps/bay build.xml
apps/db build.xml
apps/db/src/java/org/apache/avalon/db/driver
AvalonDBDriver.java
apps/db/src/java/org/apache/avalon/db/transport Reply.java
apps/db/src/java/org/apache/avalon/db/transport/cmdstream/client
CommandConnection.java
apps/demo/src/conf/glue-helloworldserver
avalon-gluedemo-assembly.xml
apps/demo/src/java/org/apache/avalon/cornerstone/demos/helloworldserver
HelloWorldServerImpl.java
apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy
AbstractHttpProxyServer.java
DefaultHttpAuditingProxyServer.java
DefaultHttpFilteringProxyServer.java
apps/hsql/src/java/org/apache/avalon/hsql/blocks
HypersonicSQLHandler.java
src/xdocs todo.xml
Added: apps/db/src/java/org/apache/avalon/db/transport
TODOReply.java
apps/db/src/java/org/apache/avalon/db/transport/soap/client/glue
GlueConnection.java
Log:
New client for DB - Glue.
Revision Changes Path
1.9 +0 -2 jakarta-avalon-cornerstone/apps/bay/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/bay/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/10/26 20:04:18 1.8
+++ build.xml 2001/11/02 12:01:31 1.9
@@ -123,11 +123,9 @@
<include name="*.jar"/>
</lib>
-<!--
<lib dir="lib/">
<include name="tools.jar"/>
</lib>
--->
<zipfileset dir="${conf.dir}" fullpath="conf/keyStore">
<include name="keystore"/>
1.7 +6 -0 jakarta-avalon-cornerstone/apps/db/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2001/10/31 12:48:59 1.6
+++ build.xml 2001/11/02 12:01:31 1.7
@@ -72,6 +72,10 @@
classpathref="project.class.path"
property="bcel.present"/>
+ <available classname="electric.registry.Registry"
+ classpathref="project.class.path"
+ property="glue.present"/>
+
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -80,6 +84,8 @@
<classpath refid="project.class.path" />
<exclude name="org/apache/avalon/db/bcel/**"
unless="bcel.present" />
+ <exclude name="org/apache/avalon/db/transport/soap/client/glue/**"
+ unless="glue.present" />
</javac>
<copy todir="${build.classes}">
1.4 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/driver/AvalonDBDriver.java
Index: AvalonDBDriver.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/driver/AvalonDBDriver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AvalonDBDriver.java 2001/11/02 09:08:09 1.3
+++ AvalonDBDriver.java 2001/11/02 12:01:31 1.4
@@ -25,7 +25,7 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class
AvalonDBDriver extends AbstractDriver implements Driver {
@@ -48,7 +48,7 @@
String driver = null;
if (url.startsWith(":cmds",JDBCPREFIX.length())) {
- driver =
"org.apache.avalon.db.transport.cmdstream.client.CommandConnection";
+ driver =
"org.apache.avalon.db.transport.cmdstream.client.GlueConnection";
}
AvalonDBConnection connection = null;
try {
1.7 +2 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/Reply.java
Index: Reply.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/Reply.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Reply.java 2001/10/31 16:06:23 1.6
+++ Reply.java 2001/11/02 12:01:31 1.7
@@ -17,7 +17,7 @@
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public abstract class Reply implements Serializable {
@@ -30,6 +30,7 @@
public static final int CATALOGREPLY = 16;
public static final int UPDATEREPLY = 17;
public static final int RESULTSETMETADATA = 18;
+ public static final int TODOREPLY = 19;
private int mReplyCode;
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/TODOReply.java
Index: TODOReply.java
===================================================================
/*
* 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.avalon.db.transport;
import org.apache.avalon.db.actions.ActionException;
/**
* Class TODOReply
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public class TODOReply extends Reply {
/**
* Constructor TODOReply
*
*
* @param state
*
*/
public TODOReply() {
super(TODOREPLY);
}
}
1.5 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/client/CommandConnection.java
Index: CommandConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/client/CommandConnection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommandConnection.java 2001/10/31 09:39:53 1.4
+++ CommandConnection.java 2001/11/02 12:01:32 1.5
@@ -28,11 +28,11 @@
/**
- * Class CommandConnection
+ * Class GlueConnection
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class CommandConnection extends AvalonDBConnection {
1.1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/soap/client/glue/GlueConnection.java
Index: GlueConnection.java
===================================================================
/*
* 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.avalon.db.transport.soap.client.glue;
import electric.registry.Registry;
import electric.registry.RegistryException;
import org.apache.avalon.db.driver.AvalonDBConnection;
import org.apache.avalon.db.services.DatabaseManager;
import org.apache.avalon.db.common.AvalonDBSQLException;
import org.apache.avalon.db.transport.CreateTableRequest;
import org.apache.avalon.db.transport.Request;
import org.apache.avalon.db.transport.Reply;
import org.apache.avalon.db.transport.SelectRequest;
import org.apache.avalon.db.transport.ExceptionReply;
import org.apache.avalon.db.transport.TODOReply;
import org.apache.avalon.db.actions.ActionException;
import java.sql.SQLException;
/**
* Class GlueConnection
*
*
* @author Paul Hammant <a
href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>
* @version $Revision: 1.1 $
*/
public class GlueConnection extends AvalonDBConnection {
private DatabaseManager mDBManager;
protected void initialize(String host, int port, String url) throws SQLException
{
String glueURL = "TODO"; // morph url (jdbc:avalondb:...) into Glue HTTP url
try {
mDBManager = (DatabaseManager) Registry.bind( glueURL,
DatabaseManager.class);
} catch (RegistryException re) {
throw new AvalonDBSQLException(
"Some IO Exception during connection creation to SOAP Service" + url
+ " during connection creation", re);
}
}
protected void closeConnection() throws SQLException {
// TODO
}
/**
* Method sendRequest
*
*
* @param request
*
* @return
*
* @throws SQLException
*
*/
public Reply sendRequest(Request request) throws SQLException {
try {
if (request instanceof CreateTableRequest) {
return mDBManager.processCreateTableRequest((CreateTableRequest)
request);
} else if (request instanceof SelectRequest) {
return mDBManager.processSelectRequest((SelectRequest) request);
} else {
return new TODOReply();
}
} catch (ActionException ae) {
return new ExceptionReply(ae.getMessage());
}
//TODO Handle Glue excpetion.
}
}
1.3 +0 -4
jakarta-avalon-cornerstone/apps/demo/src/conf/glue-helloworldserver/Attic/avalon-gluedemo-assembly.xml
1.2 +3 -0
jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/helloworldserver/HelloWorldServerImpl.java
Index: HelloWorldServerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/helloworldserver/HelloWorldServerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HelloWorldServerImpl.java 2001/09/10 20:52:48 1.1
+++ HelloWorldServerImpl.java 2001/11/02 12:01:32 1.2
@@ -89,6 +89,9 @@
final ServerSocket serverSocket = factory.createServerSocket( m_port, 5,
m_bindTo );
m_connectionManager.connect( "HelloWorldListener", serverSocket, this );
+
+ // This is only to help newbies.....
+ System.out.println("HelloWorld server running. Point your browser to
http://localhost:"; + m_port + " to see its page");
}
/**
1.2 +6 -0
jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy/AbstractHttpProxyServer.java
Index: AbstractHttpProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy/AbstractHttpProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractHttpProxyServer.java 2001/09/10 20:52:57 1.1
+++ AbstractHttpProxyServer.java 2001/11/02 12:01:32 1.2
@@ -96,7 +96,13 @@
final ServerSocket serverSocket = factory.createServerSocket( m_port, 5,
m_bindTo );
m_connectionManager.connect( "HttpProxyListener-" + m_name, serverSocket,
this );
+
+ // This is only to help newbies.....
+ System.out.println(getShortName() + " HTTP Proxy server running. Configure
your browser to proxy through localhost:" + m_port + " to use it");
+
}
+
+ protected abstract String getShortName();
/**
* Construct an appropriate ConnectionHandler.
1.2 +6 -0
jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy/DefaultHttpAuditingProxyServer.java
Index: DefaultHttpAuditingProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy/DefaultHttpAuditingProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultHttpAuditingProxyServer.java 2001/09/10 20:52:57 1.1
+++ DefaultHttpAuditingProxyServer.java 2001/11/02 12:01:32 1.2
@@ -32,4 +32,10 @@
{
return new HttpAuditingProxyHandler( m_forwardToAnotherProxy );
}
+
+ protected String getShortName()
+ {
+ return "Auditing";
+ }
+
}
1.2 +5 -0
jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy/DefaultHttpFilteringProxyServer.java
Index: DefaultHttpFilteringProxyServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/demo/src/java/org/apache/avalon/cornerstone/demos/httpproxy/DefaultHttpFilteringProxyServer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultHttpFilteringProxyServer.java 2001/09/10 20:52:57 1.1
+++ DefaultHttpFilteringProxyServer.java 2001/11/02 12:01:32 1.2
@@ -223,4 +223,9 @@
return new String[] {"TODO"}; // TODO PH
}
+ protected String getShortName()
+ {
+ return "Filtering";
+ }
+
}
1.5 +1 -1
jakarta-avalon-cornerstone/apps/hsql/src/java/org/apache/avalon/hsql/blocks/HypersonicSQLHandler.java
Index: HypersonicSQLHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/hsql/src/java/org/apache/avalon/hsql/blocks/HypersonicSQLHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HypersonicSQLHandler.java 2001/10/22 21:00:06 1.4
+++ HypersonicSQLHandler.java 2001/11/02 12:01:32 1.5
@@ -47,7 +47,7 @@
m_HypersonicSocketRequestHandler.handleConnection(socket);
- getLogger().debug( "ApacheDBConnection from " + remoteHost + " (" +
remoteIP + ")" );
+ getLogger().debug( "AvalonDBConnection from " + remoteHost + " (" +
remoteIP + ")" );
}
public void trace( String s ) {
1.3 +2 -2 jakarta-avalon-cornerstone/src/xdocs/todo.xml
Index: todo.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/xdocs/todo.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- todo.xml 2001/09/04 16:28:34 1.2
+++ todo.xml 2001/11/02 12:01:32 1.3
@@ -157,7 +157,7 @@
<p>
See <link
href="http://sourceforge.net/projects/jradius/";>http://sourceforge.net/projects/jradius/</link>
for a Java implementation. Unfortunately, it's license is unsuitable for
compilation against Apache
- foundation classes.
+ foundation classes. The RFCs for RADIUS are <link
href="http://www.ietf.org/rfc/rfc2865.txt?number=2865";>2865</link> and <link
href="http://www.ietf.org/rfc/rfc2868.txt?number=2868";>2868</link>.
</p>
</s2>
<s2 title="Finger">
@@ -166,7 +166,7 @@
</p>
<p>
An essential read <link
href="http://www-cse.ucsd.edu/users/bsy/coke.history.txt";>
- http://www-cse.ucsd.edu/users/bsy/coke.history.txt</link>. About a
prototype Internet application.
+ http://www-cse.ucsd.edu/users/bsy/coke.history.txt</link>. About a
prototype Internet application. The RFC for finger is <link
href="http://www.ietf.org/rfc/rfc1288.txt?number=1288";>1288</link>.
</p>
</s2>
<s2 title="Internet Relay Chat">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
