taylor 2003/12/08 11:08:15
Modified: portal maven.xml
portal/src/sql/hsql create-prefs-schema.sql
portal/src/webapp/WEB-INF/conf/ojb repository_prefs.xml
portal/src/webapp/WEB-INF/db/hsql Registry.script
Log:
removing tabs
table names to upper case
Revision Changes Path
1.18 +1 -1 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- maven.xml 8 Dec 2003 18:28:06 -0000 1.17
+++ maven.xml 8 Dec 2003 19:08:14 -0000 1.18
@@ -4,7 +4,7 @@
xmlns:reactor="reactor">
<!-- Target of maven test:single test -->
-<property name='testcase' value='org.apache.jetspeed.capability.TestCapability'/>
+<property name='testcase'
value='org.apache.jetspeed.spi.services.prefs.TestPreferences'/>
<!--
<goal name="jaxb:portlet"
1.2 +22 -22 jakarta-jetspeed-2/portal/src/sql/hsql/create-prefs-schema.sql
Index: create-prefs-schema.sql
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/sql/hsql/create-prefs-schema.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create-prefs-schema.sql 8 Dec 2003 18:28:06 -0000 1.1
+++ create-prefs-schema.sql 8 Dec 2003 19:08:14 -0000 1.2
@@ -2,7 +2,7 @@
-----------------------------------------------------------------------------
-- pref_property_set_def
-----------------------------------------------------------------------------
-CREATE TABLE pref_property_set_def
+CREATE TABLE PREF_PROPERTY_SET_DEF
(
property_set_def_id INTEGER NOT NULL PRIMARY KEY,
property_set_name VARCHAR(100),
@@ -14,7 +14,7 @@
-----------------------------------------------------------------------------
-- pref_node
-----------------------------------------------------------------------------
-CREATE TABLE pref_node
+CREATE TABLE PREF_NODE
(
node_id INTEGER NOT NULL PRIMARY KEY,
parent_node_id INTEGER NULL,
@@ -30,7 +30,7 @@
-----------------------------------------------------------------------------
-- pref_property_value
-----------------------------------------------------------------------------
-CREATE TABLE pref_property_value
+CREATE TABLE PREF_PROPERTY_VALUE
(
property_value_id INTEGER NOT NULL PRIMARY KEY,
property_key_id INTEGER,
@@ -47,7 +47,7 @@
-----------------------------------------------------------------------------
-- pref_property_key
-----------------------------------------------------------------------------
-CREATE TABLE pref_property_key
+CREATE TABLE PREF_PROPERTY_KEY
(
property_key_id INTEGER NOT NULL PRIMARY KEY,
property_set_def_id INTEGER,
@@ -57,24 +57,24 @@
modified_date TIMESTAMP
);
- ALTER TABLE pref_node
- ADD CONSTRAINT pref_node_FK1 FOREIGN KEY (parent_node_id)
- REFERENCES pref_node (node_id);
-
- ALTER TABLE pref_node
- ADD CONSTRAINT pref_node_FK_2 FOREIGN KEY (property_set_def_id)
- REFERENCES pref_property_set_def (property_set_def_id);
-
- ALTER TABLE pref_property_value
- ADD CONSTRAINT pref_property_value_FK_1 FOREIGN KEY (node_id)
- REFERENCES pref_node (node_id);
+ ALTER TABLE PREF_NODE
+ ADD CONSTRAINT PREF_NODE_FK1 FOREIGN KEY (parent_node_id)
+ REFERENCES PREF_NODE (node_id);
+
+ ALTER TABLE PREF_NODE
+ ADD CONSTRAINT PREF_NODE_FK_2 FOREIGN KEY (property_set_def_id)
+ REFERENCES PREF_PROPERTY_SET_DEF (property_set_def_id);
+
+ ALTER TABLE PREF_PROPERTY_VALUE
+ ADD CONSTRAINT PREF_PROPERTY_VALUE_FK_1 FOREIGN KEY (node_id)
+ REFERENCES PREF_NODE (node_id);
- ALTER TABLE pref_property_value
- ADD CONSTRAINT pref_property_value_FK_2 FOREIGN KEY (property_key_id)
- REFERENCES pref_property_key (property_key_id);
-
- ALTER TABLE pref_property_key
- ADD CONSTRAINT pref_property_key_FK_1 FOREIGN KEY (property_set_def_id)
- REFERENCES pref_property_set_def (property_set_def_id);
+ ALTER TABLE PREF_PROPERTY_VALUE
+ ADD CONSTRAINT PREF_PROPERTY_VALUE_FK_2 FOREIGN KEY (property_key_id)
+ REFERENCES PREF_PROPERTY_KEY (property_key_id);
+
+ ALTER TABLE PREF_PROPERTY_KEY
+ ADD CONSTRAINT PREF_PROPERTY_KEY_FK_1 FOREIGN KEY (property_set_def_id)
+ REFERENCES PREF_PROPERTY_SET_DEF (property_set_def_id);
1.2 +4 -4
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_prefs.xml
Index: repository_prefs.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/ojb/repository_prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repository_prefs.xml 8 Dec 2003 18:28:07 -0000 1.1
+++ repository_prefs.xml 8 Dec 2003 19:08:14 -0000 1.2
@@ -4,7 +4,7 @@
<class-descriptor
class="org.apache.jetspeed.spi.om.prefs.impl.PropertySetDefImpl"
proxy="dynamic"
- table="pref_property_set_def"
+ table="PREF_PROPERTY_SET_DEF"
>
<documentation>Represents a property set definition.</documentation>
<field-descriptor
@@ -66,7 +66,7 @@
<class-descriptor
class="org.apache.jetspeed.spi.om.prefs.impl.NodeImpl"
proxy="dynamic"
- table="pref_node"
+ table="PREF_NODE"
>
<documentation>Represents a preferences node.</documentation>
<field-descriptor
@@ -159,7 +159,7 @@
<class-descriptor
class="org.apache.jetspeed.spi.om.prefs.impl.PropertyKeyImpl"
proxy="dynamic"
- table="pref_property_key"
+ table="PREF_PROPERTY_KEY"
>
<documentation>Represents a property key.</documentation>
<field-descriptor
@@ -216,7 +216,7 @@
<class-descriptor
class="org.apache.jetspeed.spi.om.prefs.impl.PropertyImpl"
proxy="dynamic"
- table="pref_property_value"
+ table="PREF_PROPERTY_VALUE"
>
<documentation>Represents a property key/value pair.</documentation>
<field-descriptor
1.13 +7 -2
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script
Index: Registry.script
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/db/hsql/Registry.script,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Registry.script 6 Dec 2003 02:06:11 -0000 1.12
+++ Registry.script 8 Dec 2003 19:08:15 -0000 1.13
@@ -50,8 +50,13 @@
CREATE UNIQUE INDEX IX_PROFILE_DESKTOP_1 ON
PROFILE_DESKTOP_ASSOC(LOCATOR_HASH,DESKTOP_ID)
CREATE TABLE PROFILE_PAGE_ASSOC(LOCATOR_HASH VARCHAR(40) NOT NULL,PAGE_ID
VARCHAR(80) NOT NULL)
CREATE UNIQUE INDEX IX_PROFILE_PAGE_1 ON PROFILE_PAGE_ASSOC(LOCATOR_HASH,PAGE_ID)
-GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
+CREATE TABLE PREF_PROPERTY_SET_DEF(PROPERTY_SET_DEF_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_SET_NAME VARCHAR(100),PROPERTY_SET_TYPE SMALLINT,CREATION_DATE
TIMESTAMP,MODIFIED_DATE TIMESTAMP)
+CREATE TABLE PREF_NODE(NODE_ID INTEGER NOT NULL PRIMARY KEY,PARENT_NODE_ID
INTEGER,PROPERTY_SET_DEF_ID INTEGER,NODE_NAME VARCHAR(100),NODE_TYPE
SMALLINT,FULL_PATH VARCHAR(254),CREATION_DATE TIMESTAMP,MODIFIED_DATE
TIMESTAMP,CONSTRAINT PREF_NODE_FK1 FOREIGN KEY(PARENT_NODE_ID) REFERENCES
PREF_NODE(NODE_ID),CONSTRAINT PREF_NODE_FK_2 FOREIGN KEY(PROPERTY_SET_DEF_ID)
REFERENCES PREF_PROPERTY_SET_DEF(PROPERTY_SET_DEF_ID))
+CREATE TABLE PREF_PROPERTY_VALUE(PROPERTY_VALUE_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_KEY_ID INTEGER,NODE_ID INTEGER,BOOLEAN_VALUE BIT,DATETIME_VALUE
TIMESTAMP,LONG_VALUE INTEGER,DOUBLE_VALUE DOUBLE,TEXT_VALUE VARCHAR(254),CREATION_DATE
TIMESTAMP,MODIFIED_DATE TIMESTAMP,CONSTRAINT PREF_PROPERTY_VALUE_FK_1 FOREIGN
KEY(NODE_ID) REFERENCES PREF_NODE(NODE_ID))
+CREATE TABLE PREF_PROPERTY_KEY(PROPERTY_KEY_ID INTEGER NOT NULL PRIMARY
KEY,PROPERTY_SET_DEF_ID INTEGER,PROPERTY_NAME VARCHAR(100),PROPERTY_TYPE
SMALLINT,CREATION_DATE TIMESTAMP,MODIFIED_DATE TIMESTAMP,CONSTRAINT
PREF_PROPERTY_KEY_FK_1 FOREIGN KEY(PROPERTY_SET_DEF_ID) REFERENCES
PREF_PROPERTY_SET_DEF(PROPERTY_SET_DEF_ID))
+ALTER TABLE PREF_PROPERTY_VALUE ADD CONSTRAINT PREF_PROPERTY_VALUE_FK_2 FOREIGN
KEY(PROPERTY_KEY_ID) REFERENCES PREF_PROPERTY_KEY(PROPERTY_KEY_ID)
GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
+GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
CREATE USER SA PASSWORD "" ADMIN
CREATE ALIAS DAYNAME FOR "org.hsqldb.Library.dayname"
CREATE ALIAS SPACE FOR "org.hsqldb.Library.space"
@@ -123,7 +128,7 @@
CREATE ALIAS REPLACE FOR "org.hsqldb.Library.replace"
INSERT INTO PORTLET_APPLICATION VALUES(1,'jetspeed','jetspeed','1.0',NULL,1)
INSERT INTO WEB_APPLICATION VALUES(1,'/jetspeed')
-INSERT INTO PORTLET_DEFINITION
VALUES(1,'Layout','org.apache.jetspeed.portlet.layout.GenericLayoutPortlet',1,'Layout','-1',NULL)
+INSERT INTO PORTLET_DEFINITION
VALUES(1,'Layout','org.apache.jetspeed.portlets.layout.GenericLayoutPortlet',1,'Layout','-1',NULL)
INSERT INTO MEDIA_TYPE VALUES(0,'html','UTF-8','HTML','Rich HTML for HTML 4.0
compliants browsers')
INSERT INTO MEDIA_TYPE VALUES(1,'wml','UTF-8','WML','Format for mobile phones and
PDAs compatible with WML 1.1')
INSERT INTO MEDIA_TYPE VALUES(2,'vxml','UTF-8','VoiceXML','Format suitable for use
with an audio VoiceXML server')
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
