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
This commit is contained in:
Derek Hulley
2008-03-11 13:54:00 +00:00
parent 399fe7ac67
commit 9c43c09bdc
16 changed files with 20 additions and 20 deletions

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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'
);

View File

@@ -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