diff --git a/ccm-cms/application.xml b/ccm-cms/application.xml
index 0fabd046e..054ab53cf 100755
--- a/ccm-cms/application.xml
+++ b/ccm-cms/application.xml
@@ -13,7 +13,6 @@
     <ccm:contact uri="mailto:ccm@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The CMS applications provides a flexible Content Management
-    System for the CCM platform.
+    This content type can be used to create an URL redirect using the Content-Center UI.
   </ccm:description>
 </ccm:application>
diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade
index 7bc93a73c..e1e038d1b 100755
--- a/ccm-cms/src/ccm-cms.upgrade
+++ b/ccm-cms/src/ccm-cms.upgrade
@@ -41,7 +41,7 @@
   </version>
   <version from="6.6.1" to="6.6.2">
     <!-- CMS Workspace & Service now new style legacy compatible apps     -->
-    <script class="com.arsdigita.cms.upgrade.AddNewStyleApplicationEntries"/>
+    <!-- <script class="com.arsdigita.cms.upgrade.AddNewStyleApplicationEntries"/> -->
     <script sql="ccm-cms/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
   <version from="6.6.2" to="6.6.3">
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql
index 5e9a2ee2b..980620166 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.0.0-5.1.0.sql
@@ -19,10 +19,10 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/versioning.sql
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/categorization.sql
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/permissioning.sql
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/messaging.sql
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/objects.sql
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/create-fk-indices.sql
-@@ ../oracle-se/upgrade/5.0.0-5.1.0/drop-sec_session_properties.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/versioning.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/categorization.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/permissioning.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/messaging.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/objects.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/create-fk-indices.sql
+@@ oracle-se/upgrade/5.0.0-5.1.0/drop-sec_session_properties.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql
index 5ef495e2b..0d24add52 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.1-5.1.2.sql
@@ -19,4 +19,4 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 
-@@ ../oracle-se/upgrade/5.1.1-5.1.2/site-nodes-url.sql
+@@ oracle-se/upgrade/5.1.1-5.1.2/site-nodes-url.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql
index 52adf9022..93746ebe2 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.1.2-5.2.0.sql
@@ -19,31 +19,31 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/function-currentDate.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/function-last_attr_value.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/package-hierarchy_denormalization.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/package-parties_denormalization.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/package-permission_denormalization.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/package-search_indexing.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_parties.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_permissions.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/drop-category-map-id.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/trigger-cat_category_category_map.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/categorization.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-applications.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-search-test.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-portlets.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-portals.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-portlet-portals-constraints.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-bebop-object.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-forms.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/add-lucene-docs.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/drop-places.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/drop-us-addresses.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/drop-notes.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/drop-table-secret-tokens.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/misc.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/update-constraints.sql
-@@ ../oracle-se/upgrade/5.1.2-5.2.0/update-indexes.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/function-currentDate.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/function-last_attr_value.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/function-package_id_for_object_id.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/package-hierarchy_denormalization.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/package-parties_denormalization.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/package-permission_denormalization.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/package-search_indexing.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_parties.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/trigger-acs_permissions.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/drop-category-map-id.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/table-cat_cat_subcat_trans_index.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/trigger-cat_category_category_map.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/categorization.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-applications.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-search-test.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-portlets.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-portals.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-portlet-portals-constraints.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-bebop-object.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-forms.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/add-lucene-docs.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/drop-places.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/drop-us-addresses.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/drop-notes.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/drop-table-secret-tokens.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/misc.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/update-constraints.sql
+@@ oracle-se/upgrade/5.1.2-5.2.0/update-indexes.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql
index 3f1f371bd..03d9ad686 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.0-5.2.1.sql
@@ -18,5 +18,5 @@
 -- $Id: oracle-se-5.2.0-5.2.1.sql 287 2005-02-22 00:29:02Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ ../oracle-se/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
-@@ ../default/upgrade/5.2.0-5.2.1/alter-requests.sql
+@@ oracle-se/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
+@@ default/upgrade/5.2.0-5.2.1/alter-requests.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql
index bd6b3ae71..905cbcdec 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-5.2.1-6.0.0.sql
@@ -20,26 +20,26 @@
 
 PROMPT Red Hat WAF 5.2.1 -> 6.0.0 Upgrade Script (Oracle)
 
