hammant 01/11/12 13:46:25
Modified: apps/db/src/conf db-assembly.xml db-config.xml
apps/db/src/java/org/apache/avalon/db/data/impl
AbstractQueryable.java AbstractTable.java
apps/db/src/java/org/apache/avalon/db/persistence/store
StorePersistence.java
Log:
store works in rudimentary way.
Revision Changes Path
1.9 +11 -1
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- db-assembly.xml 2001/11/12 21:16:09 1.8
+++ db-assembly.xml 2001/11/12 21:46:24 1.9
@@ -5,6 +5,12 @@
<!-- Cornerstone regular blocks -->
<!-- ========================== -->
+ <!-- The Storage block ... used by Store Persistence -->
+ <!--
+ <block
class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager"
+ name="objectstorage" />
+ -->
+
<!-- The ThreadManager block -->
<block
class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
name="thread-manager" />
@@ -25,10 +31,14 @@
<!-- =============== -->
<!-- Database Persistance -->
+
<block class="org.apache.avalon.db.persistence.inmemory.NoPersistence"
name="db-persistor" />
<!--
- <block class="org.apache.avalon.db.persistence.store.StorePersistence"
name="db-persistor" />
+ <block class="org.apache.avalon.db.persistence.store.StorePersistence"
name="db-persistor">
+ <provide name="objectstorage"
role="org.apache.avalon.cornerstone.services.store.Store"/>
+ </block>
-->
+
<block
class="org.apache.avalon.cornerstone.blocks.dom.DOMBuilderFactory"
name="dom-builder-factory" />
1.6 +40 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- db-config.xml 2001/11/12 21:16:09 1.5
+++ db-config.xml 2001/11/12 21:46:24 1.6
@@ -1,6 +1,43 @@
<?xml version="1.0"?>
<config>
+
+ <!-- The Storage block .... needed by Store persistence -->
+ <!--
+ <objectstorage>
+ <repositories>
+ <repository
class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Object_Repository">
+ <protocols>
+ <protocol>file</protocol>
+ </protocols>
+ <types>
+ <type>OBJECT</type>
+ </types>
+ <models>
+ <model>SYNCHRONOUS</model>
+ <model>ASYNCHRONOUS</model>
+ <model>CACHE</model>
+ </models>
+ </repository>
+ <repository
class="org.apache.avalon.cornerstone.blocks.masterstore.File_Persistent_Stream_Repository">
+ <protocols>
+ <protocol>file</protocol>
+ </protocols>
+ <types>
+ <type>STREAM</type>
+ </types>
+ <models>
+ <model>SYNCHRONOUS</model>
+ <model>ASYNCHRONOUS</model>
+ <model>CACHE</model>
+ </models>
+ </repository>
+ </repositories>
+ </objectstorage>
+ -->
+
+
+
<thread-manager>
<thread-group>
<name>default</name>
@@ -44,11 +81,12 @@
<sql-optimizer>TODO</sql-optimizer>
<!-- This one for "No" Persistence -->
+
<db-persistor>TODO</db-persistor>
<!-- This one for Store Persistence -->
- <!--
+ <!--
<db-persistor>
<repository destinationURL="file://./DatabasePersistence/"
type="OBJECT"
@@ -56,6 +94,7 @@
</repository>
</db-persistor>
-->
+
<dom-builder-factory>
1.3 +2 -2
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractQueryable.java
Index: AbstractQueryable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractQueryable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractQueryable.java 2001/11/12 15:09:04 1.2
+++ AbstractQueryable.java 2001/11/12 21:46:24 1.3
@@ -25,13 +25,13 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public abstract class AbstractQueryable extends AbstractNameable implements
Queryable {
protected Column[] mColumns;
protected Vector mRows = new Vector();
- protected Vector mListeners = new Vector();
+ protected transient Vector mListeners = new Vector();
protected String mCatalogName = "?";
/**
1.6 +4 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractTable.java
Index: AbstractTable.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/data/impl/AbstractTable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTable.java 2001/11/11 13:03:45 1.5
+++ AbstractTable.java 2001/11/12 21:46:24 1.6
@@ -13,6 +13,7 @@
import org.apache.avalon.db.data.Table;
import org.apache.avalon.db.data.Queryable;
import org.apache.avalon.db.data.Column;
+import org.apache.avalon.db.data.Row;
import java.util.Vector;
import java.util.Collections;
@@ -24,7 +25,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public abstract class AbstractTable extends AbstractQueryable implements
Table {
@@ -45,10 +46,12 @@
public void addRow(AbstractTableRow atr) {
rows.add(atr);
+ notifyRowListenersAdded(new Row[] {atr});
}
public void removeRow(AbstractTableRow atr) {
rows.remove(atr);
+ notifyRowListenersDeleted(new Row[] {atr});
}
public Collection getRows() {
1.10 +2 -1
jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java
Index: StorePersistence.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/db/src/java/org/apache/avalon/db/persistence/store/StorePersistence.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StorePersistence.java 2001/11/12 15:09:04 1.9
+++ StorePersistence.java 2001/11/12 21:46:25 1.10
@@ -26,7 +26,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class StorePersistence extends NoPersistence implements RowListener {
@@ -78,6 +78,7 @@
}
public void rowsAdded(Queryable queryable, Row[] rows) {
+ System.out.println("qqqqqq");
persist(queryable);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
