hammant 01/11/03 07:02:07
Modified: apps/db build.xml
apps/db/src/conf db-assembly.xml
apps/db/src/java/org/apache/avalon/db/server
AbstractDatabaseManager.java
apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server
PlainCMDDatabaseManager.java
PlainCMDDatabaseManager.xinfo
Log:
Correct dependancies. DatabasePersistor in too many places
Revision Changes Path
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 2001/11/02 22:37:52 1.9
+++ build.xml 2001/11/03 15:02:07 1.10
@@ -158,7 +158,7 @@
</lib>
<lib dir="lib">
- <include name="bcel.jar"/>
+ <include name="BCEL.jar"/>
</lib>
<lib dir="../../build/lib/" >
1.6 +7 -5
jakarta-avalon-cornerstone/apps/db/src/conf/db-assembly.xml
Index: db-assembly.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/conf/db-assembly.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- db-assembly.xml 2001/11/03 13:26:21 1.5
+++ db-assembly.xml 2001/11/03 15:02:07 1.6
@@ -19,17 +19,19 @@
<block
class="org.apache.avalon.cornerstone.blocks.dom.DOMBuilderFactory"
name="dom-builder-factory" />
- <block class="org.apache.avalon.db.bcel.parser.LXSQLParser"
name="sql-parser" />
+ <block class="org.apache.avalon.db.bcel.parser.LXSQLParser"
name="sql-parser">
+ <provide name="dom-builder-factory"
role="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory" />
+ <provide name="db-persistor"
role="org.apache.avalon.db.services.DatabasePersistor" />
+ </block>
<block class="org.apache.avalon.db.optimizer.DefaultSQLOptimizer"
name="sql-optimizer" />
- <block
class="org.apache.avalon.db.transport.cmdstream.server.PlainCMDDatabaseManager"
name="avalondb-server" >
+ <block
class="org.apache.avalon.db.transport.cmdstream.server.PlainCMDDatabaseManager"
+ name="avalondb-server" >
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
-
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />
- <provide name="dom-builder-factory"
role="org.apache.avalon.cornerstone.services.dom.DocumentBuilderFactory" />
+
role="org.apache.avalon.cornerstone.services.connection.ConnectionManager" />
<provide name="sql-parser"
role="org.apache.avalon.db.services.SQLParser" />
<provide name="sql-optimizer"
role="org.apache.avalon.db.services.SQLOptimizer" />
- <provide name="db-persistor"
role="org.apache.avalon.db.services.DatabasePersistor" />
</block>
</assembly>
1.9 +1 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java
Index: AbstractDatabaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractDatabaseManager.java 2001/11/02 11:09:08 1.8
+++ AbstractDatabaseManager.java 2001/11/03 15:02:07 1.9
@@ -37,13 +37,12 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public abstract class AbstractDatabaseManager extends AbstractLoggable
implements Composable {
protected SQLParser mSQLParser;
protected SQLOptimizer mSQLOptimizer;
- protected DatabasePersistor mDatabasePersistor;
/**
* Method compose
@@ -60,8 +59,6 @@
mSQLParser = (SQLParser)
componentManager.lookup(SQLParser.class.getName());
mSQLOptimizer = (SQLOptimizer)
componentManager.lookup(SQLOptimizer.class.getName());
- mDatabasePersistor =
- (DatabasePersistor)
componentManager.lookup(DatabasePersistor.class.getName());
}
/**
1.5 +4 -0
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java
Index: PlainCMDDatabaseManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PlainCMDDatabaseManager.java 2001/11/02 12:17:07 1.4
+++ PlainCMDDatabaseManager.java 2001/11/03 15:02:07 1.5
@@ -131,6 +131,8 @@
final ServerSocket serverSocket = factory.createServerSocket(mPort,
5, mBindTo);
mConnectionManager.connect("AvalonDBListener", serverSocket, this);
+
+ System.out.println("AvalonDBListener server running on port " +
mPort);
}
/**
@@ -140,6 +142,8 @@
* @exception Exception if an error occurs
*/
public ConnectionHandler createConnectionHandler() throws Exception {
+
+ System.out.println("");
DBConnectionHandler dbConnectionHandler = new
DBConnectionHandler(this);
1.4 +1 -4
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.xinfo
Index: PlainCMDDatabaseManager.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.xinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PlainCMDDatabaseManager.xinfo 2001/11/03 08:21:00 1.3
+++ PlainCMDDatabaseManager.xinfo 2001/11/03 15:02:07 1.4
@@ -24,9 +24,6 @@
</dependency>
<dependency>
<service
name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
version="1.0"/>
- </dependency>
- <dependency>
- <service name="org.apache.avalon.db.services.DatabasePersistor"
version="1.0"/>
- </dependency>
+ </dependency>
</dependencies>
</blockinfo>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
