Verschiedene Anpassungen bei den Update Scripten.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1658 8810af33-2d31-482b-a856-94f89814c4df

ccm-bundle/src/ccm-bundle.upgrade

@@ -1,5 +1,6 @@
 <upgrade>
+  <!-- ONLY HB trunk, never used in APLAWS -->
   <version from="0.0.0" to="6.6.0">
-    <script sql="ccm-sci-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
+    <script sql="ccm-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
   </version>
 </upgrade>

ccm-cms-publicpersonalprofile/src/ccm-cms-publicpersonalprofile.upgrade

@@ -1,7 +1,9 @@
 <upgrade>
+    <!-- Applicable for UHB only!  -->
     <version from="6.6.1" to="6.6.2">
         <script sql="ccm-cms-publicpersonalprofile/upgrade/::database::-6.6.1-6.6.2.sql"/>        
     </version>
+    <!-- Applicable for UHB only!  -->
     <version from="6.6.2" to="6.6.3">
         <script class="com.arsdigita.cms.contenttypes.upgrades.PublicPersonalProfileBundleCreate"/>
         <script class="com.arsdigita.cms.contenttypes.upgrades.PublicPersonalProfileOwnerAssocUpgrade"/>

ccm-cms-types-job/application.xml

@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:ccm@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Job Content Type for the Red Hat CCM CMS.
+    The Job Content Type for publishing job vacancy announcements.
   </ccm:description>
 </ccm:application>

ccm-cms-types-legalnotice/application.xml

@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:ccm@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Legal Notice Content Type for the Red Hat CCM CMS.
+    The Legal Notice Content Type for publishing legal notices.
   </ccm:description>
 </ccm:application>

ccm-cms-types-minutes/application.xml

@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:ccm@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Minutes Content Type for the Red Hat CCM CMS.
+    The Minutes Content Type for publishing meeting minutes.
   </ccm:description>
 </ccm:application>

ccm-cms-types-organization/application.xml

@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Organization Content Type for the Red Hat CCM CMS.
+    The Organization Content Type Stores organization information.
   </ccm:description>
 </ccm:application>

ccm-cms-types-service/application.xml

@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:ccm@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The Service Content Type for the Red Hat CCM CMS.
+    The Service Content Type for publishing service information.
   </ccm:description>
 </ccm:application>

ccm-cms-types-siteproxy/application.xml

@@ -19,6 +19,6 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    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.
   </ccm:description>
 </ccm:application>

ccm-faq/src/ccm-faq.upgrade

@@ -1,6 +1,8 @@
 <upgrade>
+<!-- nothing to upgrade yet
   <version from="6.x.0" to="6.x.1">
     <script sql="ccm-faq/upgrade/::database::-6.x.0-6.x.1.sql"/>
     <script class="com.arsdigita.faq.upgrade.xyz"/>
   </version>
+-->
 </upgrade>

ccm-ldn-aplaws/bundles/complete/cfg/project.xml

@@ -114,11 +114,11 @@
         <ccm:application name="ccm-simplesurvey"/>
         <!--  Without known funcionality                                     -->
         <ccm:application name="ccm-formbuilder-pdf"/>
-        <ccm:application name="ccm-ldn-userpreferences"/>
 
 <!--   Complete Bundle's  LDN extensions  -->
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
+        <ccm:application name="ccm-ldn-userpreferences"/>
 
 
   </ccm:build>

ccm-ldn-aplaws/bundles/standard/cfg/project.xml

@@ -65,8 +65,8 @@
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
 <!--   Standard Bundle's Content Assets   -->
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
         <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Standard Bundle's  Content Types   -->
         <ccm:application name="ccm-cms-types-filestorageitem"/>
@@ -132,7 +132,9 @@
         -->
 
 <!--   ADD-ONs Bundle's  LDN extensions  -->
+        <!--
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
+        -->
 
 </ccm:project>

ccm-ldn-dublin/application.xml

@@ -16,6 +16,9 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
+    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.
   </ccm:description>

ccm-ldn-importer/application.xml

@@ -15,6 +15,8 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
+    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.
   </ccm:description>

ccm-ldn-types-esdservice/application.xml

@@ -20,6 +20,6 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-    The EsdService Content Type for created for Tameside project.
+    The EsdService Content Type.
   </ccm:description>
 </ccm:application>

ccm-ldn-types-esdservice/src/ccm-ldn-types-esdservikce.upgrade

@@ -0,0 +1,5 @@
+<upgrade>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-ldn-types-esdservice/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
+</upgrade>

ccm-ldn-util/application.xml

@@ -19,6 +19,8 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
+    Set of utilities for various tasks.
+      
     The Red Hat Web Application Framework is a platform for writing
     database-backed web applications in Java.
   </ccm:description>

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

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

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' ;
+    like 'com.arsdigita.navigation.portlet.NavigationTreePortlet' ;

ccm-navigation/src/ccm-navigation.upgrade

@@ -14,12 +14,18 @@
     <script class="com.arsdigita.navigation.upgrades.Upgrade650to651"/>
   </version>
   <version from="6.6.0" to="6.6.1">
