[Aplaws-commit] r2426 - in trunk: ccm-bundle/sql ccm-bundle/sql/ccm-bundle ccm-bundle/sql/ccm-bundle/upgrade ccm-bundle/sql/ccm-bundle/upgrade/default ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0 ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade ccm-navigation/src/com/arsdigita/navigation/ui ccm-navigation/src/com/arsdigita/navigation/ui/object

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

Author: pboy
Date: 2012-12-18 22:51:03 +0000 (Tue, 18 Dec 2012)
New Revision: 2426

Added:
   trunk/ccm-bundle/sql/ccm-bundle/
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
   trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
Removed:
   trunk/ccm-bundle/sql/upgrade/
Modified:
   trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
   trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
   trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
Log:
Fixed upgrade scripts (database sql), Enhancement navigation index page.    (on behalf of JensP)

Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql	                        (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_nav_templates_table.sql	2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,92 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: upd_nav_templates_table  pboy $
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+-- Update new path
+update nav_templates
+    set url=replace(url,'packages/navigation/templates'
+                       ,'templates/ccm-navigation/navigation')
+  where url like '%packages/navigation/templates%'; 
+
+
+-- AAP: update jsp names
+update nav_templates
+    set url=replace(url,'aap-atoz','sci-atoz'),
+        description=replace(description,'AAP','SCI'),
+        title=replace(title,'AAP','SCI')
+  where url like '%aap-atoz%'; 
+
+update nav_templates
+    set url=replace(url,'aap-default' ,'sci-default'),
+        description=replace(description,'AAP','SCI'),
+        title=replace(title,'AAP','SCI')
+  where url like '%aap-default%'; 
+
+update nav_templates
+    set url=replace(url,'aap-portal' ,'sci-portal'),
+        description=replace(description,'AAP','SCI'),
+        title=replace(title,'AAP','SCI')
+  where url like '%aap-portal%'; 
+
+update nav_templates
+    set url=replace(url,'aap-recent' ,'sci-recent'),
+        description=replace(description,'AAP','SCI'),
+        title=replace(title,'AAP','SCI')
+  where url like '%aap-recent%'; 
+
+update nav_templates
+    set url=replace(url,'aap-welcome' ,'sci-welcome'),
+        description=replace(description,'AAP','SCI'),
+        title=replace(title,'AAP','SCI')
+  where url like '%aap-welcome%'; 
+
+
+-- IAW: update jsp names
+update nav_templates
+    set url=replace(url,'iaw-atoz','sci-atoz'),
+        description=replace(description,'IAW','SCI'),
+        title=replace(title,'IAW','SCI')
+  where url like '%iaw-atoz%'; 
+
+update nav_templates
+    set url=replace(url,'iaw-default' ,'sci-default'),
+        description=replace(description,'IAW','SCI'),
+        title=replace(title,'IAW','SCI')
+  where url like '%iaw-default%'; 
+
+update nav_templates
+    set url=replace(url,'iaw-portal' ,'sci-portal'),
+        description=replace(description,'IAW','SCI'),
+        title=replace(title,'IAW','SCI')
+  where url like '%iaw-portal%'; 
+
+update nav_templates
+    set url=replace(url,'iaw-recent' ,'sci-recent'),
+        description=replace(description,'IAW','SCI'),
+        title=replace(title,'IAW','SCI')
+  where url like '%iaw-recent%'; 
+
+update nav_templates
+    set url=replace(url,'iaw-welcome' ,'sci-welcome'),
+        description=replace(description,'IAW','SCI'),
+        title=replace(title,'IAW','SCI')
+  where url like '%iaw-welcome%'; 

Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql	                        (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/default/0.0.0-6.6.0/upd_system_tables.sql	2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,68 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: upd_system_tables.sql pboy $
+
+-- adjust various system tables to the new name of application (ccm-sci-bundle)
+
+alter table init_requirements drop constraint init_requirements_init_f_cmmdn ;
+
+alter table init_requirements drop constraint init_require_requ_init_f_i6rgg ;
+
+update inits
+   set class_name=replace(class_name,'arsdigita.aplaws', 'arsdigita.bundle')
+ where class_name like '%arsdigita.aplaws%' ;
+
+update init_requirements
+   set init=replace(init,'arsdigita.aplaws', 'arsdigita.bundle')
+ where init  like  '%arsdigita.aplaws%' ;
+
+update init_requirements
+   set required_init=replace(required_init,'arsdigita.aplaws', 'arsdigita.bundle')
+ where required_init  like  '%arsdigita.aplaws%' ;
+
+ALTER TABLE ONLY init_requirements
+  ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+ALTER TABLE init_requirements
+  ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init)
+      REFERENCES inits (class_name) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+
+-- update application_types
+--    set object_type=replace(object_type,'london.portal', 'portalworkspace')
+--  where   object_type  like  '%london.portal%'  ;
+
+-- table applications doesn't require an update
+
+-- update apm_package_types
+--    set package_key=replace(package_key,'workspace', 'portalworkspace')
+--  where package_key  like  'workspace'  ;
+
+-- table apm_packages doesn't require an update either
+-- table site_nodes doesn't require an update either
+
+
+-- update application type in acs_objects
+update acs_objects
+    set (object_type,default_domain_class) =
+            (replace(object_type,'arsdigita.aplaws', 'arsdigita.bundle') ,
+             replace(default_domain_class,'arsdigita.aplaws', 'arsdigita.bundle') )
+    where object_type like '%arsdigita.aplaws%' ;

Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql	                        (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/oracle-se-0.0.0-6.6.0.sql	2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: oracle-se-0.0.0-6.6.0  pboy $
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+@@ default/0.0.0-6.6.0/upd_system_tables.sql
+@@ default/0.0.0-6.6.0/upd_nav_templates_table.sql
+

Added: trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql
===================================================================
--- trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql	                        (rev 0)
+++ trunk/ccm-bundle/sql/ccm-bundle/upgrade/postgres-0.0.0-6.6.0.sql	2012-12-18 22:51:03 UTC (rev 2426)
@@ -0,0 +1,31 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2011/11/10 23:15:09 $
+-- $Id: postgres-0.0.0-6.6.0  pboy $
+
+\echo Red Hat Enterprise ccm-sci-bundle 0.0.0 -> 6.6.0 Upgrade Script (PostgreSQL)
+
+-- Internal use at Bremen University only!
+-- Updates various university sites from als ccm-xxx-aplaws to scm-sci-bundle
+
+begin;
+
+\i default/0.0.0-6.6.0/upd_system_tables.sql
+\i default/0.0.0-6.6.0/upd_nav_templates_table.sql
+
+commit;

Modified: trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
===================================================================
--- trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql	2012-12-18 22:42:22 UTC (rev 2425)
+++ trunk/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql	2012-12-18 22:51:03 UTC (rev 2426)
@@ -21,7 +21,7 @@
 
 begin;
 
-\i ../default/upgrade/6.6.0-6.6.1/drop_constraints_ct_addresses.sql
+\i ../default/upgrade/6.6.0-6.6.1/drop_constraints_ct_adresses.sql
 \i ../default/upgrade/6.6.0-6.6.1/upd_table_iso_countries.sql
 \i ../default/upgrade/6.6.0-6.6.1/upd_table_ct_addresses.sql
 \i ../default/upgrade/6.6.0-6.6.1/upd_system_tables.sql

Modified: trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java
===================================================================
--- trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java	2012-12-18 22:42:22 UTC (rev 2425)
+++ trunk/ccm-navigation/src/com/arsdigita/navigation/ui/GreetingItem.java	2012-12-18 22:51:03 UTC (rev 2426)
@@ -59,8 +59,7 @@
     private static final Logger s_log = Logger.getLogger(GreetingItem.class);
 
     public Element generateXML(HttpServletRequest request,
-                               HttpServletResponse response) {
-        long start = System.currentTimeMillis();
+                               HttpServletResponse response) {        
         ContentItem item = (ContentItem) getObject();
         if (null == item || !item.isLive()) {
             return null;
@@ -70,7 +69,6 @@
             item = item.getLiveVersion();
         }
 
-
         Element content = Navigation.newElement("greetingItem");
         Party currentParty = Kernel.getContext().getParty();
         if (currentParty == null) {

Modified: trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java
===================================================================
--- trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java	2012-12-18 22:42:22 UTC (rev 2425)
+++ trunk/ccm-navigation/src/com/arsdigita/navigation/ui/object/CustomizableObjectList.java	2012-12-18 22:51:03 UTC (rev 2426)
@@ -269,7 +269,7 @@
         //- They have to be registered very early, so we can't add new parameters
         //  from a JSP.
         //- The HttpRequest is available here.
-        //So we use the HTTP request directly, which allows use to use a
+        //So we use the HTTP request directly, which allows us to use a
         //dedicated parameter for each of the filters.
         /*
          * if (request.getCharacterEncoding() == null) {