-@@ ../default/upgrade/5.2.1-6.0.0/drop-search-test.sql
-@@ ../default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
-@@ ../default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
-@@ ../default/upgrade/5.2.1-6.0.0/alter-categories.sql
-@@ ../default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/update-web-hosts.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/alter-lucene.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/mime-types.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/vcx_deferred.sql
-@@ ../default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
-@@ ../default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
-@@ ../default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/misc.sql
-@@ ../oracle-se/upgrade/5.2.1-6.0.0/auto-upgrade.sql
+@@ default/upgrade/5.2.1-6.0.0/drop-search-test.sql
+@@ default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
+@@ default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
+@@ default/upgrade/5.2.1-6.0.0/alter-categories.sql
+@@ default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/update-web-hosts.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/alter-lucene.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/mime-types.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/vcx_deferred.sql
+@@ default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
+@@ default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
+@@ default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/misc.sql
+@@ oracle-se/upgrade/5.2.1-6.0.0/auto-upgrade.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql
index a159a54d7..41206edd4 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.0-6.0.1.sql
@@ -18,5 +18,5 @@
 -- $Id: oracle-se-6.0.0-6.0.1.sql 287 2005-02-22 00:29:02Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ ../oracle-se/upgrade/6.0.0-6.0.1/function-convert_to_html.sql
-@@ ../default/kernel/package-parties_denormalization.sql
\ No newline at end of file
+@@ oracle-se/upgrade/6.0.0-6.0.1/function-convert_to_html.sql
+@@ default/kernel/package-parties_denormalization.sql
\ No newline at end of file
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql
index b3c64bc1f..0fd45cff3 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.0.1-6.1.0.sql
@@ -20,19 +20,19 @@
 
 PROMPT Red Hat WAF 6.0.1 -> 6.1.0 Upgrade Script (Oracle)
 
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql 
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-inits-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/deferred.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/update-applications.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql 
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-inits-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/deferred.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/update-applications.sql
 
 alter table cms_mime_extensions modify (mime_type null);
 alter table cms_mime_extensions add constraint
@@ -46,50 +46,50 @@ create index AGENTPORT_SUPERPORT_ID_IDX on AGENTPORTLETS(SUPERPORTLET_ID);
 create index INIT_REQS_REQD_INIT_IDX on INIT_REQUIREMENTS(REQUIRED_INIT);
 
 -- insert mime type file extensions
-@@ ../default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
+@@ default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
 
 -- Upgrade script for new permission denormalization
 -- Privilege Hierarchy
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
 
 -- Privileges/permission denormalization
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
 
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
 
 -- Object context denormalization
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/package-dnm_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/package-dnm_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_context-quick.sql
 
 -- Party denormalization
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
-@@ ../oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
+@@ oracle-se/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
 
 drop package permission_denormalization;
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql
index f3badd6b7..dc6c40f62 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.0-6.1.1.sql
@@ -20,8 +20,8 @@
 
 PROMPT Red Hat WAF 6.1.0 -> 6.1.1 Upgrade Script (Oracle)
 
-@@ ../oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
-@@ ../oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql
+@@ oracle-se/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
+@@ oracle-se/upgrade/6.1.0-6.1.1/upgrade-search_content.sql
 
-@@ ../fixes/formbuilder/delete-bogus-form-widgets.sql
-@@ ../fixes/messaging/update-thread-replies.sql
+@@ fixes/formbuilder/delete-bogus-form-widgets.sql
+@@ fixes/messaging/update-thread-replies.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
index 94ecff3a9..cabf9a34c 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
@@ -16,5 +16,5 @@
 -- $Id: oracle-se-6.1.1-6.1.2.sql 786 2005-09-12 15:00:31Z fabrice $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ ../oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
-@@ ../oracle-se/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
+@@ oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
+@@ oracle-se/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql
index e8b0d9e8c..806f31075 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.0-6.3.1.sql
@@ -16,7 +16,7 @@
 -- $Id: oracle-se-6.1.1-6.1.2.sql 723 2005-08-23 16:56:33Z sskracic $
 -- $DateTime: 2004/08/16 18:10:38 $
 
-@@ ../oracle-se/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
-@@ ../oracle-se/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
-@@ ../default/upgrade/6.3.0-6.3.1/preferred-categories.sql
-@@ ../default/upgrade/6.3.0-6.3.1/auto-categorization.sql
+@@ oracle-se/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
+@@ oracle-se/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
+@@ default/upgrade/6.3.0-6.3.1/preferred-categories.sql
+@@ default/upgrade/6.3.0-6.3.1/auto-categorization.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql
index 0ba1468f2..ca0adf033 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.1-6.3.2.sql
@@ -1,2 +1,2 @@
-@@ ../oracle-se/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
+@@ oracle-se/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql
index d86438c59..b6bcc7243 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.3.2-6.3.3.sql
@@ -15,4 +15,4 @@
 --
 -- $Id$
 
