Hi, all.
Attached are miscellaneous patches to support the latest InstantDB release - v.
3.14 Beta 7.
What's changed? Not a whole lot. ;-) The only diffs appear to be standardized
package names (e.g., org.enhydra.instantdb.jdbc.* instead of jdbc.*). See
<http://instantdb.enhydra.org/software/downloads/cuts/idb3_14b7/README.TXT> for
more details.
--
Christopher Elkins
Index: conf/TurbineResources.properties
===================================================================
RCS file: /products/cvs/turbine/turbine/conf/TurbineResources.properties,v
retrieving revision 1.49
diff -r1.49 TurbineResources.properties
46a47,49
> #### InstantDB
> #database.default.driver=org.enhydra.instantdb.jdbc.idbDriver
> #database.default.url=C:/TurbineDB/Turbine.prp
67c70
< database.adaptor.DBInstantDB=jdbc.idbDriver
---
> database.adaptor.DBInstantDB=org.enhydra.instantdb.jdbc.idbDriver
Index: docs/install.txt
===================================================================
RCS file: /products/cvs/turbine/turbine/docs/install.txt,v
retrieving revision 1.16
diff -r1.16 install.txt
26a27,30
> InstantDB JDBC Drivers (if you use InstantDB as your database)
> They come with the download.
> <http://instantdb.enhydra.org/>
>
Index: docs/schemas/InstantDB_users_roles_permissions.sql
===================================================================
RCS file:
/products/cvs/turbine/turbine/docs/schemas/InstantDB_users_roles_permissions.sql
,v
retrieving revision 1.1
diff -r1.1 InstantDB_users_roles_permissions.sql
1a2
> ; (Note: These instructions are written to conform with v. 3.14 Beta 7.)
6c7
< ; The following steps use the "sample" program/test harness contained in
---
> ; The following steps use the ScriptTool program/test harness contained in
12c13
< ; InstantDB distribution.
---
> ; InstantDB distribution (i.e., IDB_HOME\Examples\sample.prp).
16,18c17,19
< ; - InstantDB\classes\idb.jar
< ; - InstantDB\classes\idbexmpl.jar
< ; - InstantDB\classes\idbf.jar
---
> ; - IDB_HOME\Classes\idb.jar
> ; - IDB_HOME\Classes\idbexmpl.jar
> ; - IDB_HOME\Classes\idbf.jar
20c21
< ; java sample
---
> ; java org.enhydra.instantdb.ScriptTool
24c25
< ; database.default.driver=jdbc.idbDriver
---
> ; database.default.driver=org.enhydra.instantdb.jdbc.idbDriver
28c29,30
< ;
---
> ; 8. Make sure IDB_HOME\Classes\idb.jar is in the CLASSPATH of your servlet
> ; engine.
31c33
< d jdbc.idbDriver;
---
> d org.enhydra.instantdb.jdbc.idbDriver;
116a119,144
>
> ;
> ; This table provides the primary keys for all
> ; other tables in the system. Should be used
> ; with util.db.IDBroker.
> ;
> e drop table ID_TABLE;
>
> e CREATE TABLE ID_TABLE
> (
> ID_TABLE_ID integer NOT NULL,
> TABLE_NAME char(255) NOT NULL,
> NEXT_ID integer,
> QUANTITY integer,
> PRIMARY KEY(ID_TABLE_ID),
> UNIQUE (TABLE_NAME)
> );
>
> e insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
> values (1, 'Permission', 20, 10);
> e insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
> values (2, 'UserRole', 20, 10);
> e insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
> values (3, 'Visitor', 20, 10);
> e insert into ID_TABLE (id_table_id, table_name, next_id, quantity)
> values (4, 'Jobentry', 20, 10);
Index: src/java/org/apache/turbine/util/db/pool/DB.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/util/db/pool/DB.java,v
retrieving revision 1.5
diff -r1.5 DB.java
99,100c99,100
< /** "jdbc.idbDriver" */
< public static final String DRIVER_INSTANTDB = "jdbc.idbDriver";
---
> /** "org.enhydra.instantdb.jdbc.idbDriver" */
> public static final String DRIVER_INSTANTDB =
"org.enhydra.instantdb.jdbc.idbDriver";
Index: src/java/org/apache/turbine/util/db/pool/DBInstantDB.java
===================================================================
RCS file:
/products/cvs/turbine/turbine/src/java/org/apache/turbine/util/db/pool/DBInstant
DB.java,v
retrieving revision 1.2
diff -r1.2 DBInstantDB.java
67c67
< <a href="http://www.instantdb.co.uk">http://www.instantdb.co.uk</a>
---
> <a href="http://instantdb.enhydra.org">http://instantdb.enhydra.org</a>
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Problems?: [EMAIL PROTECTED]
