From 9c43c09bdc896f3387aae4d4d780dd7eb4e1ff73 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 11 Mar 2008 13:54:00 +0000 Subject: [PATCH] Final post-merge cleanups - HEAD is current with just about everything on the branches - Updated latest scripts to reflect correct version numbers - not strictly necessary git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8509 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AlfrescoSchemaUpdate-2.0-ContentUrls.sql | 2 +- .../AlfrescoSchemaUpdate-2.0-ContentUrls.sql | 2 +- .../upgrade-4-extra-indexes-and-constraints.sql | 2 +- .../upgrade-5-mapped-fk-indexes.sql | 2 +- .../AlfrescoSchemaUpdate-2.2-ACL.sql | 2 +- .../upgrade-0-create-missing-tables.sql | 2 +- .../upgrade-1-drop-indexes-and-constraints.sql | 2 +- .../upgrade-2-move-qnames.sql | 2 +- .../upgrade-3-proptypes.sql | 2 +- .../upgrade-5-mapped-fk-indexes.sql | 2 +- .../AlfrescoSchemaUpdate-2.2-ACL.sql | 2 +- .../upgrade-0-create-missing-tables.sql | 2 +- .../upgrade-1-drop-indexes-and-constraints.sql | 2 +- .../upgrade-2-move-qnames.sql | 2 +- .../upgrade-3-proptypes.sql | 2 +- .../alfresco/repo/domain/schema/SchemaBootstrap.java | 10 +++++----- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql b/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql index 87f0948f65..0dc44392c1 100644 --- a/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql +++ b/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.Dialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql @@ -20,5 +20,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.0-ContentUrls', 'Manually executed script upgrade V2.0: Indexes for alf_content_url table', - 0, 43, -1, 44, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 123, -1, 124, null, 'UNKOWN', 1, 1, 'Script completed' ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql b/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql index df44e005f4..b86ac5d03e 100644 --- a/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql +++ b/config/alfresco/dbscripts/upgrade/2.0/org.hibernate.dialect.PostgreSQLDialect/AlfrescoSchemaUpdate-2.0-ContentUrls.sql @@ -20,5 +20,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.0-ContentUrls', 'Manually executed script upgrade V2.0: Indexes for alf_content_url table', - 0, 43, -1, 44, null, 'UNKOWN', TRUE, TRUE, 'Script completed' + 0, 123, -1, 124, null, 'UNKOWN', TRUE, TRUE, 'Script completed' ); \ No newline at end of file diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-4-extra-indexes-and-constraints.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-4-extra-indexes-and-constraints.sql index 3ed9e43b39..38ccfa48d3 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-4-extra-indexes-and-constraints.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-4-extra-indexes-and-constraints.sql @@ -79,5 +79,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-4-ExtraIndexesAndConstraints', 'Manually executed script upgrade V2.2: Created additional indexes and constraints', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-5-mapped-fk-indexes.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-5-mapped-fk-indexes.sql index 5e2551dba6..96c3f249f8 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-5-mapped-fk-indexes.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Dialect/upgrade-5-mapped-fk-indexes.sql @@ -104,5 +104,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-5-MappedFKIndexes', 'Manually executed script upgrade V2.2: Created FK indexes', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql index d5f7b4c055..c1d1028424 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql @@ -156,5 +156,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-ACL', 'Manually executed script upgrade V2.2: Update acl schema', - 0, 84, -1, 85, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 119, -1, 120, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-0-create-missing-tables.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-0-create-missing-tables.sql index d16000be47..d2d340ae9c 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-0-create-missing-tables.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-0-create-missing-tables.sql @@ -86,5 +86,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-0-CreateMissingTables', 'Manually executed script upgrade V2.2: Created missing tables', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-1-drop-indexes-and-constraints.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-1-drop-indexes-and-constraints.sql index 9ecd00d16d..8a6dfe070b 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-1-drop-indexes-and-constraints.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-1-drop-indexes-and-constraints.sql @@ -160,5 +160,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-1-DropIndexesAndConstraints', 'Manually executed script upgrade V2.2: Remove pre-2.2 indexes and constraints', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-2-move-qnames.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-2-move-qnames.sql index 358e93570c..54345cf85a 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-2-move-qnames.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-2-move-qnames.sql @@ -366,5 +366,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-2-MoveQNames', 'Manually executed script upgrade V2.2: Moved static QNames and Namespaces', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-3-proptypes.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-3-proptypes.sql index 691c8986a9..08af754d77 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-3-proptypes.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-3-proptypes.sql @@ -98,5 +98,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-3-PropTypes', 'Manually executed script upgrade V2.2: Changed PropertyValue types', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-5-mapped-fk-indexes.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-5-mapped-fk-indexes.sql index 2b877683dd..7f0fa59ab0 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-5-mapped-fk-indexes.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-5-mapped-fk-indexes.sql @@ -18,5 +18,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-5-MappedFKIndexes', 'Manually executed script upgrade V2.2: Created FK indexes', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-2.2-ACL.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-2.2-ACL.sql index 276b482312..a5c92950e4 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-2.2-ACL.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-2.2-ACL.sql @@ -174,5 +174,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-ACL', 'Manually executed script upgrade V2.2: Update acl schema', - 0, 84, -1, 85, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 119, -1, 120, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql index db90c6b011..f0ac38d00a 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql @@ -86,5 +86,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-0-CreateMissingTables', 'Manually executed script upgrade V2.2: Created missing tables', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-1-drop-indexes-and-constraints.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-1-drop-indexes-and-constraints.sql index 1f2647767a..b899367eeb 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-1-drop-indexes-and-constraints.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-1-drop-indexes-and-constraints.sql @@ -207,5 +207,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-1-DropIndexesAndConstraints', 'Manually executed script upgrade V2.2: Remove pre-2.2 indexes and constraints', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-2-move-qnames.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-2-move-qnames.sql index 2e0e33db3f..9bee01dc22 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-2-move-qnames.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-2-move-qnames.sql @@ -367,5 +367,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-2-MoveQNames', 'Manually executed script upgrade V2.2: Moved static QNames and Namespaces', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-3-proptypes.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-3-proptypes.sql index 3d72252c42..dd470d74d3 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-3-proptypes.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-3-proptypes.sql @@ -98,5 +98,5 @@ INSERT INTO alf_applied_patch VALUES ( 'patch.db-V2.2-3-PropTypes', 'Manually executed script upgrade V2.2: Changed PropertyValue types', - 0, 85, -1, 86, null, 'UNKOWN', 1, 1, 'Script completed' + 0, 120, -1, 121, null, 'UNKOWN', 1, 1, 'Script completed' ); diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java index 1bac149f07..77b1428d48 100644 --- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java +++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java @@ -923,11 +923,11 @@ public class SchemaBootstrap extends AbstractLifecycleBean @Override protected void onBootstrap(ApplicationEvent event) { - System.out.println("\n" + - "=============================================================================\n" + - "= WARNING: USE OF THIS BUILD IS LIKELY TO BREAK CURRENT OR FUTURE UPGRADES. =\n" + - "============================================================================="); - +// System.out.println("\n" + +// "=============================================================================\n" + +// "= WARNING: USE OF THIS BUILD IS LIKELY TO BREAK CURRENT OR FUTURE UPGRADES. =\n" + +// "============================================================================="); +// // do everything in a transaction Session session = getSessionFactory().openSession(); try