diff --git a/ccm-bundle/src/ccm-bundle.upgrade b/ccm-bundle/src/ccm-bundle.upgrade
index ffa6136ae..bc8b06c98 100755
--- a/ccm-bundle/src/ccm-bundle.upgrade
+++ b/ccm-bundle/src/ccm-bundle.upgrade
@@ -1,5 +1,6 @@
+
-
+
diff --git a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
index fd4503b19..25c4d7365 100644
--- a/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
+++ b/ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade
@@ -1,7 +1,9 @@
+
+
diff --git a/ccm-cms-types-job/application.xml b/ccm-cms-types-job/application.xml
index d57cbbfa5..76debfbce 100755
--- a/ccm-cms-types-job/application.xml
+++ b/ccm-cms-types-job/application.xml
@@ -19,6 +19,6 @@
- The Job Content Type for the Red Hat CCM CMS.
+ The Job Content Type for publishing job vacancy announcements.
diff --git a/ccm-cms-types-legalnotice/application.xml b/ccm-cms-types-legalnotice/application.xml
index cdf1b3fe2..c262d55b9 100755
--- a/ccm-cms-types-legalnotice/application.xml
+++ b/ccm-cms-types-legalnotice/application.xml
@@ -19,6 +19,6 @@
- The Legal Notice Content Type for the Red Hat CCM CMS.
+ The Legal Notice Content Type for publishing legal notices.
diff --git a/ccm-cms-types-minutes/application.xml b/ccm-cms-types-minutes/application.xml
index 99eada8c9..35e21e9d7 100755
--- a/ccm-cms-types-minutes/application.xml
+++ b/ccm-cms-types-minutes/application.xml
@@ -19,6 +19,6 @@
- The Minutes Content Type for the Red Hat CCM CMS.
+ The Minutes Content Type for publishing meeting minutes.
diff --git a/ccm-cms-types-organization/application.xml b/ccm-cms-types-organization/application.xml
index e6537071e..64507a2f3 100755
--- a/ccm-cms-types-organization/application.xml
+++ b/ccm-cms-types-organization/application.xml
@@ -19,6 +19,6 @@
- The Organization Content Type for the Red Hat CCM CMS.
+ The Organization Content Type Stores organization information.
diff --git a/ccm-cms-types-service/application.xml b/ccm-cms-types-service/application.xml
index cde5fdb3a..8fe6cd637 100755
--- a/ccm-cms-types-service/application.xml
+++ b/ccm-cms-types-service/application.xml
@@ -19,6 +19,6 @@
- The Service Content Type for the Red Hat CCM CMS.
+ The Service Content Type for publishing service information.
diff --git a/ccm-cms-types-siteproxy/application.xml b/ccm-cms-types-siteproxy/application.xml
index c68b1ca47..6395b2cd4 100755
--- a/ccm-cms-types-siteproxy/application.xml
+++ b/ccm-cms-types-siteproxy/application.xml
@@ -19,6 +19,6 @@
- The Glossary Item Content Type for the Red Hat CCM CMS.
+ A content type that lets you proxy remote sites and style the provided XML.
diff --git a/ccm-faq/src/ccm-faq.upgrade b/ccm-faq/src/ccm-faq.upgrade
index 9f6bd2053..df59bd141 100644
--- a/ccm-faq/src/ccm-faq.upgrade
+++ b/ccm-faq/src/ccm-faq.upgrade
@@ -1,6 +1,8 @@
+
diff --git a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
index 18c3af658..d6876b874 100755
--- a/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/complete/cfg/project.xml
@@ -114,11 +114,11 @@
-
+
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
index fe01b477e..40922971a 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
@@ -65,8 +65,8 @@
-
+
@@ -132,7 +132,9 @@
-->
+
diff --git a/ccm-ldn-dublin/application.xml b/ccm-ldn-dublin/application.xml
index 129f3e112..c6304b3a2 100755
--- a/ccm-ldn-dublin/application.xml
+++ b/ccm-ldn-dublin/application.xml
@@ -16,6 +16,9 @@
+ The Dublin Core application for compliance with the Dublin Core Metadata
+ standard.
+
The Red Hat Web Application Framework is a platform for writing
database-backed web applications in Java.
diff --git a/ccm-ldn-importer/application.xml b/ccm-ldn-importer/application.xml
index f84f492c3..f28e78c44 100755
--- a/ccm-ldn-importer/application.xml
+++ b/ccm-ldn-importer/application.xml
@@ -15,6 +15,8 @@
+ Application for importing content data from XML files.
+
Importer is the opposite of DomainObjectTraversal - it parses the
XML produced by the latter and creates objects in database.
diff --git a/ccm-ldn-types-esdservice/application.xml b/ccm-ldn-types-esdservice/application.xml
index f740a4d80..489d640c5 100755
--- a/ccm-ldn-types-esdservice/application.xml
+++ b/ccm-ldn-types-esdservice/application.xml
@@ -20,6 +20,6 @@
- The EsdService Content Type for created for Tameside project.
+ The EsdService Content Type.
diff --git a/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/default/6.6.0-6.6.1/ren_esdservice_table.sql b/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/default/6.6.0-6.6.1/ren_esdservice_table.sql
similarity index 100%
rename from ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/default/6.6.0-6.6.1/ren_esdservice_table.sql
rename to ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/default/6.6.0-6.6.1/ren_esdservice_table.sql
diff --git a/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/default/6.6.0-6.6.1/upd_system_tables.sql b/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
similarity index 100%
rename from ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/default/6.6.0-6.6.1/upd_system_tables.sql
rename to ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/default/6.6.0-6.6.1/upd_system_tables.sql
diff --git a/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/oracle-se-6.6.0-6.6.1.sql b/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/oracle-se-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/oracle-se-6.6.0-6.6.1.sql
rename to ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/oracle-se-6.6.0-6.6.1.sql
diff --git a/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/postgres-6.6.0-6.6.1.sql b/ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/postgres-6.6.0-6.6.1.sql
similarity index 100%
rename from ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/update/postgres-6.6.0-6.6.1.sql
rename to ccm-ldn-types-esdservice/sql/ccm-ldn-types-esdservice/upgrade/postgres-6.6.0-6.6.1.sql
diff --git a/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservikce.upgrade b/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservikce.upgrade
new file mode 100644
index 000000000..259a2eafc
--- /dev/null
+++ b/ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservikce.upgrade
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/ccm-ldn-util/application.xml b/ccm-ldn-util/application.xml
index a41692d25..fea40e814 100755
--- a/ccm-ldn-util/application.xml
+++ b/ccm-ldn-util/application.xml
@@ -19,6 +19,8 @@
+ Set of utilities for various tasks.
+
The Red Hat Web Application Framework is a platform for writing
database-backed web applications in Java.
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
index 8b10b8af4..201140bc0 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
@@ -24,8 +24,8 @@
update acs_objects
set (object_type,display_name,default_domain_class) =
- ('com.arsdigita.london.navigation.portlet.NavigationTreePortlet',
+ ('com.arsdigita.navigation.portlet.NavigationTreePortlet',
'Navigation Tree',
- 'com.arsdigita.london.navigation.portlet.NavigationTreePortlet')
+ 'com.arsdigita.navigation.portlet.NavigationTreePortlet')
where object_type
- like 'com.arsdigita.london.portal.portlet.NavigationDirectoryPortlet' ;
+ like 'com.arsdigita.portalworkspace.portlet.NavigationDirectoryPortlet' ;
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
index 173a30743..b7bae100f 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
@@ -24,9 +24,9 @@
update application_types
set (object_type,title,description) =
- ('com.arsdigita.london.navigation.portlet.NavigationTreePortlet',
+ ('com.arsdigita.navigation.portlet.NavigationTreePortlet',
'Navigation Tree',
'Displays a tree of navigation categories' )
where object_type
- like 'com.arsdigita.london.portal.portlet.NavigationDirectoryPortlet' ;
+ like 'com.arsdigita.portalworkspace.portlet.NavigationDirectoryPortlet' ;
diff --git a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
index 6b784b955..c132cca51 100644
--- a/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
+++ b/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
@@ -48,16 +48,16 @@ alter table portlet_navigation_tree
REFERENCES portlets(portlet_id);
update application_types
- set object_type = 'com.arsdigita.london.navigation.portlet.NavigationTreePortlet'
+ set object_type = 'com.arsdigita.navigation.portlet.NavigationTreePortlet'
where object_type
- like 'com.arsdigita.london.portal.portlet.NavigationDirectoryPortlet' ;
+ like 'com.arsdigita.portalworkspace.portlet.NavigationDirectoryPortlet' ;
update application_types
set title = 'Navigation Tree'
where object_type
- like 'com.arsdigita.london.navigation.portlet.NavigationTreePortlet' ;
+ like 'com.arsdigita.navigation.portlet.NavigationTreePortlet' ;
update application_types
set description = 'Displays a tree of navigation categories'
where object_type
- like 'com.arsdigita.london.navigation.portlet.NavigationTreePortlet' ;
\ No newline at end of file
+ like 'com.arsdigita.navigation.portlet.NavigationTreePortlet' ;
\ No newline at end of file
diff --git a/ccm-navigation/src/ccm-navigation.upgrade b/ccm-navigation/src/ccm-navigation.upgrade
index 8515e8b60..923ea708d 100755
--- a/ccm-navigation/src/ccm-navigation.upgrade
+++ b/ccm-navigation/src/ccm-navigation.upgrade
@@ -14,12 +14,18 @@
+
+
+
+
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-1.sql
deleted file mode 100755
index 09609c46c..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-1.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-
-@@ portlet-upgrade-1.sql
-
-delete from acs_objects where object_type = 'com.arsdigita.london.portal.Portlet';
-delete from acs_objects where object_type = 'com.arsdigita.london.portal.Portal';
-delete from acs_objects where object_id in (select workspace_id from workspaces where party_id != null);
-
--- The dispatcher stuff
-update apm_package_types set dispatcher_class = 'com.arsdigita.dispatcher.JSPApplicationDispatcher' where package_key = 'portal';
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-2.sql
deleted file mode 100755
index 580ac906c..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-2.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-delete from acs_objects where object_type = 'com.arsdigita.london.portal.portlet.ForumPostingsPortlet';
-
-delete from acs_objects where object_id = (
- select portlet_type_id
- from portlet_types
- where class_name = 'com.arsdigita.london.portal.portlet.ForumPostingsPortlet'
-);
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portlet-upgrade-1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portlet-upgrade-1.sql
deleted file mode 100755
index 100d880f8..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portlet-upgrade-1.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-create table portlet_freeform_html (
- portlet_id integer not null
- constraint ptl_ffh_portlet_id_pk primary key
- constraint ptl_ffh_portlet_id_fk
- references portlets (portlet_id)
- on delete cascade,
- content varchar2(4000)
-);
-
-
-create table portlet_content_item (
- portlet_id integer not null
- constraint ptl_ci_portlet_id_pk primary key
- constraint ptl_ci_portlet_id_fk
- references portlets (portlet_id)
- on delete cascade,
- item_id integer
- constraint ptl_ci_item_id_fk
- references cms_items (item_id)
- on delete set null
-);
-
-
-
-create table portlet_rss_feed (
- portlet_id integer not null
- constraint ptl_rss_portlet_id_pk primary key
- constraint ptl_rss_portlet_id_fk
- references portlets (portlet_id)
- on delete cascade,
- url varchar2(250)
-);
-
-
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-1.4.1-1.4.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-1.4.1-1.4.2.sql
deleted file mode 100755
index 59bd7b382..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-1.4.1-1.4.2.sql
+++ /dev/null
@@ -1 +0,0 @@
-@@ ../oracle-se/upgrade/add-workspace-pages.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.0-6.3.1.sql
deleted file mode 100755
index 82249885b..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.0-6.3.1.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-@@ ../oracle-se/upgrade/add-workspace-themes.sql
-@@ ../oracle-se/upgrade/add-workspace-owner.sql
-@@ ../oracle-se/upgrade/add-workspace_workspace_map.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.1-6.3.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.1-6.3.2.sql
deleted file mode 100755
index 2ee1ce4e0..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.1-6.3.2.sql
+++ /dev/null
@@ -1 +0,0 @@
-@@ ../oracle-se/upgrade/freeform-use-clob.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-1.4.1-1.4.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-1.4.1-1.4.2.sql
deleted file mode 100755
index 27e3d13e1..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-1.4.1-1.4.2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-begin;
-\i ../default/upgrade/add-workspace-pages.sql
-commit;
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.0-6.3.1.sql
deleted file mode 100755
index d25e44231..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.0-6.3.1.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-begin;
-\i ../postgres/upgrade/add-workspace-themes.sql
-\i ../postgres/upgrade/add-workspace-owner.sql
-\i ../postgres/upgrade/add-workspace_workspace_map.sql
-commit;
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.1-6.3.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.1-6.3.2.sql
deleted file mode 100755
index c3ef642ad..000000000
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.1-6.3.2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-begin;
-\i ../postgres/upgrade/freeform-use-clob.sql
-commit;
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-workspace-pages.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/1.4.1-1.4.2/add-workspace-pages.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-workspace-pages.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/1.4.1-1.4.2/add-workspace-pages.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-navigation-directory-portlet.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.5.1-6.5.2/add-navigation-directory-portlet.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-navigation-directory-portlet.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.5.1-6.5.2/add-navigation-directory-portlet.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-flash-portlet.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.5.2-6.5.3/add-flash-portlet.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-flash-portlet.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.5.2-6.5.3/add-flash-portlet.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/content-directory.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/content-directory.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/content-directory.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/content-directory.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/fix-perm-context.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/fix-perm-context.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/fix-perm-context.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/fix-perm-context.sql
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-1.4.1-1.4.2.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-1.4.1-1.4.2.sql
new file mode 100755
index 000000000..f8bba6b66
--- /dev/null
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-1.4.1-1.4.2.sql
@@ -0,0 +1 @@
+@@ oracle-se/1.4.1-1.4.2/add-workspace-pages.sql
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.0-6.3.1.sql
new file mode 100755
index 000000000..03fe81b62
--- /dev/null
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.0-6.3.1.sql
@@ -0,0 +1,3 @@
+@@ oracle-se/6.3.0-6.3.1/add-workspace-themes.sql
+@@ oracle-se/6.3.0-6.3.1/add-workspace-owner.sql
+@@ oracle-se/6.3.0-6.3.1/add-workspace_workspace_map.sql
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.1-6.3.2.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.1-6.3.2.sql
new file mode 100755
index 000000000..5f1b01c69
--- /dev/null
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.1-6.3.2.sql
@@ -0,0 +1 @@
+@@ oracle-se/6.3.1-6.3.2/freeform-use-clob.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.1-6.5.2.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.5.1-6.5.2.sql
similarity index 93%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.1-6.5.2.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.5.1-6.5.2.sql
index 433467867..d711a30af 100644
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.1-6.5.2.sql
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.5.1-6.5.2.sql
@@ -14,5 +14,5 @@
-- along with this library; if not, write to the Free Software Foundation, Inc.,
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-@@ ../default/upgrade/add-navigation-directory-portlet.sql
+@@ default/6.5.1-6.5.2/add-navigation-directory-portlet.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.2-6.5.3.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.5.2-6.5.3.sql
similarity index 94%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.2-6.5.3.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.5.2-6.5.3.sql
index bc152332e..4572bc30a 100644
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.2-6.5.3.sql
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.5.2-6.5.3.sql
@@ -14,5 +14,5 @@
-- along with this library; if not, write to the Free Software Foundation, Inc.,
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-@@ ../default/upgrade/add-flash-portlet.sql
+@@ /default/6.5.2-6.5.3/add-flash-portlet.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-pages.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/1.4.1-1.4.2/add-workspace-pages.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-pages.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/1.4.1-1.4.2/add-workspace-pages.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-owner.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.0-6.3.1/add-workspace-owner.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-owner.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.0-6.3.1/add-workspace-owner.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-themes.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.0-6.3.1/add-workspace-themes.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-themes.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.0-6.3.1/add-workspace-themes.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace_workspace_map.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.0-6.3.1/add-workspace_workspace_map.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace_workspace_map.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.0-6.3.1/add-workspace_workspace_map.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/freeform-use-clob.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.1-6.3.2/freeform-use-clob.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/freeform-use-clob.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se/6.3.1-6.3.2/freeform-use-clob.sql
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-1.4.1-1.4.2.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-1.4.1-1.4.2.sql
new file mode 100755
index 000000000..05a566d2a
--- /dev/null
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-1.4.1-1.4.2.sql
@@ -0,0 +1,3 @@
+begin;
+\i default/1.4.1-1.4.2/add-workspace-pages.sql
+commit;
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.3.0-6.3.1.sql
new file mode 100755
index 000000000..6322bca03
--- /dev/null
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.3.0-6.3.1.sql
@@ -0,0 +1,5 @@
+begin;
+\i postgres/6.3.0-6.3.1/add-workspace-themes.sql
+\i postgres/6.3.0-6.3.1/add-workspace-owner.sql
+\i postgres/6.3.0-6.3.1/add-workspace_workspace_map.sql
+commit;
diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.3.1-6.3.2.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.3.1-6.3.2.sql
new file mode 100755
index 000000000..1ad039577
--- /dev/null
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.3.1-6.3.2.sql
@@ -0,0 +1,3 @@
+begin;
+\i postgres/6.3.1-6.3.2/freeform-use-clob.sql
+commit;
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.1-6.5.2.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.5.1-6.5.2.sql
similarity index 93%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.1-6.5.2.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.5.1-6.5.2.sql
index c9764018a..9d3bfc98e 100644
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.1-6.5.2.sql
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.5.1-6.5.2.sql
@@ -15,6 +15,6 @@
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
begin;
-\i ../default/upgrade/add-navigation-directory-portlet.sql
+\i default/6.5.1-6.5.2/add-navigation-directory-portlet.sql
commit;
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.2-6.5.3.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.5.2-6.5.3.sql
similarity index 94%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.2-6.5.3.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.5.2-6.5.3.sql
index bbd37a52f..7781d80ab 100644
--- a/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.2-6.5.3.sql
+++ b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.5.2-6.5.3.sql
@@ -15,6 +15,6 @@
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
begin;
-\i ../default/upgrade/add-flash-portlet.sql
+\i default/6.5.2-6.5.3/add-flash-portlet.sql
commit;
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-owner.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.0-6.3.1/add-workspace-owner.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-owner.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.0-6.3.1/add-workspace-owner.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-themes.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.0-6.3.1/add-workspace-themes.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-themes.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.0-6.3.1/add-workspace-themes.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace_workspace_map.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.0-6.3.1/add-workspace_workspace_map.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace_workspace_map.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.0-6.3.1/add-workspace_workspace_map.sql
diff --git a/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/freeform-use-clob.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.1-6.3.2/freeform-use-clob.sql
similarity index 100%
rename from ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/freeform-use-clob.sql
rename to ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres/6.3.1-6.3.2/freeform-use-clob.sql
diff --git a/ccm-portalworkspace/src/ccm-portalworkspace.upgrade b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
index a3da43e2b..7cb5395bf 100755
--- a/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
+++ b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
@@ -1,28 +1,30 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
+
+
diff --git a/ccm-sci-bundle/src/ccm-sci-bundle.upgrade b/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
index ffa6136ae..44ce452ee 100755
--- a/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
+++ b/ccm-sci-bundle/src/ccm-sci-bundle.upgrade
@@ -1,5 +1,6 @@
+