From 9c67454fa3d8435fdb3e085524b99acdaa116c0b Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Thu, 18 Nov 2010 00:32:01 +0000 Subject: [PATCH] NOJIRA - deleting disabled script code, as part of ongoing cleanup. --- .../src/main/resources/db/mysql/test_account.sql | 13 +++---------- .../main/resources/db/mysql/test_authentication.sql | 5 +---- .../main/resources/db/mysql/test_authorization.sql | 11 +---------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/services/account/pstore/src/main/resources/db/mysql/test_account.sql b/services/account/pstore/src/main/resources/db/mysql/test_account.sql index 2f18d5397..7d8ee3bf4 100644 --- a/services/account/pstore/src/main/resources/db/mysql/test_account.sql +++ b/services/account/pstore/src/main/resources/db/mysql/test_account.sql @@ -6,20 +6,13 @@ use cspace; -- Tenants --- movingimages -- -INSERT INTO `cspace`.`tenants` (`id`, `name`, `created_at`) VALUES ('1','movingimages.us', now()); --- pahma -- ---INSERT INTO `cspace`.`tenants` (`id`, `name`, `created_at`) VALUES ('2','hearstmuseum.berkeley.edu', now()); +-- default cspace -- +-- ONLY Needed for the hack below. +INSERT INTO `cspace`.`tenants` (`id`, `name`, `created_at`) VALUES ('1','collectionspace.org', now()); -- Accounts -- default test account -- INSERT INTO `cspace`.`accounts_common` (`csid`, `email`, `phone`, `mobile`, `userid`, `status`, `screen_name`, `created_at`) VALUES ('eeca40d7-dc77-4cc5-b489-16a53c75525a','test.test@berkeley.edu',NULL,NULL,'test','ACTIVE','test', now()); --- Additional account introduced during integration on release 0.6, and currently relied upon by the Application Layer. ---INSERT INTO `cspace`.`accounts_common` (`csid`, `email`, `phone`, `mobile`, `userid`, `status`, `screen_name`, `created_at`) VALUES ('251f98f3-0292-4f3e-aa95-455314050e1b','test@collectionspace.org',NULL,NULL,'test@collectionspace.org','ACTIVE','test@collectionspace.org', now()); --- PAHMA test account -- ---INSERT INTO `cspace`.`accounts_common` (`csid`, `email`, `phone`, `mobile`, `userid`, `status`, `screen_name`, `created_at`) VALUES ('ff2b4440-ed0d-4892-adb4-b6999eba3ae7','test@hearstmuseum.berkeley.edu',NULL,NULL,'test-pahma','ACTIVE','test-pahma', now()); -- Association of accounts with tenants INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('eeca40d7-dc77-4cc5-b489-16a53c75525a', '1'); ---INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('251f98f3-0292-4f3e-aa95-455314050e1b', '1'); ---INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('ff2b4440-ed0d-4892-adb4-b6999eba3ae7', '2'); diff --git a/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql b/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql index f9a62ae1e..3f5f2ce02 100644 --- a/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql +++ b/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql @@ -6,8 +6,5 @@ use cspace; -- default test user -- +-- This should go away. insert into `users` (`username`,`passwd`, `created_at`) VALUES ('test','n4bQgYhMfWWaL+qgxVrQFaO/TxsrC4Is0V1sFbDwCgg=', now()); --- Additional account introduced during integration on release 0.6, and currently relied upon by the Application Layer. ---insert into `users` (`username`,`passwd`, `created_at`) VALUES ('test@collectionspace.org','NyaDNd1pMQRb3N+SYj/4GaZCRLU9DnRtQ4eXNJ1NpXg=', now()); --- user for testing pahma deployment -- ---insert into `users` (`username`,`passwd`, `created_at`) VALUES ('test-pahma','n4bQgYhMfWWaL+qgxVrQFaO/TxsrC4Is0V1sFbDwCgg=', now()); diff --git a/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql b/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql index 22aabe14f..177818f78 100644 --- a/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql +++ b/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql @@ -9,16 +9,7 @@ insert into `roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at insert into `roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at`, `tenant_id`) values ('0', 'ROLE_ADMINISTRATOR', 'ADMINISTRATOR', 'CollectionSpace Administrator', now(), '0'); -- for default test account -- +-- THESE SHOULD GO AWAY. insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('eeca40d7-dc77-4cc5-b489-16a53c75525a', 'test', '-1', 'ROLE_SPRING_ADMIN', now()); insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('eeca40d7-dc77-4cc5-b489-16a53c75525a', 'test', '0', 'ROLE_ADMINISTRATOR', now()); --- Additional account introduced during integration on release 0.6, and currently relied upon by the Application Layer. ---insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('251f98f3-0292-4f3e-aa95-455314050e1b', 'test@collectionspace.org', '0', 'ROLE_ADMINISTRATOR', now()); - --- test account for pahma -- ---insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('ff2b4440-ed0d-4892-adb4-b6999eba3ae7', 'test-pahma', '0', 'ROLE_ADMINISTRATOR', now()); - --- todo: barney is created in security test but accountrole is not yet created there, so add fake account id ---insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('1', 'barney', '2', 'ROLE_USERS', now()); - - -- 2.47.3