Scarab commit: svn commit: r11173 - branches/20120417_mavenPort/src/sql: . mysql/upgrade oracle/upgrade postgresql postgresql/upgrade
[email protected] Tue, 17 Apr 2012 03:48:56 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-04-17 03:48:56-0700
New Revision: 11173
Modified:
branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql
branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql
branches/20120417_mavenPort/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql
branches/20120417_mavenPort/src/sql/postgresql/create-db.sql
branches/20120417_mavenPort/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql
branches/20120417_mavenPort/src/sql/scarab-anonymous.sql
branches/20120417_mavenPort/src/sql/scarab-sample-data.sql
branches/20120417_mavenPort/src/sql/scarab-security.sql
Log:
FIX - Adapted variable names in sql scripts for new build engine.
Modified: branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql (original)
+++ branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql 2012-04-17 03:48:56-0700
@@ -8,10 +8,10 @@
* dropdown list attribute.
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql (original)
+++ branches/20120417_mavenPort/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql 2012-04-17 03:48:56-0700
@@ -8,10 +8,10 @@
* dropdown list attribute.
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT@' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: branches/20120417_mavenPort/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql (original)
+++ branches/20120417_mavenPort/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql 2012-04-17 03:48:56-0700
@@ -6,10 +6,10 @@
*
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT@' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: branches/20120417_mavenPort/src/sql/postgresql/create-db.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/postgresql/create-db.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/postgresql/create-db.sql (original)
+++ branches/20120417_mavenPort/src/sql/postgresql/create-db.sql 2012-04-17 03:48:56-0700
@@ -1,5 +1,5 @@
-drop database @DB_NAME@;
-drop user @DATABASE_USERNAME@;
-create user @DATABASE_USERNAME@ with encrypted password '@DATABASE_PASSWORD@';
-create database @DB_NAME@ with owner @DATABASE_USERNAME@;
+drop database ${scarab.database.name};
+drop user ${scarab.database.username};
+create user ${scarab.database.username} with encrypted password '${scarab.database.password}';
+create database ${scarab.database.name} with owner ${scarab.database.username};
Modified: branches/20120417_mavenPort/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql (original)
+++ branches/20120417_mavenPort/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql 2012-04-17 03:48:56-0700
@@ -6,10 +6,10 @@
*
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT@' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: branches/20120417_mavenPort/src/sql/scarab-anonymous.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/scarab-anonymous.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/scarab-anonymous.sql (original)
+++ branches/20120417_mavenPort/src/sql/scarab-anonymous.sql 2012-04-17 03:48:56-0700
@@ -1,7 +1,7 @@
-- Create an account for anonymous user
INSERT INTO TURBINE_USER (USER_ID, LOGIN_NAME, PASSWORD_VALUE, FIRST_NAME, LAST_NAME, EMAIL, CONFIRM_VALUE, MODIFIED, CREATED, LAST_LOGIN)
- VALUES (9, '@ANONYMOUS_USERNAME@', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'anonymous', '[email protected]', 'CONFIRMED', null, null, null );
+ VALUES (9, '${scarab.anonymous.username}', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'anonymous', '[email protected]', 'CONFIRMED', null, null, null );
-- Script to fill the tables with default roles and permissions
@@ -11,7 +11,7 @@
insert into TURBINE_ROLE_PERMISSION (ROLE_ID, PERMISSION_ID)
select TURBINE_ROLE.ROLE_ID, TURBINE_PERMISSION.PERMISSION_ID
from TURBINE_ROLE, TURBINE_PERMISSION
- where TURBINE_ROLE.ROLE_NAME = '@ANONYMOUS_ROLENAME@'
+ where TURBINE_ROLE.ROLE_NAME = '${scarab.anonymous.rolename}'
and TURBINE_PERMISSION.PERMISSION_NAME in (
'Issue | Search',
'Issue | View')
@@ -22,5 +22,5 @@
INSERT INTO TURBINE_USER_GROUP_ROLE ( USER_ID, GROUP_ID, ROLE_ID )
SELECT TURBINE_USER.USER_ID, SCARAB_MODULE.MODULE_ID, TURBINE_ROLE.ROLE_ID from
TURBINE_USER, SCARAB_MODULE, TURBINE_ROLE
-WHERE TURBINE_USER.LOGIN_NAME = '@ANONYMOUS_USERNAME@' AND
-TURBINE_ROLE.ROLE_NAME in ('@ANONYMOUS_ROLENAME@');
\ No newline at end of file
+WHERE TURBINE_USER.LOGIN_NAME = '${scarab.anonymous.username}' AND
+TURBINE_ROLE.ROLE_NAME in ('${scarab.anonymous.username}');
\ No newline at end of file
Modified: branches/20120417_mavenPort/src/sql/scarab-sample-data.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/scarab-sample-data.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/scarab-sample-data.sql (original)
+++ branches/20120417_mavenPort/src/sql/scarab-sample-data.sql 2012-04-17 03:48:56-0700
@@ -18,8 +18,8 @@
-- Id table
-INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1000, '@SCARAB.INSTANCE.ID@-PACD',2,1);
-INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1001, '@SCARAB.INSTANCE.ID@-PACS',2,1);
+INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1000, '${scarab.instance.id}-PACD',2,1);
+INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1001, '${scarab.instance.id}-PACS',2,1);
-- R_MODULE_ISSUE_TYPE
-- module_id, issue_type_id,active,display, preferred_order, dedupe,
Modified: branches/20120417_mavenPort/src/sql/scarab-security.sql
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/src/sql/scarab-security.sql?view=diff&pathrev=11173&r1=11172&r2=11173
==============================================================================
--- branches/20120417_mavenPort/src/sql/scarab-security.sql (original)
+++ branches/20120417_mavenPort/src/sql/scarab-security.sql 2012-04-17 03:48:56-0700
@@ -4,7 +4,7 @@
-- Remember to set a good password for this user in a production system!
INSERT INTO TURBINE_USER (USER_ID, LOGIN_NAME, PASSWORD_VALUE, FIRST_NAME, LAST_NAME, EMAIL, CONFIRM_VALUE, MODIFIED, CREATED, LAST_LOGIN)
- VALUES (1, '@ADMIN_USERNAME@', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'Administrator', '[email protected]', 'CONFIRMED', null, null, null);
+ VALUES (1, '${scarab.user.username}', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'Administrator', '[email protected]', 'CONFIRMED', null, null, null);
-- root module
INSERT INTO SCARAB_MODULE(MODULE_ID, MODULE_NAME, MODULE_CODE, MODULE_DESCRIPTION, MODULE_URL, PARENT_ID, CLASS_KEY)
@@ -210,11 +210,11 @@
drop table xxxx_populate_RolePermission;
--- Assign the user '@ADMIN_USERNAME@' a system-wide role 'Root'
+-- Assign the user '${scarab.user.username}' a system-wide role 'Root'
INSERT INTO TURBINE_USER_GROUP_ROLE ( USER_ID, GROUP_ID, ROLE_ID )
SELECT TURBINE_USER.USER_ID, SCARAB_MODULE.MODULE_ID, TURBINE_ROLE.ROLE_ID from
TURBINE_USER, SCARAB_MODULE, TURBINE_ROLE
-WHERE TURBINE_USER.LOGIN_NAME = '@ADMIN_USERNAME@' AND
+WHERE TURBINE_USER.LOGIN_NAME = '${scarab.user.username}' AND
SCARAB_MODULE.MODULE_ID = 0
AND TURBINE_ROLE.ROLE_NAME in ('Root');
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2949071