Hoffentlich ist jetzt aller Mist, den svn verursacht hat, behoben.

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

ccm-ldn-rss/src/com/arsdigita/london/rss/Initializer.java

@@ -28,38 +28,11 @@ import com.arsdigita.persistence.pdl.ManifestSource;
 import com.arsdigita.persistence.pdl.NameFilter;
 import com.arsdigita.runtime.CompoundInitializer;
 import com.arsdigita.runtime.DomainInitEvent;
-import com.arsdigita.runtime.LegacyInitializer;
+// import com.arsdigita.runtime.LegacyInitializer;
 import com.arsdigita.runtime.PDLInitializer;
 import com.arsdigita.runtime.RuntimeConfig;
 import com.arsdigita.london.rss.portlet.WorkspaceDirectoryPortlet;
 
-// import com.arsdigita.bebop.RequestLocal;
-// import com.arsdigita.domain.DomainObjectInstantiator;
-// import com.arsdigita.domain.xml.TraversalHandler;
-// import com.arsdigita.kernel.ResourceType;
-// import com.arsdigita.kernel.ResourceTypeConfig;
-// import com.arsdigita.kernel.ui.ResourceConfigComponent;
-// import com.arsdigita.kernel.ui.ResourceConfigFormSection;
-// import com.arsdigita.london.navigation.ApplicationNavigationModel;
-// import com.arsdigita.london.navigation.DefaultNavigationModel;
-// import com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet;
-// import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet;
-// import com.arsdigita.london.portal.portlet.FlashPortletInitializer;
-// import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet;
-// import com.arsdigita.london.portal.portlet.LoginPortlet;
-// import com.arsdigita.london.portal.portlet.NavigationDirectoryPortlet;
-// import com.arsdigita.london.portal.portlet.RSSFeedPortlet;
-// import com.arsdigita.london.portal.portlet.TimeOfDayPortlet;
-// import com.arsdigita.london.portal.portlet.MyWorkspacesPortlet;
-// import com.arsdigita.london.portal.portlet.WorkspaceNavigatorPortlet;
-// import com.arsdigita.london.portal.portlet.WorkspaceSummaryPortlet;
-// import com.arsdigita.london.portal.ui.admin.WorkspaceConfigFormSection;
-// import com.arsdigita.london.portal.ui.portlet.ContentDirectoryPortletEditor;
-// import com.arsdigita.london.portal.ui.portlet.FreeformHTMLPortletEditor;
-// import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditor;
-// import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditorForm;
-// import com.arsdigita.xml.XML;
-
 
 
 /**
@@ -86,6 +59,7 @@ public class Initializer extends CompoundInitializer {
      *
      * @param e
      */
