Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/build.xml,v
retrieving revision 1.6
diff -u -r1.6 build.xml
--- build.xml	2001/10/31 12:48:59	1.6
+++ build.xml	2001/11/02 11:42:12
@@ -146,6 +146,10 @@
       <zipfileset dir="${conf.dir}" fullpath="conf/keyStore">
         <include name="keystore"/>
       </zipfileset>   
+
+     <zipfileset dir="../../build/lib/" prefix="SAR-INF/lib">
+        <include name="*.jar"/>
+     </zipfileset>
       
     </sar>
Index: src/conf/db-assembly.xml
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/src/conf/db-assembly.xml,v
retrieving revision 1.1
diff -u -r1.1 db-assembly.xml
--- src/conf/db-assembly.xml	2001/10/28 14:09:19	1.1
+++ src/conf/db-assembly.xml	2001/11/02 11:42:13
@@ -1,8 +1,29 @@
 <?xml version="1.0"?>
 
 <assembly>
+       <!-- The ThreadManager block -->
+      <block class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" 
+             name="thread-manager" />
+     
+      <!-- The Connection Manager block -->
+      <block class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
+             name="connections">
+        <provide name="thread-manager" 
+                 role="org.apache.avalon.cornerstone.services.threads.ThreadManager" />
+      </block>
+    
+      <!-- The Socket Manager block -->
+      <block class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager" name="sockets"/>
+      
+      <block class="org.apache.avalon.db.parser.DefaultSQLParser" name="sql-parser" />
 
-<!-- to do -->
+      <block class="org.apache.avalon.db.optimizer.DefaultSQLOptimizer" name="sql-optimizer" />
 
-
+      <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="sql-parser" role="org.apache.avalon.db.services.SQLParser" />
+        <provide name="sql-optimizer" role="org.apache.avalon.db.services.SQLOptimizer" />  
+      </block>
 </assembly>
Index: src/conf/db-config.xml
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/src/conf/db-config.xml,v
retrieving revision 1.1
diff -u -r1.1 db-config.xml
--- src/conf/db-config.xml	2001/10/28 14:09:19	1.1
+++ src/conf/db-config.xml	2001/11/02 11:42:13
@@ -1,5 +1,45 @@
 <?xml version="1.0"?>
 
 <config>
-  <!-- to do -->
+    <thread-manager>
+        <thread-group>
+            <name>default</name>
+    
+            <!-- normal priority == 5, max-priority = 10 -->
+            <priority>5</priority> 
+    
+            <!-- are threads deamon threads ? -->
+            <is-daemon>false</is-daemon>
+    
+            <max-threads>40</max-threads>
+            <!-- these are ignored at the moment but will be fixed in later revisions -->
+            <min-threads>20</min-threads>
+            <min-spare-threads>20</min-spare-threads>
+        </thread-group>
+    </thread-manager>
+
+    <sockets>
+        <server-sockets>
+            <factory name="plain"
+                     class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory" />
+        </server-sockets>
+    
+        <client-sockets>
+            <factory name="plain"
+                     class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory" />
+        </client-sockets>
+    </sockets>
+
+    <avalondb-server>
+        <!-- used by Socket Manager -->
+        <port>9001</port>
+        <database type="" name="AvalonDB"/>
+        <bind>127.0.0.1</bind>
+        <dbhandler>
+            <connectiontimeout> 360000 </connectiontimeout>
+        </dbhandler>
+    </avalondb-server>
+
+    <sql-parser>TODO</sql-parser>
+    <sql-optimizer>TODO</sql-optimizer>
 </config>
Index: src/conf/db-server.xml
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/src/conf/db-server.xml,v
retrieving revision 1.1
diff -u -r1.1 db-server.xml
--- src/conf/db-server.xml	2001/10/28 14:09:19	1.1
+++ src/conf/db-server.xml	2001/11/02 11:42:13
@@ -12,7 +12,7 @@
       <category name="" target="default" priority="DEBUG" />
       <category name="objectstorage" target="objectstorage-target" priority="DEBUG" />
 
-      <log-target name="default" location="/logs/avalon-demo.log" />
+      <log-target name="default" location="/logs/avalon-db.log" />
       <log-target name="objectstorage-target" location="/logs/objectstorage.log" />
 
     </logs>
Index: src/java/org/apache/avalon/db/persistence/store/StorePersistence.xinfo
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.xinfo,v
retrieving revision 1.2
diff -u -r1.2 StorePersistence.xinfo
--- src/java/org/apache/avalon/db/persistence/store/StorePersistence.xinfo	2001/10/30 17:45:14	1.2
+++ src/java/org/apache/avalon/db/persistence/store/StorePersistence.xinfo	2001/11/02 11:42:14
@@ -12,10 +12,12 @@
     <service name="org.apache.avalon.db.services.DatabasePersistor" version="1.0" />
   </services>
 
+  <!--
   <dependencies>
     <dependency>
       <service name="org.apache.avalon.cornerstone.services.store.Store" version="1.0"/>
     </dependency>         
   </dependencies>  
+  -->
 
 </blockinfo>
Index: src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java,v
retrieving revision 1.8
diff -u -r1.8 AbstractDatabaseManager.java
--- src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java	2001/11/02 11:09:08	1.8
+++ src/java/org/apache/avalon/db/server/AbstractDatabaseManager.java	2001/11/02 11:42:14
@@ -60,8 +60,10 @@
 
         mSQLParser = (SQLParser) componentManager.lookup(SQLParser.class.getName());
         mSQLOptimizer = (SQLOptimizer) componentManager.lookup(SQLOptimizer.class.getName());
+        /*
         mDatabasePersistor =
             (DatabasePersistor) componentManager.lookup(DatabasePersistor.class.getName());
+        */
     }
 
     /**
Index: src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java,v
retrieving revision 1.3
diff -u -r1.3 PlainCMDDatabaseManager.java
--- src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java	2001/11/02 11:09:08	1.3
+++ src/java/org/apache/avalon/db/transport/cmdstream/server/PlainCMDDatabaseManager.java	2001/11/02 11:42:15
@@ -95,6 +95,7 @@
             final String bindAddress = configuration.getChild("bind").getValue();
 
             mBindTo = InetAddress.getByName(bindAddress);
+            System.out.println("AvalonDB started!");
         } catch (final UnknownHostException unhe) {
             throw new ConfigurationException("Malformed bind parameter", unhe);
         }