You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/10/24 19:17:41 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/lib hsqldb.jar hsql.jar
taylor 2002/10/24 10:17:41
Modified: build build.properties
build/torque/schema security-schema.xml
webapp/WEB-INF/conf JetspeedSecurity.properties
Torque.properties
webapp/WEB-INF/db jetspeed.properties jetspeed.script
manageDB.bat
Added: webapp/WEB-INF/db hsqldb.jar
webapp/WEB-INF/lib hsqldb.jar
Removed: webapp/WEB-INF/db hsql.jar
webapp/WEB-INF/lib hsql.jar
Log:
- upgraded to Hypersonic 1.7.1 latest stable release
- upgraded to cvs head of Torque, fixing identity problem with Hypersonic and allowing Hypersonic to run in native mode
- no longer necessary to change security-schema.xml's table idmethod from idbroker for Hypersonic to native for all other dbs.
all dbs now support native idmethod="native"
Revision Changes Path
1.12 +1 -1 jakarta-jetspeed/build/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.properties 6 Apr 2002 01:47:30 -0000 1.11
+++ build.properties 24 Oct 2002 17:17:39 -0000 1.12
@@ -7,7 +7,7 @@
cactus-23.jar = build/lib/cactus-23-1.2.jar
cactus.ant.jar = build/lib/cactus-ant-1.2.jar
junit.jar = build/lib/junit.jar
-hsql.jar = webapp/WEB-INF/lib/hsql.jar
+hsql.jar = webapp/WEB-INF/lib/hsqldb.jar
# Servlet engine locations for the tests
1.6 +5 -9 jakarta-jetspeed/build/torque/schema/security-schema.xml
Index: security-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/torque/schema/security-schema.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- security-schema.xml 18 Oct 2002 19:16:31 -0000 1.5
+++ security-schema.xml 24 Oct 2002 17:17:39 -0000 1.6
@@ -18,8 +18,7 @@
<database>
- <!-- for dbs other than HYPERSONIC: <table name="TURBINE_USER" idMethod="native"> -->
- <table name="TURBINE_USER" idMethod="idbroker">
+ <table name="TURBINE_USER" idMethod="native" >
<column name="USER_ID" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
<column name="LOGIN_NAME" required="true" size="32" type="VARCHAR"/>
<column name="PASSWORD_VALUE" required="true" size="32" type="VARCHAR"/>
@@ -40,8 +39,7 @@
</table>
- <!-- for dbs other than HYPERSONIC: <table name="TURBINE_ROLE" idMethod="native"> -->
- <table name="TURBINE_ROLE" idMethod="idbroker" >
+ <table name="TURBINE_ROLE" idMethod="native" >
<column name="ROLE_ID" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
<column name="ROLE_NAME" required="true" size="99" type="VARCHAR"/>
<column name="OBJECTDATA" type="BINARY"/>
@@ -52,8 +50,7 @@
</table>
- <!-- for dbs other than HYPERSONIC: <table name="TURBINE_GROUP" idMethod="native"> -->
- <table name="TURBINE_GROUP" idMethod="idbroker" >
+ <table name="TURBINE_GROUP" idMethod="native" >
<column name="GROUP_ID" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
<column name="GROUP_NAME" required="true" type="VARCHAR" size="99"/>
<column name="OBJECTDATA" type="BINARY"/>
@@ -64,8 +61,7 @@
</table>
- <!-- for dbs other than HYPERSONIC: <table name="TURBINE_PERMISSION" idMethod="native"> -->
- <table name="TURBINE_PERMISSION" idMethod="idbroker" >
+ <table name="TURBINE_PERMISSION" idMethod="native" >
<column name="PERMISSION_ID" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
<column name="PERMISSION_NAME" required="true" size="99" type="VARCHAR"/>
<column name="OBJECTDATA" type="BINARY"/>
1.36 +1 -37 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties
Index: JetspeedSecurity.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedSecurity.properties,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- JetspeedSecurity.properties 21 Oct 2002 22:40:22 -0000 1.35
+++ JetspeedSecurity.properties 24 Oct 2002 17:17:39 -0000 1.36
@@ -8,7 +8,6 @@
#
# -------------------------------------------------------------------
services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedDBSecurityService
-### LDAP: services.JetspeedSecurity.classname=org.apache.jetspeed.services.security.JetspeedLDAPSecurityService
#########################################
# Programmatic Cascade Delete Service #
@@ -21,8 +20,6 @@
#########################################
services.PortalAuthentication.classname=org.apache.jetspeed.services.security.turbine.TurbineAuthentication
-### LDAP: services.PortalAuthentication.classname=org.apache.jetspeed.services.security.ldap.LDAPAuthentication
-
#########################################
# Authorization Service #
@@ -35,9 +32,6 @@
#########################################
services.UserManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineUserManagement
-### LDAP: services.UserManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPUserManagement
-### LDAP: services.JetspeedSecurity.user.class=org.apache.jetspeed.om.security.ldap.LDAPUser
-
#########################################
# Role Management Service #
@@ -47,9 +41,6 @@
services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.BaseJetspeedRole
services.JetspeedSecurity.role.default=user
-### LDAP: services.RoleManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPRoleManagement
-### LDAP: services.JetspeedSecurity.role.class=org.apache.jetspeed.om.security.ldap.LDAPRole
-
#########################################
# Group Management Service #
#########################################
@@ -57,9 +48,6 @@
services.GroupManagement.classname=org.apache.jetspeed.services.security.turbine.TurbineGroupManagement
services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.BaseJetspeedGroup
-### LDAP: services.GroupManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPGroupManagement
-### LDAP: services.JetspeedSecurity.group.class=org.apache.jetspeed.om.security.ldap.LDAPGroup
-
#########################################
# Permission Management Service #
#########################################
@@ -67,8 +55,6 @@
services.PermissionManagement.classname=org.apache.jetspeed.services.security.turbine.TurbinePermissionManagement
services.JetspeedSecurity.permission.class=org.apache.jetspeed.om.security.BaseJetspeedPermission
-### LDAP: services.PermissionManagement.classname=org.apache.jetspeed.services.security.ldap.LDAPPermissionManagement
-
#########################################
# Security Cache Service #
#########################################
@@ -145,26 +131,4 @@
#########################################
services.JetspeedSecurity.actions.anon.disable=true
services.JetspeedSecurity.action.allusers.disable=false
-
-#########################################
-# LDAP Service #
-#########################################
-services.ldap.classname=org.apache.jetspeed.services.ldap.LDAPService
-#services.ldap.host=192.168.0.20
-services.ldap.host=213.194.65.90
-services.ldap.port=389
-services.ldap.sslport=636
-services.ldap.basedn=o/EBIT
-services.ldap.managerdn=cn/administrator%ou/members%o/EBIT
-services.ldap.password=password
-services.ldap.anonymousbind=false
-services.ldap.securityauthentication=simple
-#services.ldap.securityprotocol=ssl
-#services.ldap.socketfactory=javax.net.ssl.SSLSocketFactory
-#services.ldap.jndiprovider=com.sun.jndi.ldap.LdapCtxFactory
-#services.ldap.saslclientpckgs=
-services.ldap.limit=0
-services.ldap.timeout=0
-services.ldap.version=3
-
1.7 +5 -4 jakarta-jetspeed/webapp/WEB-INF/conf/Torque.properties
Index: Torque.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Torque.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Torque.properties 21 Oct 2002 22:40:22 -0000 1.6
+++ Torque.properties 24 Oct 2002 17:17:39 -0000 1.7
@@ -42,6 +42,7 @@
# configure these properly.
# -------------------------------------------------------------------
+
torque.database.default=default
torque.database.default.adapter=hypersonic
### torque.database.default.adapter=mysql
@@ -51,8 +52,8 @@
##
## Using torque's old pool
##
-torque.dsfactory.default.connection.driver = org.hsql.jdbcDriver
-torque.dsfactory.default.connection.url = jdbc:HypersonicSQL:${webappRoot}/WEB-INF/db/jetspeed
+torque.dsfactory.default.connection.driver = org.hsqldb.jdbcDriver
+torque.dsfactory.default.connection.url = jdbc:hsqldb:${webappRoot}/WEB-INF/db/jetspeed
torque.dsfactory.default.connection.user = sa
torque.dsfactory.default.connection.password =
@@ -68,7 +69,7 @@
### torque.dsfactory.default.connection.password =
### Oracle
### torque.dsfactory.default.connection.driver = oracle.jdbc.driver.OracleDriver
-### torque.dsfactory.default.connection.url = jdbc:oracle:thin:@host:1521:sid
+### torque.dsfactory.default.connection.url = jdbc:oracle:thin:@nirvana:1521:bluesun3
### torque.dsfactory.default.connection.user = jetspeed
### torque.dsfactory.default.connection.password = jetspeed
### Microsoft SQL
1.21 +16 -4 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jetspeed.properties 18 Oct 2002 19:16:32 -0000 1.20
+++ jetspeed.properties 24 Oct 2002 17:17:40 -0000 1.21
@@ -1,4 +1,16 @@
-#Hypersonic SQL database
-#Fri Oct 18 12:09:24 PDT 2002
-version=1.4
-modified=yes
+#HSQL database
+#Thu Oct 24 10:08:32 PDT 2002
+sql.strict_fk=false
+readonly=false
+sql.strong_fk=true
+hsqldb.version=1.7.1
+version=1.7.1
+hsqldb.cache_scale=14
+sql.compare_in_locale=false
+sql.month=true
+hsqldb.log_size=200
+modified=no
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.7.1
+hsqldb.compatible_version=1.7.0
+sql.enforce_size=false
1.23 +71 -204 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script
Index: jetspeed.script
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jetspeed.script 18 Oct 2002 19:16:32 -0000 1.22
+++ jetspeed.script 24 Oct 2002 17:17:40 -0000 1.23
@@ -8,85 +8,89 @@
CREATE UNIQUE INDEX USER_GROUP_ROLE_INDEX ON TURBINE_USER_GROUP_ROLE(USER_ID,GROUP_ID,ROLE_ID)
CREATE TABLE ID_TABLE(ID_TABLE_ID INTEGER NOT NULL PRIMARY KEY,TABLE_NAME VARCHAR NOT NULL,NEXT_ID INTEGER,QUANTITY INTEGER)
CREATE UNIQUE INDEX ID_TABLE_NAME_INDEX ON ID_TABLE(TABLE_NAME)
-CREATE TABLE JETSPEED_USER_PROFILE(PSML_ID INTEGER IDENTITY PRIMARY KEY,USER_NAME VARCHAR,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,UNIQUE(PSML_ID),UNIQUE(USER_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
+CREATE TABLE JETSPEED_USER_PROFILE(PSML_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,USER_NAME VARCHAR,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,CONSTRAINT SYS_CT_1 UNIQUE(PSML_ID),CONSTRAINT SYS_CT_2 UNIQUE(USER_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
CREATE INDEX JETSPEED_USER_PROFILE_INDEX ON JETSPEED_USER_PROFILE(USER_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE)
-CREATE TABLE JETSPEED_GROUP_PROFILE(PSML_ID INTEGER IDENTITY PRIMARY KEY,GROUP_NAME VARCHAR,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,UNIQUE(PSML_ID),UNIQUE(GROUP_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
+CREATE TABLE JETSPEED_GROUP_PROFILE(PSML_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,GROUP_NAME VARCHAR,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,CONSTRAINT SYS_CT_5 UNIQUE(PSML_ID),CONSTRAINT SYS_CT_6 UNIQUE(GROUP_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
CREATE INDEX JETSPEED_GROUP_PROFILE_INDEX ON JETSPEED_GROUP_PROFILE(GROUP_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE)
-CREATE TABLE JETSPEED_ROLE_PROFILE(PSML_ID INTEGER IDENTITY PRIMARY KEY,ROLE_NAME VARCHAR,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,UNIQUE(PSML_ID),UNIQUE(ROLE_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
+CREATE TABLE JETSPEED_ROLE_PROFILE(PSML_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,ROLE_NAME VARCHAR,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,CONSTRAINT SYS_CT_9 UNIQUE(PSML_ID),CONSTRAINT SYS_CT_10 UNIQUE(ROLE_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
CREATE INDEX JETSPEED_ROLE_PROFILE_INDEX ON JETSPEED_ROLE_PROFILE(ROLE_NAME,MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE)
-CREATE TABLE JETSPEED_ANON_PROFILE(PSML_ID INTEGER IDENTITY PRIMARY KEY,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,UNIQUE(PSML_ID),UNIQUE(MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
+CREATE TABLE JETSPEED_ANON_PROFILE(PSML_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,MEDIA_TYPE VARCHAR,LANGUAGE VARCHAR,COUNTRY VARCHAR,PAGE VARCHAR,PROFILE BINARY,CONSTRAINT SYS_CT_13 UNIQUE(PSML_ID),CONSTRAINT SYS_CT_14 UNIQUE(MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE))
CREATE INDEX JETSPEED_ANON_PROFILE_INDEX ON JETSPEED_ANON_PROFILE(MEDIA_TYPE,LANGUAGE,COUNTRY,PAGE)
CREATE TABLE COFFEES(COF_NAME VARCHAR,SUP_ID INTEGER,PRICE FLOAT,SALES INTEGER,TOTAL INTEGER)
-CREATE TABLE JETSPEED_ACL(ACL_ID INTEGER,SECURITY_ID INTEGER,RESOURCE VARCHAR,RESOURCE_TYPE VARCHAR,ACTION VARCHAR,ALLOW_TYPE VARCHAR,PRINCIPAL VARCHAR,UNIQUE(ACL_ID))
+CREATE TABLE JETSPEED_ACL(ACL_ID INTEGER,SECURITY_ID INTEGER,RESOURCE VARCHAR,RESOURCE_TYPE VARCHAR,ACTION VARCHAR,ALLOW_TYPE VARCHAR,PRINCIPAL VARCHAR,CONSTRAINT SYS_CT_17 UNIQUE(ACL_ID))
CREATE INDEX JETSPEED_ACL_I_2 ON JETSPEED_ACL(SECURITY_ID)
+GRANT ALL ON CLASS "org.hsqldb.Library" TO PUBLIC
GRANT ALL ON CLASS "java.lang.Math" TO PUBLIC
GRANT ALL ON CLASS "org.hsql.Library" TO PUBLIC
CREATE USER SA PASSWORD "" ADMIN
-CREATE ALIAS DAYNAME FOR "org.hsql.Library.dayname"
-CREATE ALIAS SPACE FOR "org.hsql.Library.space"
-CREATE ALIAS SUBSTRING FOR "org.hsql.Library.substring"
+CREATE ALIAS DAYNAME FOR "org.hsqldb.Library.dayname"
+CREATE ALIAS SPACE FOR "org.hsqldb.Library.space"
+CREATE ALIAS SUBSTRING FOR "org.hsqldb.Library.substring"
+CREATE ALIAS HEXTORAW FOR "org.hsqldb.Library.hexToRaw"
CREATE ALIAS SQRT FOR "java.lang.Math.sqrt"
-CREATE ALIAS ABS FOR "java.lang.Math.abs"
+CREATE ALIAS ABS FOR "org.hsqldb.Library.abs"
CREATE ALIAS POWER FOR "java.lang.Math.pow"
-CREATE ALIAS CHAR FOR "org.hsql.Library.character"
-CREATE ALIAS CONCAT FOR "org.hsql.Library.concat"
-CREATE ALIAS PI FOR "org.hsql.Library.pi"
-CREATE ALIAS SECOND FOR "org.hsql.Library.second"
-CREATE ALIAS TRUNCATE FOR "org.hsql.Library.truncate"
-CREATE ALIAS MONTH FOR "org.hsql.Library.month"
-CREATE ALIAS LOWER FOR "org.hsql.Library.lcase"
+CREATE ALIAS CHAR FOR "org.hsqldb.Library.character"
+CREATE ALIAS CONCAT FOR "org.hsqldb.Library.concat"
+CREATE ALIAS PI FOR "org.hsqldb.Library.pi"
+CREATE ALIAS RAWTOHEX FOR "org.hsqldb.Library.rawToHex"
+CREATE ALIAS SECOND FOR "org.hsqldb.Library.second"
+CREATE ALIAS TRUNCATE FOR "org.hsqldb.Library.truncate"
+CREATE ALIAS MONTH FOR "org.hsqldb.Library.month"
+CREATE ALIAS LOWER FOR "org.hsqldb.Library.lcase"
CREATE ALIAS ATAN2 FOR "java.lang.Math.atan2"
-CREATE ALIAS REPEAT FOR "org.hsql.Library.repeat"
-CREATE ALIAS DAYOFMONTH FOR "org.hsql.Library.dayofmonth"
+CREATE ALIAS REPEAT FOR "org.hsqldb.Library.repeat"
+CREATE ALIAS DAYOFMONTH FOR "org.hsqldb.Library.dayofmonth"
CREATE ALIAS TAN FOR "java.lang.Math.tan"
CREATE ALIAS RADIANS FOR "java.lang.Math.toRadians"
CREATE ALIAS FLOOR FOR "java.lang.Math.floor"
-CREATE ALIAS NOW FOR "org.hsql.Library.now"
+CREATE ALIAS NOW FOR "org.hsqldb.Library.now"
CREATE ALIAS ACOS FOR "java.lang.Math.acos"
-CREATE ALIAS DAYOFWEEK FOR "org.hsql.Library.dayofweek"
+CREATE ALIAS DAYOFWEEK FOR "org.hsqldb.Library.dayofweek"
CREATE ALIAS CEILING FOR "java.lang.Math.ceil"
-CREATE ALIAS DAYOFYEAR FOR "org.hsql.Library.dayofyear"
-CREATE ALIAS LCASE FOR "org.hsql.Library.lcase"
-CREATE ALIAS WEEK FOR "org.hsql.Library.week"
-CREATE ALIAS SOUNDEX FOR "org.hsql.Library.soundex"
+CREATE ALIAS DAYOFYEAR FOR "org.hsqldb.Library.dayofyear"
+CREATE ALIAS LCASE FOR "org.hsqldb.Library.lcase"
+CREATE ALIAS WEEK FOR "org.hsqldb.Library.week"
+CREATE ALIAS SOUNDEX FOR "org.hsqldb.Library.soundex"
CREATE ALIAS ASIN FOR "java.lang.Math.asin"
-CREATE ALIAS LOCATE FOR "org.hsql.Library.locate"
+CREATE ALIAS LOCATE FOR "org.hsqldb.Library.locate"
CREATE ALIAS EXP FOR "java.lang.Math.exp"
-CREATE ALIAS MONTHNAME FOR "org.hsql.Library.monthname"
-CREATE ALIAS YEAR FOR "org.hsql.Library.year"
-CREATE ALIAS LEFT FOR "org.hsql.Library.left"
-CREATE ALIAS ROUNDMAGIC FOR "org.hsql.Library.roundMagic"
-CREATE ALIAS BITOR FOR "org.hsql.Library.bitor"
-CREATE ALIAS LTRIM FOR "org.hsql.Library.ltrim"
-CREATE ALIAS COT FOR "org.hsql.Library.cot"
+CREATE ALIAS MONTHNAME FOR "org.hsqldb.Library.monthname"
+CREATE ALIAS YEAR FOR "org.hsqldb.Library.year"
+CREATE ALIAS LEFT FOR "org.hsqldb.Library.left"
+CREATE ALIAS ROUNDMAGIC FOR "org.hsqldb.Library.roundMagic"
+CREATE ALIAS BITOR FOR "org.hsqldb.Library.bitor"
+CREATE ALIAS LTRIM FOR "org.hsqldb.Library.ltrim"
+CREATE ALIAS COT FOR "org.hsqldb.Library.cot"
CREATE ALIAS COS FOR "java.lang.Math.cos"
-CREATE ALIAS MOD FOR "org.hsql.Library.mod"
-CREATE ALIAS SIGN FOR "org.hsql.Library.sign"
+CREATE ALIAS MOD FOR "org.hsqldb.Library.mod"
+CREATE ALIAS SIGN FOR "org.hsqldb.Library.sign"
CREATE ALIAS DEGREES FOR "java.lang.Math.toDegrees"
CREATE ALIAS LOG FOR "java.lang.Math.log"
CREATE ALIAS SIN FOR "java.lang.Math.sin"
-CREATE ALIAS CURTIME FOR "org.hsql.Library.curtime"
-CREATE ALIAS DIFFERENCE FOR "org.hsql.Library.difference"
-CREATE ALIAS INSERT FOR "org.hsql.Library.insert"
-CREATE ALIAS DATABASE FOR "org.hsql.Library.database"
-CREATE ALIAS MINUTE FOR "org.hsql.Library.minute"
-CREATE ALIAS HOUR FOR "org.hsql.Library.hour"
-CREATE ALIAS IDENTITY FOR "org.hsql.Library.identity"
-CREATE ALIAS QUARTER FOR "org.hsql.Library.quarter"
-CREATE ALIAS CURDATE FOR "org.hsql.Library.curdate"
-CREATE ALIAS BITAND FOR "org.hsql.Library.bitand"
-CREATE ALIAS USER FOR "org.hsql.Library.user"
-CREATE ALIAS UCASE FOR "org.hsql.Library.ucase"
-CREATE ALIAS RTRIM FOR "org.hsql.Library.rtrim"
-CREATE ALIAS LOG10 FOR "org.hsql.Library.log10"
-CREATE ALIAS RIGHT FOR "org.hsql.Library.right"
+CREATE ALIAS CURTIME FOR "org.hsqldb.Library.curtime"
+CREATE ALIAS DIFFERENCE FOR "org.hsqldb.Library.difference"
+CREATE ALIAS INSERT FOR "org.hsqldb.Library.insert"
+CREATE ALIAS SUBSTR FOR "org.hsqldb.Library.substring"
+CREATE ALIAS DATABASE FOR "org.hsqldb.Library.database"
+CREATE ALIAS MINUTE FOR "org.hsqldb.Library.minute"
+CREATE ALIAS HOUR FOR "org.hsqldb.Library.hour"
+CREATE ALIAS IDENTITY FOR "org.hsqldb.Library.identity"
+CREATE ALIAS QUARTER FOR "org.hsqldb.Library.quarter"
+CREATE ALIAS CURDATE FOR "org.hsqldb.Library.curdate"
+CREATE ALIAS BITAND FOR "org.hsqldb.Library.bitand"
+CREATE ALIAS USER FOR "org.hsqldb.Library.user"
+CREATE ALIAS UCASE FOR "org.hsqldb.Library.ucase"
+CREATE ALIAS RTRIM FOR "org.hsqldb.Library.rtrim"
+CREATE ALIAS LOG10 FOR "org.hsqldb.Library.log10"
+CREATE ALIAS RIGHT FOR "org.hsqldb.Library.right"
CREATE ALIAS ATAN FOR "java.lang.Math.atan"
-CREATE ALIAS UPPER FOR "org.hsql.Library.ucase"
-CREATE ALIAS ASCII FOR "org.hsql.Library.ascii"
+CREATE ALIAS UPPER FOR "org.hsqldb.Library.ucase"
+CREATE ALIAS ASCII FOR "org.hsqldb.Library.ascii"
CREATE ALIAS RAND FOR "java.lang.Math.random"
-CREATE ALIAS LENGTH FOR "org.hsql.Library.length"
-CREATE ALIAS ROUND FOR "org.hsql.Library.round"
-CREATE ALIAS REPLACE FOR "org.hsql.Library.replace"
+CREATE ALIAS LENGTH FOR "org.hsqldb.Library.length"
+CREATE ALIAS ROUND FOR "org.hsqldb.Library.round"
+CREATE ALIAS REPLACE FOR "org.hsqldb.Library.replace"
INSERT INTO TURBINE_PERMISSION VALUES(1,'view',NULL)
INSERT INTO TURBINE_PERMISSION VALUES(2,'customize',NULL)
INSERT INTO TURBINE_PERMISSION VALUES(3,'maximize',NULL)
@@ -124,6 +128,8 @@
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(3,1,3)
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(560,1,1)
INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(570,1,1)
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(4,1,1)
+INSERT INTO TURBINE_USER_GROUP_ROLE VALUES(8,1,1)
INSERT INTO ID_TABLE VALUES(1,'TURBINE_PERMISSION',450,10)
INSERT INTO ID_TABLE VALUES(2,'TURBINE_ROLE',530,10)
INSERT INTO ID_TABLE VALUES(3,'TURBINE_GROUP',460,10)
@@ -136,153 +142,14 @@
INSERT INTO ID_TABLE VALUES(10,'JETSPEED_ROLE_PROFILE',120,10)
INSERT INTO ID_TABLE VALUES(11,'JETSPEED_ANON_PROFILE',120,10)
INSERT INTO ID_TABLE VALUES(12,'COFFEES',100,10)
-INSERT INTO COFFEES VALUES('ColombianGrade',5,7.99,1,2)
-INSERT INTO COFFEES VALUES('KonaGrade',6,7.99,1,2)
-INSERT INTO COFFEES VALUES('FrenchRoastGrade',7,7.99,1,2)
-INSERT INTO COFFEES VALUES('HazelNutGrade',8,7.99,1,2)
-INSERT INTO COFFEES VALUES('VanillaGrade',9,7.99,1,2)
-INSERT INTO COFFEES VALUES('JavaGrade',10,7.99,1,2)
-INSERT INTO COFFEES VALUES('IndonesianGrade',11,7.99,1,2)
-INSERT INTO COFFEES VALUES('OotyGrade',1,7.99,1,2)
-INSERT INTO COFFEES VALUES('KenyanGrade',2,7.99,1,2)
-INSERT INTO COFFEES VALUES('JoeGrade',3,7.99,1,2)
-INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99,1,2)
-/*C2*/CONNECT USER sa PASSWORD ""
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
-SET AUTOCOMMIT TRUE
-SET READONLY FALSE
+INSERT INTO COFFEES VALUES('ColombianGrade',5,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('KonaGrade',6,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('FrenchRoastGrade',7,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('HazelNutGrade',8,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('VanillaGrade',9,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('JavaGrade',10,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('IndonesianGrade',11,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('OotyGrade',1,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('KenyanGrade',2,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('JoeGrade',3,7.99E0,1,2)
+INSERT INTO COFFEES VALUES('CantThinkOfAnymoreGrade',4,7.99E0,1,2)
1.2 +1 -1 jakarta-jetspeed/webapp/WEB-INF/db/manageDB.bat
Index: manageDB.bat
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/manageDB.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- manageDB.bat 4 Jun 2001 07:53:21 -0000 1.1
+++ manageDB.bat 24 Oct 2002 17:17:40 -0000 1.2
@@ -1,3 +1,3 @@
@ECHO OFF
REM ***
-@java -classpath %CLASSPATH%;hsql.jar org.hsql.util.DatabaseManager
\ No newline at end of file
+@java -classpath %CLASSPATH%;hsqldb.jar org.hsqldb.util.DatabaseManager -url jdbc:hsqldb:jetspeed
\ No newline at end of file
1.1 jakarta-jetspeed/webapp/WEB-INF/db/hsqldb.jar
<<Binary file>>
1.1 jakarta-jetspeed/webapp/WEB-INF/lib/hsqldb.jar
<<Binary file>>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>