-@@ ../default/upgrade/6.3.2-6.3.3/sso-login.sql
+@@ default/upgrade/6.3.2-6.3.3/sso-login.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql
index c7f22273e..9a25b83b3 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.2-6.5.3.sql
@@ -15,4 +15,4 @@
 --
 -- $Id$
 
-@@ ../oracle-se/upgrade/6.5.2-6.5.3/clob_message.sql
+@@ oracle-se/upgrade/6.5.2-6.5.3/clob_message.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql
index 0b5a72ba0..834b2ecfb 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.3-6.5.4.sql
@@ -18,5 +18,5 @@
 
 PROMPT Red Hat WAF 6.5.3 -> 6.5.4 Upgrade Script (Oracle)
 
-@@ ../default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
+@@ default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
index 869c757f0..b57fd7196 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.4-6.5.5.sql
@@ -18,8 +18,8 @@
 
 PROMPT Red Hat WAF 6.5.4 -> 6.5.5 Upgrade Script (Oracle)
 
-@@ ../oracle-se/kernel/package-dnm_context.sql
-@@ ../oracle-se/upgrade/6.5.4-6.5.5/drop-triggers.sql
-@@ ../oracle-se/kernel/triggers-dnm_context.sql
-@@ ../default/upgrade/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
+@@ oracle-se/kernel/package-dnm_context.sql
+@@ oracle-se/upgrade/6.5.4-6.5.5/drop-triggers.sql
+@@ oracle-se/kernel/triggers-dnm_context.sql
+@@ default/upgrade/6.5.4-6.5.5/delete-object_1_granted_context-entries.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql
index 0a2ada935..f72ac6f26 100755
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.5.5-6.5.6.sql
@@ -18,5 +18,5 @@
 
 PROMPT ccm-core   6.5.5 -> 6.5.6 Upgrade Script (Oracle)
 
-@@ ../oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
+@@ oracle-se/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
 
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
index 8368c7ad5..97e54b547 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -19,4 +19,4 @@
 
 PROMPT Red Hat Enterprise CORE 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
 
-@@ ../default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
+@@ default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
index 809d855dd..c3fbd8140 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.1-6.6.2.sql
@@ -21,4 +21,4 @@ PROMPT Red Hat Enterprise CORE 6.6.1 -> 6.6.2 Upgrade Script (Oracle)
 
 -- Just delete the table for web.WebApp which is unfinished work
 
-@@ ../default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
+@@ default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql
index f29d5d6fb..d250ccd60 100644
--- a/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.2-6.6.3.sql
@@ -22,4 +22,4 @@ PROMPT Red Hat Enterprise CORE 6.6.1 -> 6.6.2 Upgrade Script (Oracle)
 -- delete core portals entry in apm_package_types
 -- there es no entry in acs_objects!
 
-@@ ../default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
+@@ default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql
index 6cfab0103..a115c762e 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.0-5.2.1.sql
@@ -20,10 +20,10 @@
 
 
 begin;
-\i ../default/upgrade/5.2.0-5.2.1/alter-requests.sql
-\i ../postgres/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
-\i ../postgres/upgrade/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
-\i ../postgres/upgrade/5.2.0-5.2.1/notification/index-nt_requests.sql
+\i default/upgrade/5.2.0-5.2.1/alter-requests.sql
+\i postgres/upgrade/5.2.0-5.2.1/add-cat-deflt-ancestors-idx.sql
+\i postgres/upgrade/5.2.0-5.2.1/acs_objects-acs_permissions-cascade-workaround.sql
+\i postgres/upgrade/5.2.0-5.2.1/notification/index-nt_requests.sql
 
 commit;
 
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql
index caac8da24..c4c8493a2 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-5.2.1-6.0.0.sql
@@ -22,31 +22,31 @@
 
 begin;
 
