[Aplaws-commit] r2316 - in trunk/ccm-navigation: sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1 src

[<pb...@fe...>]

Author: pboy
Date: 2012-05-16 08:37:24 +0000 (Wed, 16 May 2012)
New Revision: 2316

Modified:
   trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
   trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
   trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
   trunk/ccm-navigation/src/ccm-navigation.upgrade
Log:
Modified navigation update 6.6.0-6.6.1 to be executed AFTER 6.6.2-6.6.3 (renaming) in order to make Java class and initialization work.

Modified: trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql
===================================================================
--- trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql	2012-05-16 08:34:51 UTC (rev 2315)
+++ trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql	2012-05-16 08:37:24 UTC (rev 2316)
@@ -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' ;

Modified: trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql
===================================================================
--- trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql	2012-05-16 08:34:51 UTC (rev 2315)
+++ trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql	2012-05-16 08:37:24 UTC (rev 2316)
@@ -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' ;
 

Modified: trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql
===================================================================
--- trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql	2012-05-16 08:34:51 UTC (rev 2315)
+++ trunk/ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_nav_tree_portlet.sql	2012-05-16 08:37:24 UTC (rev 2316)
@@ -48,16 +48,16 @@
     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

Modified: trunk/ccm-navigation/src/ccm-navigation.upgrade
===================================================================
--- trunk/ccm-navigation/src/ccm-navigation.upgrade	2012-05-16 08:34:51 UTC (rev 2315)
+++ trunk/ccm-navigation/src/ccm-navigation.upgrade	2012-05-16 08:37:24 UTC (rev 2316)
@@ -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>