+    @Override
     public void init(DomainInitEvent e) {
 
         super.init(e);
@@ -94,6 +68,7 @@ public class Initializer extends CompoundInitializer {
         e.getFactory().registerInstantiator(
                 WorkspaceDirectoryPortlet.BASE_DATA_OBJECT_TYPE,
                 new ACSObjectInstantiator() {
+                    @Override
                     public DomainObject doNewInstance(DataObject dataObject) {
                         return new WorkspaceDirectoryPortlet(dataObject);
                     }

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/add_constraints.sql

@@ -0,0 +1,90 @@
+--
+-- 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: add_constraints.sql pboy $
+
+
+ALTER TABLE ONLY pw_workspace_themeapplications
+    ADD CONSTRAINT pw_wor_them_the_app_id_p_2ddxf PRIMARY KEY (theme_app_id);
+
+ALTER TABLE ONLY pw_workspace_workspace_map
+    ADD CONSTRAINT pw_wor_wor_map_ref_wor_p_cy2d5
+    PRIMARY KEY (referencing_workspace_id, referenced_workspace_id);
+
+ALTER TABLE ONLY pw_workspace_page_layouts
+    ADD CONSTRAINT pw_work_pag_lay_format_u_bdjb3 UNIQUE (format);
+
+ALTER TABLE ONLY pw_workspace_page_layouts
+    ADD CONSTRAINT pw_work_pag_lay_lay_id_p_1vwf9 PRIMARY KEY (layout_id);
+
+ALTER TABLE ONLY pw_workspace_pages
+    ADD CONSTRAINT pw_workspa_page_pag_id_p_gfdzk PRIMARY KEY (page_id);
+
+ALTER TABLE ONLY pw_workspace_themes
+    ADD CONSTRAINT pw_workspa_them_the_id_p_62w6p PRIMARY KEY (theme_id);
+
+ALTER TABLE ONLY pw_workspaces
+    ADD CONSTRAINT pw_workspac_workspa_id_p_knd54 PRIMARY KEY (workspace_id);
+
+CREATE INDEX pw_workspaces_party_id_idx ON pw_workspaces USING btree (party_id);
+
+ALTER TABLE ONLY pw_workspace_themeapplications
+    ADD CONSTRAINT pw_wor_them_the_app_id_f_p_hb1 FOREIGN KEY (theme_app_id)
+    REFERENCES applications(application_id);
+
+ALTER TABLE ONLY pw_workspace_workspace_map
+    ADD CONSTRAINT pw_wor_wor_map_ref_wor_f_7a6d2
+    FOREIGN KEY (referenced_workspace_id) REFERENCES pw_workspaces(workspace_id);
+
+ALTER TABLE ONLY pw_workspace_workspace_map
+    ADD CONSTRAINT pw_wor_wor_map_ref_wor_f_lro20
+    FOREIGN KEY (referencing_workspace_id) REFERENCES pw_workspaces(workspace_id);
+
+ALTER TABLE ONLY pw_workspace_pages
+    ADD CONSTRAINT pw_works_pag_worksp_id_f_t2tmm FOREIGN KEY (workspace_id)
+    REFERENCES pw_workspaces(workspace_id);
+
+ALTER TABLE ONLY pw_workspaces
+    ADD CONSTRAINT pw_workspa_defa_lay_id_f_20goi FOREIGN KEY (default_layout_id)
+    REFERENCES pw_workspace_page_layouts(layout_id);
+
+ALTER TABLE ONLY pw_workspace_pages
+    ADD CONSTRAINT pw_workspa_pag_layo_id_f_fo5yz FOREIGN KEY (layout_id)
+    REFERENCES pw_workspace_page_layouts(layout_id);
+
+ALTER TABLE ONLY pw_workspace_pages
+    ADD CONSTRAINT pw_workspa_page_pag_id_f_fz2ep FOREIGN KEY (page_id)
+    REFERENCES portals(portal_id);
+
+ALTER TABLE ONLY pw_workspace_themes
+    ADD CONSTRAINT pw_workspa_them_the_id_f_my7fo FOREIGN KEY (theme_id)
+    REFERENCES acs_objects(object_id);
+
+ALTER TABLE ONLY pw_workspaces
+    ADD CONSTRAINT pw_workspac_workspa_id_f_dpweg FOREIGN KEY (workspace_id)
+    REFERENCES applications(application_id);
+
+ALTER TABLE ONLY pw_workspaces
+    ADD CONSTRAINT pw_workspaces_owner_id_f_o_elg FOREIGN KEY (owner_id)
+    REFERENCES users(user_id);
+
+ALTER TABLE ONLY pw_workspaces
+    ADD CONSTRAINT pw_workspaces_party_id_f_7tkia FOREIGN KEY (party_id)
+    REFERENCES parties(party_id);
+
+ALTER TABLE ONLY pw_workspaces
+    ADD CONSTRAINT pw_workspaces_theme_id_f_vsmgl FOREIGN KEY (theme_id)
+    REFERENCES pw_workspace_themes(theme_id);
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_themeapplications.sql

@@ -0,0 +1,28 @@
+--
+-- 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: ren_table_themeapplications.sql pboy $
+
+ALTER TABLE themeapplications
+  DROP CONSTRAINT themeapplic_the_app_id_p_ix9jr;
+
+ALTER TABLE themeapplications
+  DROP CONSTRAINT themeapplic_the_app_id_f_ejek5;
+
+
+ALTER TABLE themeapplications RENAME TO pw_workspace_themeapplications ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspace_page_layouts.sql

@@ -0,0 +1,28 @@
+--
+-- 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: ren_table_workspace_page_layouts.sql pboy $
+
+ALTER TABLE workspace_page_layouts
+  DROP CONSTRAINT worksp_pag_layo_lay_id_p_paxph ;
+
+ALTER TABLE workspace_page_layouts
+  DROP CONSTRAINT worksp_pag_layo_format_u_ff8p6;
+
+
+ALTER TABLE workspace_page_layouts RENAME TO pw_workspace_page_layouts ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspace_pages.sql

@@ -0,0 +1,32 @@
+--
+-- 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: ren_table_workspace_pages.sql pboy $
+
+ALTER TABLE workspace_pages
+  DROP CONSTRAINT workspac_pages_page_id_p_iugi0 ;
+
+ALTER TABLE workspace_pages
+  DROP CONSTRAINT workspac_page_layou_id_f_9uq1r;
+
+ALTER TABLE workspace_pages
+  DROP CONSTRAINT workspac_pages_page_id_f_jhka1;
+
+
+
+ALTER TABLE workspace_pages RENAME TO pw_workspace_pages ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspace_themes.sql

@@ -0,0 +1,29 @@
+--
+-- 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: ren_table_workspace_themes.sql pboy $
+
+ALTER TABLE workspace_themes
+  DROP CONSTRAINT workspac_theme_them_id_p_6_22y;
+
+ALTER TABLE workspace_themes
+  DROP CONSTRAINT workspac_theme_them_id_f_ix7ez;
+
+
+
+ALTER TABLE workspace_themes RENAME TO pw_workspace_themes ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspace_workspace_map.sql

@@ -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
+--
+-- $Id: ren_table_workspace_workspace_map.sql pboy $
+
+ALTER TABLE workspace_workspace_map
+  DROP CONSTRAINT work_wor_map_ref_wor_i_p_bidbq;
+
+
+
+ALTER TABLE workspace_workspace_map RENAME TO pw_workspace_workspace_map ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspaces.sql

@@ -0,0 +1,29 @@
+--
+-- 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: ren_table_workspaces.sql pboy $
+
+ALTER TABLE workspaces  drop constraint  workspace_workspace_id_p_vm9z2 CASCADE;
+ALTER TABLE workspaces  drop constraint  workspac_defau_layo_id_f_xvb7g;
+ALTER TABLE workspaces  drop constraint  workspace_workspace_id_f_dted3;
+ALTER TABLE workspaces  drop constraint  workspaces_owner_id_f_mbbra;
+ALTER TABLE workspaces  drop constraint  workspaces_party_id_f_jotdd;
+ALTER TABLE workspaces  drop constraint  workspaces_theme_id_f_tpdju;
+
+
+ALTER TABLE workspaces RENAME TO pw_workspaces ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/default/6.6.0-6.6.1/ren_table_workspaces_1.sql

@@ -0,0 +1,27 @@
+--
+-- 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_table_workspaces.sql pboy $
+
+ALTER TABLE workspaces  drop constraint  workspace_workspace_id_p_vm9z2 CASCADE;
+ALTER TABLE workspaces  drop constraint  workspac_defau_layo_id_f_xvb7g;
+ALTER TABLE workspaces  drop constraint  workspace_workspace_id_f_dted3;
+ALTER TABLE workspaces  drop constraint  workspaces_owner_id_f_mbbra;
+ALTER TABLE workspaces  drop constraint  workspaces_party_id_f_jotdd;
+ALTER TABLE workspaces  drop constraint  workspaces_theme_id_f_tpdju;
+
+
+ALTER TABLE workspaces RENAME TO pw_workspaces ;
+

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/oracle-se-6.3.0-6.3.1.sql

@@ -0,0 +1,3 @@
+@@ ../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-portalworkspace/upgrade/oracle-se-6.6.0-6.6.1.sql

@@ -0,0 +1,29 @@
+--
+-- 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/03/27 23:15:09 $
+-- $Id: oracle-se-6.6.0-6.6.1  pboy $
+
+@@ default/6.6.0-6.6.1/ren_table_workspaces.sql
+@@ default/6.6.0-6.6.1/ren_table_workspace_pages.sql
+@@ default/6.6.0-6.6.1/ren_table_workspace_page_layouts.sql
+@@ default/6.6.0-6.6.1/ren_table_workspace_workspace_map.sql
+@@ default/6.6.0-6.6.1/ren_table_workspace_themes.sql
+@@ default/6.6.0-6.6.1/ren_table_themeapplications.sql
+
+
+@@ default/6.6.0-6.6.1/add_constraints.sql

ccm-portalworkspace/sql/ccm-portalworkspace/upgrade/postgres-6.6.0-6.6.1.sql

@@ -0,0 +1,33 @@
+--
+-- 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: 2010/11/10 23:15:09 $
+
+\echo Red Hat Enterprise ccm-portalworkspace 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i default/6.6.0-6.6.1/ren_table_workspaces.sql
+\i default/6.6.0-6.6.1/ren_table_workspace_pages.sql
+\i default/6.6.0-6.6.1/ren_table_workspace_page_layouts.sql
+\i default/6.6.0-6.6.1/ren_table_workspace_workspace_map.sql
+\i default/6.6.0-6.6.1/ren_table_workspace_themes.sql
+\i default/6.6.0-6.6.1/ren_table_themeapplications.sql
+
+\i default/6.6.0-6.6.1/add_constraints.sql
+
+commit;