-\i ../postgres/upgrade/5.2.1-6.0.0/drop-ri-triggers.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/drop-unique-indexes.sql
-\i ../default/upgrade/5.2.1-6.0.0/drop-search-test.sql
-\i ../default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
-\i ../default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
-\i ../default/upgrade/5.2.1-6.0.0/alter-categories.sql
-\i ../default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/add-permissions-rebuild.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/update-web-hosts.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/alter-lucene.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/mime-types.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/vcx_deferred.sql
-\i ../default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
-\i ../default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
-\i ../default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/misc.sql
-\i ../postgres/upgrade/5.2.1-6.0.0/auto-upgrade.sql
+\i postgres/upgrade/5.2.1-6.0.0/drop-ri-triggers.sql
+\i postgres/upgrade/5.2.1-6.0.0/drop-unique-indexes.sql
+\i default/upgrade/5.2.1-6.0.0/drop-search-test.sql
+\i default/upgrade/5.2.1-6.0.0/sequence-vcx_id_seq.sql
+\i default/upgrade/5.2.1-6.0.0/sequence-vcx_txns_id_seq.sql
+\i default/upgrade/5.2.1-6.0.0/alter-categories.sql
+\i default/upgrade/5.2.1-6.0.0/table-web_hosts-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/add-permissions-rebuild.sql
+\i postgres/upgrade/5.2.1-6.0.0/update-web-hosts.sql
+\i postgres/upgrade/5.2.1-6.0.0/alter-lucene.sql
+\i postgres/upgrade/5.2.1-6.0.0/mime-types.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_blob_operations-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_clob_operations-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_event_types-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_generic_operations-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_java_classes-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_obj_changes-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_operations-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_tags-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/table-vcx_txns-auto.sql
+\i postgres/upgrade/5.2.1-6.0.0/vcx_deferred.sql
+\i default/upgrade/5.2.1-6.0.0/insert-vcx_event_types.sql
+\i default/upgrade/5.2.1-6.0.0/insert-vcx_java_classes.sql
+\i default/upgrade/5.2.1-6.0.0/add-index-cw_task_listeners_tid_ltid.sql
+\i postgres/upgrade/5.2.1-6.0.0/misc.sql
+\i postgres/upgrade/5.2.1-6.0.0/auto-upgrade.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.0.0-6.0.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.0.0-6.0.1.sql
index 5b3eeea28..30c3ec35d 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.0.0-6.0.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.0.0-6.0.1.sql
@@ -22,6 +22,6 @@
 
 begin;
 
-\i ../postgres/kernel/package-parties_denormalization.sql
+\i postgres/kernel/package-parties_denormalization.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql
index 07bec462d..7b3418442 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.0.1-6.1.0.sql
@@ -22,19 +22,19 @@
 
 begin;
 
-\i ../postgres/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-inits-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/deferred.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/update-applications.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-admin_app-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-agentportlets-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-forms_lstnr_rmt_svr_post-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-init_requirements-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-inits-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-keystore-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-lucene_ids-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-sitemap_app-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-webapps-auto.sql
+\i postgres/upgrade/6.0.1-6.1.0/deferred.sql
+\i postgres/upgrade/6.0.1-6.1.0/update-host-unique-index.sql
+\i postgres/upgrade/6.0.1-6.1.0/update-cat_root_cat_object_map.sql
+\i postgres/upgrade/6.0.1-6.1.0/update-applications.sql
 
 update apm_package_types set package_uri = 'http://arsdigita.com/sitemap' where package_uri = 'http://arsdigita.com/admin/sitemap';
 
@@ -45,54 +45,54 @@ create index agentport_superport_id_idx on agentportlets(superportlet_id);
 create index init_reqs_reqd_init_idx on init_requirements(required_init);
 
 -- insert mime type file extensions
-\i ../default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
+\i default/upgrade/6.0.1-6.1.0/insert-cms_mime_extensions.sql
 
 -- Upgrade script for new permission denormalization
 -- Privilege Hierarchy
-\i ../postgres/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-acs_privilege_hierarchy.sql
+\i postgres/upgrade/6.0.1-6.1.0/index-acs_privilege_hierarchy.sql
+\i postgres/upgrade/6.0.1-6.1.0/comment-acs_privilege_hierarchy.sql
 
 -- Privileges/permission denormalization
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privileges.sql
+\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_privileges.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_col_map.sql
+\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_col_map.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy_map.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_privilege_hierarchy.sql
+\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_privilege_hierarchy.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_permissions.sql
+\i postgres/upgrade/6.0.1-6.1.0/comment-dnm_permissions.sql
+\i postgres/upgrade/6.0.1-6.1.0/index-dnm_permissions.sql
 
-\i ../postgres/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
+\i postgres/upgrade/6.0.1-6.1.0/package-dnm_privileges.sql
+\i postgres/upgrade/6.0.1-6.1.0/insert-acs_privilege_hierarchy.sql
+\i postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_privileges.sql
 
 -- Object context denormalization
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_ungranted_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/index-dnm_ungranted_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_object_1_granted_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_object_grants.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_granted_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/index-dnm_object_1_granted_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/index-dnm_granted_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_ungranted_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/index-dnm_ungranted_context.sql
 
