hammant 01/11/02 04:17:32
Modified: apps/db build.xml
apps/db/src/conf db-assembly.xml db-config.xml db-server.xml
Log:
Gerhards's patches - move towards running DB server
Revision Changes Path
1.8 +4 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 2001/11/02 12:01:31 1.7
+++ build.xml 2001/11/02 12:17:32 1.8
@@ -149,6 +149,10 @@
<include name="bcel.jar"/>
</lib>
+ <lib dir="../../build/lib/" >
+ <include name="cornerstone.jar"/>
+ </lib>
+
<zipfileset dir="${conf.dir}" fullpath="conf/keyStore">
<include name="keystore"/>
</zipfileset>
1.2 +28 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db-assembly.xml 2001/10/28 14:09:19 1.1
+++ db-assembly.xml 2001/11/02 12:17:32 1.2
@@ -1,8 +1,32 @@
<?xml version="1.0"?>
<assembly>
-
-<!-- to do -->
-
-
+ <!-- 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.persistence.inmemory.NoPersistence"
name="db-persistence" />
+
+ <block class="org.apache.avalon.db.parser.DefaultSQLParser" name="sql-parser"
/>
+
+ <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" />
+ <provide name="db-persistence"
role="org.apache.avalon.db.services.DatabasePersistence" />
+ </block>
</assembly>
1.2 +42 -1 jakarta-avalon-cornerstone/apps/db/src/conf/db-config.xml
Index: db-config.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/conf/db-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db-config.xml 2001/10/28 14:09:19 1.1
+++ db-config.xml 2001/11/02 12:17:32 1.2
@@ -1,5 +1,46 @@
<?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>
1.2 +1 -1 jakarta-avalon-cornerstone/apps/db/src/conf/db-server.xml
Index: db-server.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/db/src/conf/db-server.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- db-server.xml 2001/10/28 14:09:19 1.1
+++ db-server.xml 2001/11/02 12:17:32 1.2
@@ -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>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
