Merged V3.1 to HEAD

12923: New Enterprise Examples project containing hyperic plugin and README.txt
   12908: A few fixes to improve consistency in JMX object naming
   12889: Fix failing unit tests. Include linkvalidation in unit test classpath.
   12885: Merged DEV/DAVEW_POST3D to V3.1
      12881: Changes to allow monitoring of authentication configuration
      12862: Merged DEV/3.1_ENTERPRISE_ONLY to DEV/DAVEW_POST3D
         12797: Changes to allow persistence of changes made by JMX.
      12852: Review comment from Derek: remove dependencies of descriptor service (serverDescriptorDAO, currentRepoDescriptorDAO and installedRepoDescriptorDAO) out of bootstrap-context.xml
      12849: Correction to JAWS-221: dbscripts directory must be directly under config/alfresco in enterprise project.
      12847: JAWS-221: Move proprietary DB create/upgrade scripts into Enterprise Only project
      12845: Avoid NullPointerExceptions in status templates when no codeName or description exists for the status code

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-03-10 12:16:12 +00:00
parent 8491c4942b
commit 6641fd64fc
32 changed files with 224 additions and 1187 deletions

View File

@@ -1,29 +0,0 @@
--
-- Title: Jbpm 3.1.2 -> 3.2 Data Migration
-- Database: PostgreSQL
-- Since: V2.1 Schema 52
-- Author: David Caruana
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
UPDATE JBPM_TASK SET PRIORITY_ = 2;
UPDATE JBPM_NODE SET ISASYNCEXCL_ = FALSE;
UPDATE JBPM_MODULEINSTANCE SET VERSION_ = 0;
UPDATE JBPM_POOLEDACTOR SET VERSION_ = 0;
UPDATE JBPM_SWIMLANEINSTANCE SET VERSION_ = 0;
UPDATE JBPM_TASKINSTANCE SET VERSION_ = 0;
UPDATE JBPM_TOKENVARIABLEMAP SET VERSION_ = 0;
UPDATE JBPM_VARIABLEINSTANCE SET VERSION_ = 0;
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-JBPMUpdate';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.1-JBPMUpdate', 'Manually executed script upgrade V2.1: JBPM 3.1.2 to 3.2 Data Upgrade',
0, 51, -1, 52, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
);

View File

@@ -1,22 +0,0 @@
--
-- Title: Jbpm 3.2 Process Instance Key
-- Database: PostgreSQL
-- Since: V2.1 Schema 63
-- Author: David Caruana
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
UPDATE JBPM_PROCESSINSTANCE SET KEY_ = ID_ WHERE KEY_ IS NULL;
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-JBPMProcessKey';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.1-JBPMProcessKey', 'Manually executed script upgrade V2.1: JBPM 3.2 Process Instance Key',
0, 62, -1, 63, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
);

View File

@@ -1,21 +0,0 @@
--
-- Title: Add text columns that allow null
-- Database: PostgreSQL
-- Since: V2.1 Schema 64
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- This is a Sybase issue, so nothing is required here.
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-NotNullColumns';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.1-NotNullColumns', 'Manually executed script upgrade V2.1: Add nullable columns',
0, 63, -1, 64, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
);

View File

@@ -1,36 +0,0 @@
--
-- Title: Remove wcmwf:submitted Aspect
-- Database: PostgreSQL
-- Since: V2.1 Schema 73
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- This removes the wcmwf:submitted aspect along with the wcmwf:workflowInstanceId property
-- from the AVM nodes.
-- PostgreSQL requires TRUE for boolean values.
DELETE FROM avm_aspects WHERE EXISTS
(
SELECT q.id FROM alf_qname q
JOIN alf_namespace n ON (q.ns_id = n.id)
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'submitted' AND q.id = avm_aspects.qname_id
);
DELETE FROM avm_node_properties WHERE EXISTS
(
SELECT q.id FROM alf_qname q
JOIN alf_namespace n ON (q.ns_id = n.id)
WHERE n.uri = 'http://www.alfresco.org/model/wcmworkflow/1.0' and q.local_name = 'workflowInstanceId' AND q.id = avm_node_properties.qname_id
);
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-RemoveWcmSubmittedAspect';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.1-RemoveWcmSubmittedAspect', 'Manually executed script upgrade V2.1: Remove wcmwf:submitted aspect',
0, 72, -1, 73, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
);

View File

@@ -1,33 +0,0 @@
--
-- Title: Fill 'version' columns with data
-- Database: PostgreSQL
-- Since: V2.1 Schema 54
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
UPDATE alf_store SET version = 1 WHERE version IS NULL;
UPDATE alf_node SET version = 1 WHERE version IS NULL;
UPDATE alf_child_assoc SET version = 1 WHERE version IS NULL;
UPDATE alf_node_assoc SET version = 1 WHERE version IS NULL;
UPDATE alf_node_status SET version = 1 WHERE version IS NULL;
UPDATE alf_transaction SET version = 1 WHERE version IS NULL;
UPDATE alf_server SET version = 1 WHERE version IS NULL;
UPDATE alf_access_control_list SET version = 1 WHERE version IS NULL;
UPDATE alf_access_control_entry SET version = 1 WHERE version IS NULL;
UPDATE alf_permission SET version = 1 WHERE version IS NULL;
UPDATE alf_authority SET version = 1 WHERE version IS NULL;
UPDATE alf_version_count SET version = 1 WHERE version IS NULL;
--
-- Record script finish
--
DELETE FROM alf_applied_patch WHERE id = 'patch.db-V2.1-VersionColumns2';
INSERT INTO alf_applied_patch
(id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
VALUES
(
'patch.db-V2.1-VersionColumns2', 'Manually executed script upgrade V2.1: Created initial version number for ADM entities',
0, 63, -1, 64, null, 'UNKOWN', TRUE, TRUE, 'Script completed'
);

View File

@@ -1,15 +0,0 @@
/*
* Solution to PostgreSQL issue:
* function information_schema._pg_keypositions() does not exist
* Taken from: http://archives.postgresql.org/pgsql-general/2005-12/msg00060.php
* Author: Jason Long
* Tested against PostgreSQL 8.2
* First seen during upgrade testing of PostgreSQL from Alfresco 1.4.3 to 2.0
*/
SET search_path TO information_schema, public;
CREATE FUNCTION _pg_keypositions() RETURNS SETOF integer
LANGUAGE sql
IMMUTABLE
AS 'select g.s
from generate_series(1,current_setting(''max_index_keys'')::int,1)
as g(s)';