-\i ../postgres/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/package-dnm_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/insert-dnm_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/package-dnm_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_context.sql
 
 -- Party denormalization
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_group_membership.sql
+\i postgres/upgrade/6.0.1-6.1.0/index-dnm_group_membership.sql
+\i postgres/upgrade/6.0.1-6.1.0/table-dnm_party_grants.sql
+\i postgres/upgrade/6.0.1-6.1.0/package-dnm_parties.sql
+\i postgres/upgrade/6.0.1-6.1.0/insert-dnm_group_membership.sql
+\i postgres/upgrade/6.0.1-6.1.0/upgrade-dnm_parties.sql
 
-\i ../postgres/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
-\i ../postgres/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
+\i postgres/upgrade/6.0.1-6.1.0/triggers-dnm_privileges.sql
+\i postgres/upgrade/6.0.1-6.1.0/triggers-dnm_context.sql
+\i postgres/upgrade/6.0.1-6.1.0/triggers-dnm_parties.sql
 
 create index dnm_group_membership_grp_idx on dnm_group_membership(pd_group_id);
 create index dnm_ungranted_context_obj_idx on dnm_ungranted_context(object_id);
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql
index 88c3d8320..529d2ed9d 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.0-6.1.1.sql
@@ -20,7 +20,7 @@
 
 \echo Red Hat WAF 6.1.0 -> 6.1.1 Upgrade Script (PostgreSQL)
 
-\i ../../ccm-core/postgres/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
+\i postgres/upgrade/6.1.0-6.1.1/upgrade-lucene_docs.sql
 
 \i ../fixes/formbuilder/delete-bogus-form-widgets.sql
 \i ../fixes/messaging/update-thread-replies.sql
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
index 75d27588d..8cd5208a6 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
@@ -16,6 +16,6 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 begin;
-  \i ../postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
-  \i ../postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
+  \i postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
+  \i postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql
index f8e3c09c4..27c163bf4 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.0-6.3.1.sql
@@ -16,10 +16,10 @@
 -- $DateTime: 2004/08/16 18:10:38 $
 
 begin;
-\i ../postgres/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
-\i ../postgres/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
-\i ../default/upgrade/6.3.0-6.3.1/preferred-categories.sql
-\i ../default/upgrade/6.3.0-6.3.1/auto-categorization.sql
+\i postgres/upgrade/6.3.0-6.3.1/add_column_catpurpose_lang.sql
+\i postgres/upgrade/6.3.0-6.3.1/add_column_users_banned.sql
+\i default/upgrade/6.3.0-6.3.1/preferred-categories.sql
+\i default/upgrade/6.3.0-6.3.1/auto-categorization.sql
 create or replace function last_day(date) returns date as 'select
 cast(date_trunc(''month'', $1) + ''1 month''::interval as date) - 1'
 language sql;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql
index 314cfefc8..d086940d0 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.1-6.3.2.sql
@@ -1,3 +1,3 @@
 begin;
-\i ../postgres/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
+\i postgres/upgrade/6.3.1-6.3.2/add_column_catpurpose_lang_default.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql
index f5946be01..32b664fbe 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.3.2-6.3.3.sql
@@ -1,3 +1,3 @@
 begin;
-\i ../default/upgrade/6.3.2-6.3.3/sso-login.sql
+\i default/upgrade/6.3.2-6.3.3/sso-login.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql
index 3f175a531..649e0cfd6 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.2-6.5.3.sql
@@ -14,5 +14,5 @@
 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 --
 begin;
-\i ../postgres/upgrade/6.5.2-6.5.3/clob_message.sql
+\i postgres/upgrade/6.5.2-6.5.3/clob_message.sql
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql
index 589089098..9497a2e00 100755
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.3-6.5.4.sql
@@ -21,7 +21,7 @@
 begin;
 
 
-\i ../default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
+\i default/upgrade/6.5.3-6.5.4/insert-application-container-group-columns.sql
 
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql
index 5f671face..f93ff7a6b 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.5.5-6.5.6.sql
@@ -20,7 +20,7 @@
 begin;
 
 
-\i ../postgres/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
+\i postgres/upgrade/6.5.5-6.5.6/create-category_localizations-table.sql
 
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql
index 99db5c657..aa22f8a1b 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.0-6.6.1.sql
@@ -21,7 +21,7 @@
 
 begin;
 