+    <!-- Moved NavigationTreeePortlet to Navigation Package  -->
+    <!-- MUST actually be processed AFTER 6.6.2-6.6.3!
+         and AFTER ccm-portalws 6.5.1-6.5.2 which in turn must be processed
+         AFTER ccm-portalws 6.6.0-6-6-1 (rnaming ccm-ldn-portal)          -->
     <script sql="ccm-navigation/upgrade/::database::-6.6.0-6.6.1.sql"/>
   </version>
   <version from="6.6.1" to="6.6.2">
+    <!--  Removed legacy entries, london.navigation now legacy free.  -->
     <script sql="ccm-navigation/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
   <version from="6.6.2" to="6.6.3">
+    <!--  Renamed ccm-ldn-navigation to ccm-navigation  -->
     <script sql="ccm-navigation/upgrade/::database::-6.6.2-6.6.3.sql"/>
   </version>
 </upgrade>

ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-1.sql

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

ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-2.sql

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

ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portlet-upgrade-1.sql

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

ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-1.4.1-1.4.2.sql

@@ -1 +0,0 @@
-@@ ../oracle-se/upgrade/add-workspace-pages.sql

ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.0-6.3.1.sql

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

ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.1-6.3.2.sql

@@ -1 +0,0 @@
-@@ ../oracle-se/upgrade/freeform-use-clob.sql

ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-1.4.1-1.4.2.sql

@@ -1,3 +0,0 @@
-begin;
-\i ../default/upgrade/add-workspace-pages.sql
-commit;

ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.0-6.3.1.sql

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

ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.1-6.3.2.sql

@@ -1,3 +0,0 @@
-begin;
-\i ../postgres/upgrade/freeform-use-clob.sql
-commit;

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

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

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

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
 

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
 

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;

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;

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;

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;
 

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;
 

ccm-portalworkspace/src/ccm-portalworkspace.upgrade

@@ -1,28 +1,30 @@
 <upgrade>
   <version from="1.4.1" to="1.4.2">
-    <script sql="ccm-ldn-portal/upgrade/::database::-1.4.1-1.4.2.sql"/>
+    <script sql="ccm-portalworkspace/upgrade/::database::-1.4.1-1.4.2.sql"/>
   </version>
   <version from="6.3.0" to="6.3.1">
-    <script sql="ccm-ldn-portal/upgrade/::database::-6.3.0-6.3.1.sql"/>
+    <script sql="ccm-portalworkspace/upgrade/::database::-6.3.0-6.3.1.sql"/>
   </version>
   <version from="6.3.1" to="6.3.2">
-    <script sql="ccm-ldn-portal/upgrade/::database::-6.3.1-6.3.2.sql"/>
+    <script sql="ccm-portalworkspace/upgrade/::database::-6.3.1-6.3.2.sql"/>
   </version>
   <version from="6.5.0" to="6.5.1">
-    <script class="com.arsdigita.london.portal.upgrade.CreateContainerGroups"/>
+    <script class="com.arsdigita.portalworkspace.upgrade.CreateContainerGroups"/>
   </version>
   <version from="6.5.1" to="6.5.2">
-    <script sql="ccm-ldn-portal/upgrade/::database::-6.5.1-6.5.2.sql"/>
+    <script sql="ccm-portalworkspace/upgrade/::database::-6.5.1-6.5.2.sql"/>
-    <script class="com.arsdigita.london.portal.upgrade.CreateNavigationDirectoryPortlet"/>
+    <script class="com.arsdigita.portalworkspace.upgrade.CreateNavigationDirectoryPortlet"/>
   </version>
   <version from="6.5.2" to="6.5.3">
-    <script sql="ccm-ldn-portal/upgrade/::database::-6.5.2-6.5.3.sql"/>
+    <script sql="ccm-portalworkspace/upgrade/::database::-6.5.2-6.5.3.sql"/>
-    <script class="com.arsdigita.london.portal.upgrade.CreateFlashPortlet"/>
+    <script class="com.arsdigita.portalworkspace.upgrade.CreateFlashPortlet"/>
   </version>
   <version from="6.6.0" to="6.6.1">
+    <!-- Rename ccm-ldn-portal  to ccm-portalworkspace   -->
     <script sql="ccm-portalworkspace/upgrade/::database::-6.6.0-6.6.1.sql"/>
   </version>
   <version from="6.6.1" to="6.6.2">
+    <!--  Refactored Legacy Free     --> 
     <script sql="ccm-portalworkspace/upgrade/::database::-6.6.1-6.6.2.sql"/>
   </version>
 </upgrade>

ccm-sci-bundle/src/ccm-sci-bundle.upgrade

@@ -1,5 +1,6 @@
 <upgrade>
   <version from="0.0.0" to="6.6.0">
+  <!-- applicapable for UHB trunk only!  --> 
     <script sql="ccm-sci-bundle/upgrade/::database::-0.0.0-6.6.0.sql"/>
   </version>
 </upgrade>