-\i ../default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
-\i ../default/upgrade/6.6.0-6.6.1/recreate_users_index.sql
+\i default/upgrade/6.6.0-6.6.1/drop_tables_acs_stylesheets.sql
+\i default/upgrade/6.6.0-6.6.1/recreate_users_index.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql
index d6d659d11..0e5b6958e 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.1-6.6.2.sql
@@ -23,6 +23,6 @@
 
 begin;
 
-\i ../default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
+\i default/upgrade/6.6.1-6.6.2/drop_table_webapps.sql
 
 commit;
diff --git a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql
index ee3a9f707..2762795f4 100644
--- a/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql
+++ b/ccm-core/sql/ccm-core/upgrade/postgres-6.6.2-6.6.3.sql
@@ -24,6 +24,6 @@
 
 begin;
 
-\i ../default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
+\i default/upgrade/6.6.2-6.6.3/remove_legacy_portal.sql
 
 commit;
diff --git a/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java b/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java
index 5a554233b..93c28dbb4 100644
--- a/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/ApplicationsAdministrationTab.java
@@ -212,6 +212,5 @@ public class ApplicationsAdministrationTab extends LayoutPanel implements AdminC
                 }
             }
         }
-
     }
 }
diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractApplicationManager.java b/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractApplicationManager.java
index 2491470e4..f0c41ec70 100644
--- a/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractApplicationManager.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractApplicationManager.java
@@ -34,10 +34,10 @@ public abstract class AbstractApplicationManager<T extends Application> implemen
     /**
      * Provides a standard form for creating new instances of an application. 
      * Suitable for most application types.
-     * 
-     * @param appClass 
+     * * 
      * @return The standard form for creating new instances of an application.
      */
+    @Override
     public Form getApplicationCreateForm() {
         return new ApplicationCreateForm<T>(getApplication(), allowRoot());
     }
diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractSingletonApplicationManager.java b/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractSingletonApplicationManager.java
index 9ab9c6c8b..d2b5bc385 100644
--- a/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractSingletonApplicationManager.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/applications/AbstractSingletonApplicationManager.java
@@ -39,6 +39,7 @@ public abstract class AbstractSingletonApplicationManager<T extends Application>
      * of singleton applications.
      */
     @SuppressWarnings("PMD.EmptyMethodInAbstractClassShouldBeAbstract")
+    @Override
     public final Form getApplicationCreateForm() {
         return null;
     }                
diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java b/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java
index d7d24b3f9..2e3b2fac0 100644
--- a/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java
@@ -56,6 +56,7 @@ public class ApplicationInstancePane extends SegmentedPanel {
 
             final Label noAdminPaneLabel = new Label();
             noAdminPaneLabel.addPrintListener(new PrintListener() {
+                @Override
                 public void prepare(final PrintEvent event) {
                     final Label target = (Label) event.getTarget();
 
diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/tree/ApplicationTreeModel.java b/ccm-core/src/com/arsdigita/ui/admin/applications/tree/ApplicationTreeModel.java
index 10b68ef85..ff7a7e1ec 100644
--- a/ccm-core/src/com/arsdigita/ui/admin/applications/tree/ApplicationTreeModel.java
+++ b/ccm-core/src/com/arsdigita/ui/admin/applications/tree/ApplicationTreeModel.java
@@ -36,13 +36,13 @@ import java.util.Iterator;
  * @version $Id$
  */
 public class ApplicationTreeModel implements TreeModel {
-        
-    public ApplicationTreeModel() {        
+
+    public ApplicationTreeModel() {
         //Nothing        
     }
-    
+
     @Override
-    public TreeNode getRoot(final PageState state) {        
+    public TreeNode getRoot(final PageState state) {
         return new RootTreeNode();
     }
 
@@ -52,15 +52,15 @@ public class ApplicationTreeModel implements TreeModel {
             return true;
         } else if (node instanceof ApplicationTypeTreeNode) {
             final ApplicationTypeTreeNode typeTreeNode = (ApplicationTypeTreeNode) node;
-            
+
             //if (typeTreeNode.getApplicationType().isSingleton()) {
             if (typeTreeNode.isSingleton()) {
                 return false;
             } else {
                 //return !retrieveApplicationInstances(typeTreeNode.getApplicationType()).isEmpty();
-            //return !retrieveApplicationInstances(typeTreeNode.getApplicationType()).isEmpty();
+                //return !retrieveApplicationInstances(typeTreeNode.getApplicationType()).isEmpty();
                 return !retrieveApplicationInstances(typeTreeNode.getObjecType()).isEmpty();
-            }            
+            }
         } else if (node instanceof ApplicationInstanceTreeNode) {
             return false;
         } else {
@@ -73,20 +73,21 @@ public class ApplicationTreeModel implements TreeModel {
     @Override
     public Iterator getChildren(final TreeNode node, final PageState state) {
         if (node instanceof RootTreeNode) {
-            final ApplicationTypeCollection appTypes = ApplicationType.retrieveAllApplicationTypes();                        
-            appTypes.addOrder("title");                    
-                                    
-            return new AppTypesIterator(appTypes);            
+            final ApplicationTypeCollection appTypes = ApplicationType.retrieveAllApplicationTypes();
+            appTypes.addOrder("title");
+
+            return new AppTypesIterator(appTypes);
         } else if (node instanceof ApplicationTypeTreeNode) {
             final ApplicationTypeTreeNode typeTreeNode = (ApplicationTypeTreeNode) node;
             //final ApplicationType appType = typeTreeNode.getApplicationType();
-            
+
             //final ApplicationCollection applications = Application.retrieveAllApplications(
             //        appType.getApplicationObjectType());
-            final ApplicationCollection applications = Application.retrieveAllApplications(typeTreeNode.getObjecType());
+            final ApplicationCollection applications = Application.retrieveAllApplications(
+                    typeTreeNode.getObjecType());
             applications.addOrder("title");
-            
-            return new AppIterator(applications);            
+
+            return new AppIterator(applications);
         } else if (node instanceof ApplicationInstanceTreeNode) {
             return null;
         } else {
@@ -95,27 +96,27 @@ public class ApplicationTreeModel implements TreeModel {
                     + "ApplicationInstanceTreeNodes.");
         }
     }
-    
+
     private ApplicationCollection retrieveApplicationInstances(final ApplicationType applicationType) {
         final ApplicationCollection applications = Application.retrieveAllApplications();
         applications.addEqualsFilter("objectType", applicationType.getApplicationObjectType());
-        
+
         return applications;
     }
 
     private ApplicationCollection retrieveApplicationInstances(final String appObjectType) {
         final ApplicationCollection applications = Application.retrieveAllApplications();
         applications.addEqualsFilter("objectType", appObjectType);
-        
+
         return applications;
     }
-    
+
     private class RootTreeNode implements TreeNode {
 
         public RootTreeNode() {
             //Nothing
         }
-        
+
         public Object getKey() {
             return "-1";
         }
@@ -125,15 +126,15 @@ public class ApplicationTreeModel implements TreeModel {
         }
 
     }
-    
+
     private class AppTypesIterator implements Iterator<ApplicationTypeTreeNode> {
 
         private final ApplicationTypeCollection appTypes;
-        
+
         public AppTypesIterator(final ApplicationTypeCollection appTypes) {
             this.appTypes = appTypes;
         }
-        
+
         public boolean hasNext() {
             return appTypes.next();
         }
@@ -144,27 +145,29 @@ public class ApplicationTreeModel implements TreeModel {
 
         public void remove() {
             throw new UnsupportedOperationException("Not supported.");
-        }        
+        }
+
     }
-    
+
     private class AppIterator implements Iterator<ApplicationInstanceTreeNode> {
-        
+
         private final ApplicationCollection applications;
-        
+
         public AppIterator(final ApplicationCollection applications) {
             this.applications = applications;
         }
-        
+
         public boolean hasNext() {
             return applications.next();
         }
-        
+
         public ApplicationInstanceTreeNode next() {
             return new ApplicationInstanceTreeNode(applications.getApplication());
         }
-        
+
         public void remove() {
             throw new UnsupportedOperationException("Not supported.");
-        }        
+        }
+
     }
 }
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
index 1b9794baa..4cf654d8c 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -243,21 +243,21 @@ public class Loader extends PackageLoader {
         String rssKey = (String)get(m_rssDomain);
         
         registerDomain(navigationKey, "/navigation/", null);
-        registerDomain(navigationKey, "/content/", null);
+        registerDomain(navigationKey, "/main/", null);
         registerDomain(navigationKey, "/portal/", null);
         //registerDomain(navigationKey, "/atoz/", null);
         //registerDomain(navigationKey, "/admin/subsite/", null);
 
         registerDomain(subjectKey, "/search/", null);
-        registerDomain(subjectKey, "/content/", "subject");
+        registerDomain(subjectKey, "/main/", "subject");
 
         registerDomain(servicesKey, "/services/", null);
-        registerDomain(servicesKey, "/content/", "services");
+        registerDomain(servicesKey, "/main/", "services");
 
         registerDomain(rssKey, "/channels/", null);
-        registerDomain(rssKey, "/content/", "rss");
+        registerDomain(rssKey, "/main/", "rss");
 
-        registerDomain(interactionKey, "/content/", "interaction");
+        registerDomain(interactionKey, "/main/", "interaction");
         
         registerServicesTemplate("/services/");
         registerPortalTemplate();
@@ -271,7 +271,7 @@ public class Loader extends PackageLoader {
                       customNavTitle, customNavDesc, "1.0.0", new Date());
 
         registerDomain(customNavKey, '/'+customNavPath+'/', null);
-        registerDomain(customNavKey, "/content/", customNavUseContext);
+        registerDomain(customNavKey, "/main/", customNavUseContext);
 
     }
 
diff --git a/ccm-portalworkspace/src/ccm-portalworkspace.upgrade b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
index 1aefe7b09..87729314c 100755
--- a/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
+++ b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade
@@ -27,8 +27,8 @@
     <!--  Refactored Legacy Free     --> 
     <script sql="ccm-portalworkspace/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
-  <version from="6.6.2" to="6.6.3">
+  <!-- <version from="6.6.2" to="6.6.3"> -->
     <!--  Removed separate theme modifications     --> 
-    <script sql="ccm-portalworkspace/upgrade/::database::-6.6.1-6.6.2.sql"/>
-  </version>
+    <!-- <script sql="ccm-portalworkspace/upgrade/::database::-6.6.1-6.6.2.sql"/>
+  </version> -->
 </upgrade>
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java
index 85806eabb..1eaac6155 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ArticleInCollectedVolumeInitializer.java
@@ -20,13 +20,13 @@
 package com.arsdigita.cms.contenttypes;
 
 /**
- * Executes at each system startup and initializes the ArticleInCollectedVolume 
+ * Executes at each system startup and initialises the ArticleInCollectedVolume 
  * content type.
  * 
  * Defines the content type specific properties and just uses the super class
  * methods to register the content type with the (transient) content type store
  * (map). This is done by runtimeRuntime startup method which runs the init()
- * methods of all initializers (this one just using the parent implementation).
+ * methods of all initialisers (this one just using the parent implementation).
  *
  * @author Jens Pelzetter
  */
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsAppManager.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsAppManager.java
index f396e7723..aedb022cf 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsAppManager.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsAppManager.java
@@ -23,14 +23,19 @@ import com.arsdigita.bebop.Label;
 import com.arsdigita.ui.admin.GlobalizationUtil;
 import com.arsdigita.ui.admin.applications.AbstractSingletonApplicationManager;
 import com.arsdigita.ui.admin.applications.ApplicationInstanceAwareContainer;
+import com.arsdigita.ui.admin.applications.ApplicationManager;
 
 /**
- *
+ * {@link ApplicationManager} class for the SciPublications application. Provides the admin
+ * UI for the SciPublications application.
+ * 
+ * 
  * @author Jens Pelzetter <jens@jp-digital.de>
  * @version $Id$
  */
 public class SciPublicationsAppManager extends AbstractSingletonApplicationManager<SciPublications> {
 
+    @Override
     public Class<SciPublications> getApplication() {
         return SciPublications.class;
     }
@@ -39,6 +44,7 @@ public class SciPublicationsAppManager extends AbstractSingletonApplicationManag
      * 
      * @return Just a simple Message for now because this applications has no settings yet.
      */
+    @Override
     public ApplicationInstanceAwareContainer getApplicationAdminForm() {
         final ApplicationInstanceAwareContainer container = new ApplicationInstanceAwareContainer();
 
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java
index de6e1dbf7..71e031f5a 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsInitializer.java
@@ -91,8 +91,10 @@ import com.arsdigita.runtime.RuntimeConfig;
 import com.arsdigita.ui.admin.ApplicationManagers;
 
 /**
- *
+ * Initializer for the SciPublications application.
+ * 
  * @author Jens Pelzetter
+ * @version $Id$
  */
 public class SciPublicationsInitializer extends CompoundInitializer {
 
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsLoader.java b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsLoader.java
index 7f9592d3e..bc019b9e4 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsLoader.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/scipublications/SciPublicationsLoader.java
@@ -27,8 +27,10 @@ import com.arsdigita.web.ApplicationType;
 import org.apache.log4j.Logger;
 
 /**
- *
+ * Loader for the SciPublications application.
+ * 
  * @author Jens Pelzetter
+ * @version $Id$
  */
 public class SciPublicationsLoader extends PackageLoader {