From 5353924e2b44de3652474dc8a85622cd3a40e588 Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 3 Apr 2011 13:55:03 +0000 Subject: [PATCH] =?UTF-8?q?ccm-ldn-portal=20nach=20ccm-portalworkspace=20v?= =?UTF-8?q?erschoben=20und=20so=20ge=C3=A4ndert,=20dass=20es=20gleichzeiti?= =?UTF-8?q?g=20mit=20ccm-portalserver=20installiert=20werden=20kann.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update scrippt (ccm-portalserver 6.6.0 -> 6.6.1) erforderlich. Das Standard APLAWS Theme wird im Moment nicht genutzt, sondern das ursprüngliche Red Hat / CCM Theme. Damit werden Funktionen sichtbar, die das APLAWS Theme nicht nutzt. git-svn-id: https://svn.libreccm.org/ccm/trunk@818 8810af33-2d31-482b-a856-94f89814c4df --- .../bundles/devel/cfg/applications.cfg | 12 +- .../src/com/arsdigita/aplaws/Loader.java | 4 +- .../ui/CategoryPortalSelectionModel.java | 4 +- .../ui/HomepagePortalSelectionModel.java | 4 +- .../aplaws/ui/HomepageWorkspace.java | 6 +- .../ui/HomepageWorkspaceSelectionModel.java | 6 +- .../london/portal/WorkspaceTheme.pdl | 35 --- .../default/index-workspaces_party_id_idx.sql | 1 - ccm-ldn-portal/src/ccm-ldn-portal.config | 5 - .../london/portal/Loader_parameter.properties | 15 -- .../portal/StatefulPersistentPortal.java | 189 ---------------- .../WorkspaceConfig_parameter.properties | 39 ---- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../.settings/org.eclipse.jdt.ui.prefs | 0 .../.svnignore | 0 .../application.xml | 11 +- .../doc/bebop.xsd | 0 .../doc/portal.xsd | 0 .../arsdigita/portalworkspace}/PageLayout.pdl | 10 +- .../arsdigita/portalworkspace}/Portal.ora.pdl | 2 +- .../arsdigita/portalworkspace}/Portal.pg.pdl | 2 +- .../Workspace-extra-queries.pdl | 8 +- .../arsdigita/portalworkspace}/Workspace.pdl | 28 +-- .../portalworkspace}/WorkspacePage.pdl | 12 +- .../portalworkspace/WorkspaceTheme.pdl | 35 +++ .../portlet/ApplicationDirectoryPortlet.pdl | 2 +- .../portlet/ContentDirectoryPortlet.pdl | 2 +- .../portalworkspace}/portlet/FlashPortlet.pdl | 2 +- .../portlet/FreeformHTMLPortlet.pdl | 2 +- .../portalworkspace}/portlet/LoginPortlet.pdl | 2 +- .../portlet/MyWorkspacesPortlet.pdl | 6 +- .../portlet/RSSFeedPortlet.pdl | 2 +- .../portlet/TimeOfDayPortlet.pdl | 2 +- .../portlet/WorkspaceNavigatorPortlet.pdl | 2 +- .../portlet/WorkspaceSummaryPortlet.pdl | 2 +- .../default/upgrade/add-flash-portlet.sql | 0 .../add-navigation-directory-portlet.sql | 0 .../default/upgrade/add-workspace-pages.sql | 0 .../default/upgrade/content-directory.sql | 0 .../default/upgrade/fix-perm-context.sql | 0 .../oracle-se/portal-upgrade-1.sql | 0 .../oracle-se/portal-upgrade-2.sql | 0 .../oracle-se/portlet-upgrade-1.sql | 0 .../oracle-se/upgrade/add-workspace-owner.sql | 0 .../oracle-se/upgrade/add-workspace-pages.sql | 0 .../upgrade/add-workspace-themes.sql | 0 .../upgrade/add-workspace_workspace_map.sql | 0 .../oracle-se/upgrade/freeform-use-clob.sql | 0 .../postgres/upgrade/add-workspace-owner.sql | 0 .../postgres/upgrade/add-workspace-themes.sql | 0 .../upgrade/add-workspace_workspace_map.sql | 0 .../postgres/upgrade/freeform-use-clob.sql | 0 .../upgrade/oracle-se-1.4.1-1.4.2.sql | 0 .../upgrade/oracle-se-6.3.0-6.3.1.sql | 0 .../upgrade/oracle-se-6.3.1-6.3.2.sql | 0 .../upgrade/oracle-se-6.5.1-6.5.2.sql | 0 .../upgrade/oracle-se-6.5.2-6.5.3.sql | 0 .../upgrade/postgres-1.4.1-1.4.2.sql | 0 .../upgrade/postgres-6.3.0-6.3.1.sql | 0 .../upgrade/postgres-6.3.1-6.3.2.sql | 0 .../upgrade/postgres-6.5.1-6.5.2.sql | 0 .../upgrade/postgres-6.5.2-6.5.3.sql | 0 .../default/index-workspaces_party_id_idx.sql | 1 + .../default/insert-default-layout.sql | 10 +- .../default/table-portlet_content_item.sql | 0 .../ccm-portalworkspace}/oracle-se-create.sql | 0 .../oracle-se/insert-page-layouts.sql | 10 +- .../ccm-portalworkspace}/postgres-create.sql | 0 .../resources/portalworkspace-adapters.xml | 12 +- .../src/ccm-portalworkspace.config | 5 + .../src/ccm-portalworkspace.load | 13 +- .../src/ccm-portalworkspace.upgrade | 3 + .../portalworkspace}/Initializer.java | 58 ++--- .../arsdigita/portalworkspace}/Loader.java | 64 ++++-- .../Loader_parameter.properties | 15 ++ .../portalworkspace}/PageLayout.java | 5 +- .../StatefulPersistentPortal.java | 202 ++++++++++++++++++ .../StatefulPersistentPortalModelBuilder.java | 61 +++--- .../portalworkspace}/StatefulPortlet.java | 56 ++--- .../StatefulPortletRenderer.java | 21 +- .../StatefulPortletRendererFactory.java | 13 +- .../arsdigita/portalworkspace}/Workspace.java | 32 +-- .../portalworkspace}/WorkspaceCollection.java | 2 +- .../portalworkspace}/WorkspaceConfig.java | 20 +- .../WorkspaceConfig_parameter.properties | 39 ++++ .../portalworkspace}/WorkspacePage.java | 8 +- .../WorkspacePageCollection.java | 2 +- .../WorkspaceResources.properties | 0 .../WorkspaceResources_de.properties | 0 .../WorkspaceResources_en.properties | 0 .../WorkspaceResources_fr.properties | 0 .../arsdigita/portalworkspace}/package.html | 0 .../portlet/ApplicationDirectoryPortlet.java | 8 +- .../portlet/ContentDirectoryPortlet.java | 8 +- .../portlet/FlashPortlet.java | 8 +- .../portlet/FlashPortletInitializer.java | 7 +- .../portlet/FreeformHTMLPortlet.java | 8 +- .../portlet/LoginPortlet.java | 8 +- .../portlet/MyWorkspacesPortlet.java | 16 +- .../portlet/RSSFeedPortlet.java | 9 +- .../portlet/RSSFeedPortletHelper.java | 2 +- .../portlet/TimeOfDayPortlet.java | 9 +- .../portlet/WorkspaceNavigatorPortlet.java | 14 +- .../portlet/WorkspaceSummaryPortlet.java | 29 +-- .../ui/AbstractWorkspaceComponent.java | 4 +- .../ui/ApplicationPortlet.java | 2 +- .../ui/ApplicationSelector.java | 5 +- .../portalworkspace}/ui/ColorPicker.java | 2 +- .../ui/DefaultPortalSelectionModel.java | 8 +- .../portalworkspace}/ui/DefaultWorkspace.java | 8 +- .../ui/DefaultWorkspaceSelectionModel.java | 4 +- .../arsdigita/portalworkspace}/ui/Icons.java | 2 +- .../portalworkspace}/ui/LayoutForm.java | 8 +- .../portalworkspace}/ui/PackageWorkspace.java | 4 +- .../ui/PackageWorkspaceSelectionModel.java | 4 +- .../ui/ParticipantBrowsePane.java | 6 +- .../ui/ParticipantDisplay.java | 6 +- .../portalworkspace}/ui/ParticipantEdit.java | 8 +- .../ui/ParticipantListModel.java | 4 +- .../portalworkspace}/ui/ParticipantModel.java | 6 +- .../portalworkspace}/ui/PersistentPortal.java | 10 +- .../ui/PersonalPortalPage.java | 6 +- .../portalworkspace}/ui/PortalConstants.java | 2 +- .../portalworkspace}/ui/PortalEditForm.java | 6 +- .../ui/PortalEditModelBuilder.java | 4 +- .../portalworkspace}/ui/PortalHelper.java | 2 +- .../portalworkspace}/ui/PortalList.java | 8 +- .../portalworkspace}/ui/PortalListEditor.java | 6 +- .../portalworkspace}/ui/PortalListViewer.java | 4 +- .../ui/PortalSelectionModel.java | 4 +- .../ui/PortalViewModelBuilder.java | 4 +- ...ortletConfigFormSection.java.nolongerInUse | 0 .../ui/PortletSelectionModel.java | 2 +- .../portalworkspace}/ui/PortletTypeForm.java | 4 +- .../ui/PortletTypeSelectionModel.java | 2 +- .../portalworkspace}/ui/SimplePortlet.java | 2 +- .../portalworkspace}/ui/UserWorkspace.java | 2 +- .../ui/UserWorkspaceSelectionModel.java | 4 +- .../ui/WorkspaceComponent.java | 6 +- .../portalworkspace}/ui/WorkspaceDetails.java | 4 +- .../portalworkspace}/ui/WorkspaceEditor.java | 8 +- .../ui/WorkspaceSelectionModel.java | 4 +- .../portalworkspace}/ui/WorkspaceTheme.java | 6 +- .../ui/WorkspaceThemeCollection.java | 3 +- .../portalworkspace}/ui/WorkspaceThemes.java | 2 +- .../portalworkspace}/ui/WorkspaceViewer.java | 2 +- .../ui/admin/AddGrantForm.java | 4 +- .../portalworkspace}/ui/admin/AdminPane.java | 6 +- .../ui/admin/ApplicationDetails.java | 4 +- .../ui/admin/ApplicationList.java | 4 +- .../ui/admin/ApplicationPane.java | 4 +- .../ui/admin/ApplicationSelectionModel.java | 2 +- .../ui/admin/CategoryComponent.java | 6 +- .../ui/admin/CategoryTable.java | 4 +- .../ui/admin/DeleteApplicationComponent.java | 6 +- .../ui/admin/ErrorMessageDisplay.java | 2 +- .../portalworkspace}/ui/admin/Grant.java | 2 +- .../ui/admin/GrantsTable.java | 6 +- .../ui/admin/GroupMemberDisplay.java | 2 +- .../ui/admin/GroupMemberPicker.java | 2 +- .../ui/admin/NewApplicationForm.java | 4 +- .../ui/admin/PartyPermissionEdit.java | 6 +- .../portalworkspace}/ui/admin/PeoplePane.java | 10 +- .../ui/admin/PrivilegeSingleSelect.java | 2 +- .../ui/admin/SiteMapPane.java | 4 +- .../ui/admin/WorkspaceConfigFormSection.java | 6 +- .../ui/admin/WorkspacePermissionsPane.java | 2 +- .../ApplicationDirectoryPortletRenderer.java | 6 +- .../ContentDirectoryPortletEditor.java | 4 +- .../ContentDirectoryPortletRenderer.java | 6 +- .../ui/portlet/FlashPortletEditor.java | 4 +- .../ui/portlet/FlashPortletRenderer.java | 6 +- .../ui/portlet/FreeformHTMLPortletEditor.java | 6 +- .../portlet/FreeformHTMLPortletRenderer.java | 6 +- .../ui/portlet/LoginPortletRenderer.java | 6 +- .../ui/portlet/RSSFeedPortletBrowserForm.java | 4 +- .../ui/portlet/RSSFeedPortletEditor.java | 2 +- .../ui/portlet/RSSFeedPortletEditorForm.java | 4 +- .../ui/portlet/RSSFeedPortletRenderer.java | 8 +- .../ui/portlet/TimeOfDayPortletRenderer.java | 6 +- .../upgrade/CreateContainerGroups.java | 6 +- .../upgrade/CreateFlashPortlet.java | 6 +- .../CreateNavigationDirectoryPortlet.java | 2 +- .../util/GlobalizationUtil.java | 5 +- .../web/WEB-INF/web.ccm-portalworkspace.xml | 16 +- .../apps/portalworkspace}/xsl/admin.xsl | 2 +- .../apps/portalworkspace}/xsl/edit.xsl | 2 +- .../apps/portalworkspace}/xsl/index.xsl | 2 +- .../fckeditor/config/fckconfig_portlet.js | 0 .../assets/swfobject15/expressinstall.html | 0 .../web/assets/swfobject15/expressinstall.swf | Bin .../web/assets/swfobject15/flashversion.html | 0 .../web/assets/swfobject15/fullpage.html | 0 .../web/assets/swfobject15/readme.txt | 0 .../web/assets/swfobject15/so_tester.swf | Bin .../expressinstall/ExpressInstall.as | 0 .../swfobject15/source/expressinstall.fla | Bin .../assets/swfobject15/source/so_tester.fla | Bin .../swfobject15/source/swfobject_source.js | 0 .../web/assets/swfobject15/swfobject.html | 0 .../web/assets/swfobject15/swfobject.js | 0 .../www/assets/CheckEmpty16.gif | Bin .../www/assets/CheckFull16.gif | Bin .../portalworkspace}/www/assets/Group16.gif | Bin .../www/assets/RadioEmpty16.gif | Bin .../www/assets/RadioFull16.gif | Bin .../portalworkspace}/www/assets/User16.gif | Bin .../portalworkspace}/www/assets/delete.gif | Bin .../portalworkspace}/www/assets/down.gif | Bin .../portalworkspace}/www/assets/left.gif | Bin .../portalworkspace}/www/assets/right.gif | Bin .../portalworkspace}/www/assets/up.gif | Bin .../packages/portalworkspace}/xsl/admin.xsl | 0 .../xsl/application-directory-portlet.xsl | 0 .../xsl/content-directory-portlet.xsl | 0 .../xsl/content-item-portlet.xsl | 0 .../xsl/content-sections-portlet.xsl | 0 .../portalworkspace}/xsl/customize.gif | Bin .../packages/portalworkspace}/xsl/delete.gif | Bin .../packages/portalworkspace}/xsl/display.gif | Bin .../portalworkspace}/xsl/flash-portlet.xsl | 0 .../xsl/freeform-html-portlet.xsl | 0 .../web/packages/portalworkspace}/xsl/lib.xsl | 0 .../portalworkspace}/xsl/login-portlet.xsl | 0 .../portalworkspace}/xsl/moveDown.gif | Bin .../portalworkspace}/xsl/moveLeft.gif | Bin .../portalworkspace}/xsl/moveRight.gif | Bin .../packages/portalworkspace}/xsl/moveUp.gif | Bin .../packages/portalworkspace}/xsl/portal.xsl | 0 .../portalworkspace}/xsl/portlets.xsl | 0 .../portalworkspace}/xsl/rss-feed-portlet.xsl | 0 .../portalworkspace}/xsl/tasklist-portlet.xsl | 0 .../xsl/time-of-day-portlet.xsl | 0 .../xsl/workspace-directory-portlet.xsl | 0 .../ccm-portalworkspace}/admin/edit.jsp | 4 +- .../ccm-portalworkspace}/admin/index.jsp | 2 +- .../ccm-portalworkspace}/admin/sitemap.jsp | 2 +- .../templates/ccm-portalworkspace}/edit.jsp | 6 +- .../templates/ccm-portalworkspace}/index.jsp | 8 +- .../ccm-portalworkspace}/workspaces.jsp | 4 +- ccm-zes-aplaws/application.xml | 2 +- .../bundles/devel/cfg/applications.cfg | 2 +- .../bundles/standard/cfg/applications.cfg | 2 +- ccm-zes-aplaws/bundles/standard/cfg/web.xml | 8 +- ccm-zes-aplaws/src/ccm-zes-aplaws.load | 2 +- .../src/com/arsdigita/aplaws/Loader.java | 4 +- .../ui/CategoryPortalSelectionModel.java | 4 +- .../ui/HomepagePortalSelectionModel.java | 4 +- .../aplaws/ui/HomepageWorkspace.java | 6 +- .../ui/HomepageWorkspaceSelectionModel.java | 6 +- ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws | 8 +- .../static/aplaws-generic/workspace-admin.xsl | 2 +- .../static/aplaws-generic/workspace-index.xsl | 33 ++- 255 files changed, 925 insertions(+), 799 deletions(-) delete mode 100755 ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspaceTheme.pdl delete mode 100755 ccm-ldn-portal/sql/ccm-ldn-portal/default/index-workspaces_party_id_idx.sql delete mode 100755 ccm-ldn-portal/src/ccm-ldn-portal.config delete mode 100755 ccm-ldn-portal/src/com/arsdigita/london/portal/Loader_parameter.properties delete mode 100755 ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPersistentPortal.java delete mode 100755 ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties rename {ccm-ldn-portal => ccm-portalworkspace}/.classpath (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/.project (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/.settings/org.eclipse.jdt.core.prefs (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/.settings/org.eclipse.jdt.ui.prefs (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/.svnignore (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/application.xml (69%) rename {ccm-ldn-portal => ccm-portalworkspace}/doc/bebop.xsd (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/doc/portal.xsd (100%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/PageLayout.pdl (71%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/Portal.ora.pdl (84%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/Portal.pg.pdl (84%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/Workspace-extra-queries.pdl (87%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/Workspace.pdl (72%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/WorkspacePage.pdl (73%) create mode 100755 ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspaceTheme.pdl rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/ApplicationDirectoryPortlet.pdl (93%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/ContentDirectoryPortlet.pdl (96%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/FlashPortlet.pdl (97%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/FreeformHTMLPortlet.pdl (94%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/LoginPortlet.pdl (93%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/MyWorkspacesPortlet.pdl (92%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/RSSFeedPortlet.pdl (94%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/TimeOfDayPortlet.pdl (93%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/WorkspaceNavigatorPortlet.pdl (68%) rename {ccm-ldn-portal/pdl/com/arsdigita/london/portal => ccm-portalworkspace/pdl/com/arsdigita/portalworkspace}/portlet/WorkspaceSummaryPortlet.pdl (67%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/default/upgrade/add-flash-portlet.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/default/upgrade/add-navigation-directory-portlet.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/default/upgrade/add-workspace-pages.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/default/upgrade/content-directory.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/default/upgrade/fix-perm-context.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/portal-upgrade-1.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/portal-upgrade-2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/portlet-upgrade-1.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/upgrade/add-workspace-owner.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/upgrade/add-workspace-pages.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/upgrade/add-workspace-themes.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/upgrade/add-workspace_workspace_map.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/oracle-se/upgrade/freeform-use-clob.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/postgres/upgrade/add-workspace-owner.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/postgres/upgrade/add-workspace-themes.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/postgres/upgrade/add-workspace_workspace_map.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/postgres/upgrade/freeform-use-clob.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/oracle-se-1.4.1-1.4.2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/oracle-se-6.3.0-6.3.1.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/oracle-se-6.3.1-6.3.2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/oracle-se-6.5.1-6.5.2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/oracle-se-6.5.2-6.5.3.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/postgres-1.4.1-1.4.2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/postgres-6.3.0-6.3.1.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/postgres-6.3.1-6.3.2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/postgres-6.5.1-6.5.2.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-ldn-portal-2}/upgrade/postgres-6.5.2-6.5.3.sql (100%) create mode 100755 ccm-portalworkspace/sql/ccm-portalworkspace/default/index-workspaces_party_id_idx.sql rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-portalworkspace}/default/insert-default-layout.sql (54%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-portalworkspace}/default/table-portlet_content_item.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-portalworkspace}/oracle-se-create.sql (100%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-portalworkspace}/oracle-se/insert-page-layouts.sql (53%) rename {ccm-ldn-portal/sql/ccm-ldn-portal => ccm-portalworkspace/sql/ccm-portalworkspace}/postgres-create.sql (100%) rename ccm-ldn-portal/src/WEB-INF/resources/portal-adapters.xml => ccm-portalworkspace/src/WEB-INF/resources/portalworkspace-adapters.xml (77%) create mode 100755 ccm-portalworkspace/src/ccm-portalworkspace.config rename ccm-ldn-portal/src/ccm-ldn-portal.load => ccm-portalworkspace/src/ccm-portalworkspace.load (55%) rename ccm-ldn-portal/src/ccm-ldn-portal.upgrade => ccm-portalworkspace/src/ccm-portalworkspace.upgrade (87%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/Initializer.java (87%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/Loader.java (76%) create mode 100755 ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader_parameter.properties rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/PageLayout.java (95%) create mode 100755 ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortal.java rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/StatefulPersistentPortalModelBuilder.java (66%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/StatefulPortlet.java (74%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/StatefulPortletRenderer.java (74%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/StatefulPortletRendererFactory.java (68%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/Workspace.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/WorkspaceCollection.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/WorkspaceConfig.java (89%) create mode 100755 ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig_parameter.properties rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/WorkspacePage.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/WorkspacePageCollection.java (95%) rename ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources.properties => ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties (100%) rename ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_de.properties => ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties (100%) rename ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_en.properties => ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties (100%) rename ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_fr.properties => ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties (100%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/package.html (100%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/ApplicationDirectoryPortlet.java (84%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/ContentDirectoryPortlet.java (91%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/FlashPortlet.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/FlashPortletInitializer.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/FreeformHTMLPortlet.java (85%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/LoginPortlet.java (85%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/MyWorkspacesPortlet.java (93%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/RSSFeedPortlet.java (82%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/RSSFeedPortletHelper.java (99%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/TimeOfDayPortlet.java (79%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/WorkspaceNavigatorPortlet.java (90%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/portlet/WorkspaceSummaryPortlet.java (83%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/AbstractWorkspaceComponent.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ApplicationPortlet.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ApplicationSelector.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ColorPicker.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/DefaultPortalSelectionModel.java (92%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/DefaultWorkspace.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/DefaultWorkspaceSelectionModel.java (92%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/Icons.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/LayoutForm.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PackageWorkspace.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PackageWorkspaceSelectionModel.java (90%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ParticipantBrowsePane.java (99%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ParticipantDisplay.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ParticipantEdit.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ParticipantListModel.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/ParticipantModel.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PersistentPortal.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PersonalPortalPage.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalConstants.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalEditForm.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalEditModelBuilder.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalHelper.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalList.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalListEditor.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalListViewer.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalSelectionModel.java (89%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortalViewModelBuilder.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortletConfigFormSection.java.nolongerInUse (100%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortletSelectionModel.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortletTypeForm.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/PortletTypeSelectionModel.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/SimplePortlet.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/UserWorkspace.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/UserWorkspaceSelectionModel.java (93%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceComponent.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceDetails.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceEditor.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceSelectionModel.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceTheme.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceThemeCollection.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceThemes.java (86%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/WorkspaceViewer.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/AddGrantForm.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/AdminPane.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/ApplicationDetails.java (94%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/ApplicationList.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/ApplicationPane.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/ApplicationSelectionModel.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/CategoryComponent.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/CategoryTable.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/DeleteApplicationComponent.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/ErrorMessageDisplay.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/Grant.java (99%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/GrantsTable.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/GroupMemberDisplay.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/GroupMemberPicker.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/NewApplicationForm.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/PartyPermissionEdit.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/PeoplePane.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/PrivilegeSingleSelect.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/SiteMapPane.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/WorkspaceConfigFormSection.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/admin/WorkspacePermissionsPane.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/ApplicationDirectoryPortletRenderer.java (92%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/ContentDirectoryPortletEditor.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/ContentDirectoryPortletRenderer.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/FlashPortletEditor.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/FlashPortletRenderer.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/FreeformHTMLPortletEditor.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/FreeformHTMLPortletRenderer.java (86%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/LoginPortletRenderer.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/RSSFeedPortletBrowserForm.java (97%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/RSSFeedPortletEditor.java (98%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/RSSFeedPortletEditorForm.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/RSSFeedPortletRenderer.java (85%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/ui/portlet/TimeOfDayPortletRenderer.java (86%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/upgrade/CreateContainerGroups.java (96%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/upgrade/CreateFlashPortlet.java (91%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/upgrade/CreateNavigationDirectoryPortlet.java (95%) rename {ccm-ldn-portal/src/com/arsdigita/london/portal => ccm-portalworkspace/src/com/arsdigita/portalworkspace}/util/GlobalizationUtil.java (72%) rename ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml => ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml (64%) rename {ccm-ldn-portal/web/__ccm__/apps/workspace => ccm-portalworkspace/web/__ccm__/apps/portalworkspace}/xsl/admin.xsl (76%) rename {ccm-ldn-portal/web/__ccm__/apps/workspace => ccm-portalworkspace/web/__ccm__/apps/portalworkspace}/xsl/edit.xsl (81%) rename {ccm-ldn-portal/web/__ccm__/apps/workspace => ccm-portalworkspace/web/__ccm__/apps/portalworkspace}/xsl/index.xsl (82%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/fckeditor/config/fckconfig_portlet.js (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/expressinstall.html (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/expressinstall.swf (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/flashversion.html (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/fullpage.html (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/readme.txt (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/so_tester.swf (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/source/com/deconcept/expressinstall/ExpressInstall.as (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/source/expressinstall.fla (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/source/so_tester.fla (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/source/swfobject_source.js (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/swfobject.html (100%) rename {ccm-ldn-portal => ccm-portalworkspace}/web/assets/swfobject15/swfobject.js (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/CheckEmpty16.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/CheckFull16.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/Group16.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/RadioEmpty16.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/RadioFull16.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/User16.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/delete.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/down.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/left.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/right.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/www/assets/up.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/admin.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/application-directory-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/content-directory-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/content-item-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/content-sections-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/customize.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/delete.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/display.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/flash-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/freeform-html-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/lib.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/login-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/moveDown.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/moveLeft.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/moveRight.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/moveUp.gif (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/portal.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/portlets.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/rss-feed-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/tasklist-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/time-of-day-portlet.xsl (100%) rename {ccm-ldn-portal/web/packages/workspace => ccm-portalworkspace/web/packages/portalworkspace}/xsl/workspace-directory-portlet.xsl (100%) rename {ccm-ldn-portal/web/templates/ccm-ldn-portal => ccm-portalworkspace/web/templates/ccm-portalworkspace}/admin/edit.jsp (83%) rename {ccm-ldn-portal/web/templates/ccm-ldn-portal => ccm-portalworkspace/web/templates/ccm-portalworkspace}/admin/index.jsp (87%) rename {ccm-ldn-portal/web/templates/ccm-ldn-portal => ccm-portalworkspace/web/templates/ccm-portalworkspace}/admin/sitemap.jsp (87%) rename {ccm-ldn-portal/web/templates/ccm-ldn-portal => ccm-portalworkspace/web/templates/ccm-portalworkspace}/edit.jsp (67%) rename {ccm-ldn-portal/web/templates/ccm-ldn-portal => ccm-portalworkspace/web/templates/ccm-portalworkspace}/index.jsp (76%) rename {ccm-ldn-portal/web/templates/ccm-ldn-portal => ccm-portalworkspace/web/templates/ccm-portalworkspace}/workspaces.jsp (78%) diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg index f38cb3385..7df71435d 100755 --- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg +++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg @@ -5,7 +5,7 @@ ccm-cms # Content assets ccm-cms-assets-fileattachment -ccm-cms-assets-imagestep +# ccm-cms-assets-imagestep ccm-cms-assets-notes ccm-cms-assets-relatedlink # is ccm-ldn-dublin really an asset? @@ -33,7 +33,7 @@ ccm-cms-types-member ccm-cms-types-mparticle ccm-cms-types-newsitem # -- ccm-cms-types-organization -ccm-cms-types-person +# ccm-cms-types-person # -- ccm-cms-types-pressrelease # -- ccm-cms-types-researchnetwork # -- ccm-cms-types-service @@ -48,9 +48,9 @@ ccm-cms-types-person # -- ccm-docmngr ## temp., produces errors in build # -- ccm-formbuilder-pdf ccm-forum -ccm-forum-categorised +# ccm-forum-categorised # -- ccm-simplesurvey -ccm-themedirector +# ccm-themedirector ccm-user-preferences # -- ccm-weblog # -- ccm-webpage @@ -63,9 +63,9 @@ ccm-user-preferences # -- ccm-ldn-exporter # -- ccm-ldn-freeform # -- ccm-ldn-importer -ccm-ldn-navigation +# ccm-ldn-navigation ccm-ldn-portal -ccm-ldn-rss +# ccm-ldn-rss ccm-ldn-search ccm-ldn-shortcuts ccm-ldn-subsite diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java index 827a88f7d..0c0003463 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -21,8 +21,8 @@ package com.arsdigita.aplaws; import com.arsdigita.london.navigation.Template; import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.importer.Parser; -import com.arsdigita.london.portal.PageLayout; -import com.arsdigita.london.portal.Workspace; +import com.arsdigita.portalworkspace.PageLayout; +import com.arsdigita.portalworkspace.Workspace; import com.arsdigita.categorization.Category; import com.arsdigita.categorization.RootCategoryCollection; diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java index df6e2aec4..5aecfcebe 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java @@ -30,8 +30,8 @@ import com.arsdigita.categorization.Category; import com.arsdigita.util.Assert; import com.arsdigita.bebop.PageState; -import com.arsdigita.london.portal.Workspace; -import com.arsdigita.london.portal.ui.WorkspaceSelectionModel; +import com.arsdigita.portalworkspace.Workspace; +import com.arsdigita.portalworkspace.ui.WorkspaceSelectionModel; public class CategoryPortalSelectionModel extends WorkspaceSelectionModel { diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java index d154948d7..65c0b2dab 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java @@ -16,8 +16,8 @@ package com.arsdigita.aplaws.ui; import com.arsdigita.bebop.AbstractSingleSelectionModel; -import com.arsdigita.london.portal.ui.PortalSelectionModel; -import com.arsdigita.london.portal.WorkspacePage; +import com.arsdigita.portalworkspace.ui.PortalSelectionModel; +import com.arsdigita.portalworkspace.WorkspacePage; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.domain.DomainObject; diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java index 7d8997669..01b6059ad 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java @@ -20,11 +20,11 @@ import com.arsdigita.bebop.ActionLink; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; -import com.arsdigita.london.portal.ui.PersistentPortal; -import com.arsdigita.london.portal.Workspace; +import com.arsdigita.portalworkspace.ui.PersistentPortal; +import com.arsdigita.portalworkspace.Workspace; import com.arsdigita.bebop.PageState; import com.arsdigita.xml.Element; -import com.arsdigita.london.portal.ui.PortalConstants; +import com.arsdigita.portalworkspace.ui.PortalConstants; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java index d1a8bcdb7..fc6fc5d57 100755 --- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java +++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java @@ -27,9 +27,9 @@ import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PrivilegeDescriptor; -import com.arsdigita.london.portal.Workspace; -import com.arsdigita.london.portal.WorkspacePage; -import com.arsdigita.london.portal.WorkspacePageCollection; +import com.arsdigita.portalworkspace.Workspace; +import com.arsdigita.portalworkspace.WorkspacePage; +import com.arsdigita.portalworkspace.WorkspacePageCollection; import com.arsdigita.london.subsite.Subsite; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspaceTheme.pdl b/ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspaceTheme.pdl deleted file mode 100755 index e23fbf6c4..000000000 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspaceTheme.pdl +++ /dev/null @@ -1,35 +0,0 @@ - -model com.arsdigita.london.portal; - -import com.arsdigita.kernel.ACSObject; -import com.arsdigita.web.Application; - -// @author Jim Parsons (jparsons@arsdigita.com) - -object type WorkspaceThemeApplication extends Application { - reference key (themeapplications.theme_app_id); -} - -object type WorkspaceTheme extends ACSObject { - String[0..1] theme_name = workspace_themes.theme_name VARCHAR(4000); - String[0..1] theme_desc = workspace_themes.theme_desc VARCHAR(4000); - String[0..1] ctx_bar_color = workspace_themes.ctx_bar_color VARCHAR(100); - String[0..1] ctx_bar_text_color = workspace_themes.ctx_bar_text_color VARCHAR(100); - String[0..1] active_tab_color = workspace_themes.active_tab_color VARCHAR(100); - String[0..1] active_tab_text_color = workspace_themes.active_tab_text_color VARCHAR(100); - String[0..1] inactive_tab_color = workspace_themes.inactive_tab_color VARCHAR(100); - String[0..1] inactive_tab_text_color = workspace_themes.inactive_tab_text_color VARCHAR(100); - String[0..1] top_rule = workspace_themes.top_rule VARCHAR(100); - String[0..1] bottom_rule = workspace_themes.bottom_rule VARCHAR(100); - String[0..1] portlet_head = workspace_themes.portlet_head VARCHAR(100); - String[0..1] portlet_icon = workspace_themes.portlet_icon VARCHAR(100); - String[0..1] portlet_border_color = workspace_themes.portlet_border_color VARCHAR(100); - String[0..1] portlet_border_style = workspace_themes.portlet_border_style VARCHAR(100); - String[0..1] portlet_header_text_color = workspace_themes.portlet_header_text_color VARCHAR(100); - String[0..1] page_bg_color = workspace_themes.page_bg_color VARCHAR(100); - String[0..1] page_bg_image = workspace_themes.page_bg_image VARCHAR(100); - String[0..1] narrow_bg_color = workspace_themes.narrow_bg_color VARCHAR(100); - String[0..1] body_text_color = workspace_themes.body_text_color VARCHAR(100); - - reference key (workspace_themes.theme_id); -} diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/index-workspaces_party_id_idx.sql b/ccm-ldn-portal/sql/ccm-ldn-portal/default/index-workspaces_party_id_idx.sql deleted file mode 100755 index 8ef52b447..000000000 --- a/ccm-ldn-portal/sql/ccm-ldn-portal/default/index-workspaces_party_id_idx.sql +++ /dev/null @@ -1 +0,0 @@ -create index workspaces_party_id_idx on workspaces(party_id); diff --git a/ccm-ldn-portal/src/ccm-ldn-portal.config b/ccm-ldn-portal/src/ccm-ldn-portal.config deleted file mode 100755 index f79770ddb..000000000 --- a/ccm-ldn-portal/src/ccm-ldn-portal.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/Loader_parameter.properties b/ccm-ldn-portal/src/com/arsdigita/london/portal/Loader_parameter.properties deleted file mode 100755 index ab47342cb..000000000 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/Loader_parameter.properties +++ /dev/null @@ -1,15 +0,0 @@ -com.arsdigita.london.portal.default_url.title=Portal URL -com.arsdigita.london.portal.default_url.purpose=The URL on which to mount the portal workspace -com.arsdigita.london.portal.default_url.example=/portal/ -com.arsdigita.london.portal.default_url.format=[url] - -com.arsdigita.london.portal.default_title.title=Portal Worksapce Title -com.arsdigita.london.portal.default_title.purpose=The title of the portal workspace -com.arsdigita.london.portal.default_title.example=Portal Homepage -com.arsdigita.london.portal.default_title.format=[string] - -com.arsdigita.london.portal.default_is_public.title=Is the portal workspace public? -com.arsdigita.london.portal.default_is_public.purpose=Indicate whether or not the Portal Workspace is available to the public -com.arsdigita.london.portal.default_is_public.example=true -com.arsdigita.london.portal.default_is_public.format=true|false - diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPersistentPortal.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPersistentPortal.java deleted file mode 100755 index 89bae595b..000000000 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPersistentPortal.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved. - * - * The contents of this file are subject to the ArsDigita Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.arsdigita.com/ADPL.txt - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - */ - -package com.arsdigita.london.portal; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.log4j.Logger; - -import com.arsdigita.bebop.PageState; -import com.arsdigita.bebop.ParameterSingleSelectionModel; -import com.arsdigita.bebop.SimpleContainer; -import com.arsdigita.bebop.SingleSelectionModel; -import com.arsdigita.bebop.parameters.IntegerParameter; -import com.arsdigita.bebop.portal.Portal; -import com.arsdigita.bebop.portal.PortalModel; -import com.arsdigita.bebop.portal.PortalModelBuilder; -import com.arsdigita.bebop.portal.PortletRenderer; -import com.arsdigita.london.portal.ui.PortalConstants; -import com.arsdigita.london.portal.ui.PortalSelectionModel; -import com.arsdigita.london.portal.ui.PortletSelectionModel; -import com.arsdigita.london.portal.ui.PortletTypeSelectionModel; -import com.arsdigita.london.portal.ui.WorkspaceSelectionModel; -import com.arsdigita.persistence.DataQuery; -import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.portal.Portlet; -import com.arsdigita.portal.PortletType; -import com.arsdigita.portal.PortletTypeCollection; -import com.arsdigita.xml.Element; -/** - * - * @author cgyg9330 <chris.gilbert@westsussex.gov.uk> - * @version $Id: StatefulPersistentPortal.java 1271 2006-07-18 13:36:43Z cgyg9330 $ - * - * Dynamically render the portlets for the current portal. If any - * portlets are stateful, retrieve a renderer from cache so that the page can - * manage the state of the portlet. - * - * ONLY VALID FOR BROWSE MODE, use com.arsdigita.portal.ui.PersistentPortal for edit mode - * - * - */ -public class StatefulPersistentPortal extends SimpleContainer { - - private static final Logger s_log = - Logger.getLogger(StatefulPersistentPortal.class); - - private WorkspaceSelectionModel m_workspace; - private PortletSelectionModel m_portlet; -private PortalModelBuilder m_portalModelBuilder; -private PortalSelectionModel m_portal; - - - /** - * maps portlet type to list of empty renderers - */ -private static Map m_stateful; - - - - public StatefulPersistentPortal(PortalSelectionModel portal) { - this(portal, "portal"); - } - /** - * Constructor is invoked when the page component hierarchy is recreated. This occurs - * a) when the first person goes to the homepage after a server restart - * b) when someone adds a stateful portlet to one of the homepage portals, which increases the - * maximum number of that portlet type that appears on any portal - * @param portal the portalSelectionModel used by the Dynamic PortalModelBuilder - * @param name - */ - public StatefulPersistentPortal( - PortalSelectionModel portal, - String name) { - s_log.debug("IN constructor" + name ); - m_portal = portal; - setTag("portal:portal"); - setNamespace(PortalConstants.PORTAL_XML_NS); - - // retrieve empty renderers for any stateful portlets and add them to the component hierarchy - PortletTypeCollection types = PortletType.retrieveAllPortletTypes(); - m_stateful = new HashMap(); - - while (types.next()) { - - PortletType type = types.getPortletType(); - s_log.debug("checking portlet type " + type.getDescription()); - String portletObjectType = type.getResourceObjectType(); - StatefulPortletRendererFactory factory = StatefulPortlet.getRendererFactory(portletObjectType); - if (null != factory ) { - DataQuery findMaxInstances = SessionManager.getSession().retrieveQuery("com.arsdigita.london.portal.MaxPortletInstances"); - findMaxInstances.setParameter("portletType", type.getID()); - - int requiredRenderers = 0; - while (findMaxInstances.next()) { - requiredRenderers = ((Integer)findMaxInstances.get("maxCount")).intValue(); - } - s_log.debug("stateful portlet - I am going to instantiate " + requiredRenderers + " renderers"); - List renderers = new ArrayList(); - for (int i = 0; i < requiredRenderers; i++) { - StatefulPortletRenderer renderer = factory.getRenderer(); - renderers.add(renderer); - - // and add it to the page - add(renderer); - s_log.debug("renderer added to page"); - } - m_stateful.put(type.getResourceObjectType(), renderers); - - } - } - m_portalModelBuilder = - new StatefulPersistentPortalModelBuilder(portal, m_stateful); - - } - // copied almost directly from PersistentPortal - public void generateXML(PageState state, - Element parent) { - Element content = generateParent(parent); - - WorkspacePage page = m_portal.getSelectedPortal(state); - content.addAttribute("layout", page.getLayout().getFormat()); - content.addAttribute("title", page.getTitle()); - content.addAttribute("description", page.getDescription()); - - PortalModel pm = m_portalModelBuilder.buildModel(state); - Iterator portlets = pm.getPortletRenderers(); - - while (portlets.hasNext()) { - Object entry = portlets.next(); - if (entry instanceof Object[]) { - PortletRenderer renderer = (PortletRenderer)((Object[])entry)[0]; - BigDecimal portlet = (BigDecimal)((Object[])entry)[1]; - - // We want the root element created by the portlet - // but the crap generateXML signature doesn't let - // us get at it :-( And the bebop portlet isn't - // any more helpful either :-( - Element hack = new Element("hack"); - - renderer.generateXML(state, hack); - - Iterator elements = hack.getChildren().iterator(); - while (elements.hasNext()) { - Element child = (Element)elements.next(); - - content.addContent(child); - } - } else { - - PortletRenderer renderer = (PortletRenderer)entry; - renderer.generateXML(state, content); - } - } - } - - /** - * return the number of renderers for the given portlet type currently registered on the page - * @param portletType - * @return - */ - public static int getCurrentPortletRendererInstances (String portletType) { - int count = 0; - List renderers = (List)m_stateful.get(portletType); - if (renderers != null) { - count = renderers.size(); - } - return count; - } - -} diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties b/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties deleted file mode 100755 index 00606b7cc..000000000 --- a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig_parameter.properties +++ /dev/null @@ -1,39 +0,0 @@ -com.arsdigita.london.portal.traversal_adapters.title=XML renderer rules -com.arsdigita.london.portal.traversal_adapters.purpose=Name of File with rules for configuring information in generated XML -com.arsdigita.london.portal.traversal_adapters.format=[string] -com.arsdigita.london.portal.traversal_adapters.example=/WEB-INF/resources/portal-adapters.xml - -com.arsdigita.london.portal.default_layout.title=Default workspace layout -com.arsdigita.london.portal.default_layout.purpose=Default column layout for workspace portals -com.arsdigita.london.portal.default_layout.format=[layout] -com.arsdigita.london.portal.default_layout.example=25%,25%,25%,25% - -com.arsdigita.london.portal.create_user_workspaces.title=Create user workspaces -com.arsdigita.london.portal.create_user_workspaces.purpose=Whether non-admin users should have their own custom workspaces -com.arsdigita.london.portal.create_user_workspaces.format=[boolean] -com.arsdigita.london.portal.create_user_workspaces.example=false - -com.arsdigita.london.portal.excluded_portlet_types.title=Portlet types not available on this site -com.arsdigita.london.portal.excluded_portlet_types.purpose=Prevent these type appearing in the drop down list of portlets to add to the page -com.arsdigita.london.portal.excluded_portlet_types.format=[string,string,string] -com.arsdigita.london.portal.excluded_portlet_types.example=com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet,com.arsdigita.london.portal.portlet.TimeOfDayPortlet - -com.arsdigita.london.portal.admin_only_portlet_types.title=Portlet types only available to page admin -com.arsdigita.london.portal.admin_only_portlet_types.purpose=Only available to administrator of homepage, or subsite frontpage -com.arsdigita.london.portal.admin_only_portlet_types.format=[string,string,string] -com.arsdigita.london.portal.admin_only_portlet_types.example=com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet,com.arsdigita.london.portal.portlet.TimeOfDayPortlet - -com.arsdigita.london.portal.portlet.freeform_html_editor.title=use wysiwyg editor for freeform html portlet -com.arsdigita.london.portal.portlet.freeform_html_editor.purpose=If true, use editor specified by waf.bebop.dhtml_editor when user edits freeform html portlet -com.arsdigita.london.portal.portlet.freeform_html_editor.format=[boolean] -com.arsdigita.london.portal.portlet.freeform_html_editor.example=false - -com.arsdigita.london.portal.workspacePartyPrivilege.title=Privilege granted to the workspace party -com.arsdigita.london.portal.workspacePartyPrivilege.purpose=Specify which privilege is granted to the workspace party. Should be "read" or "edit". -com.arsdigita.london.portal.workspacePartyPrivilege.format=[string] -com.arsdigita.london.portal.workspacePartyPrivilege.example=edit - -com.arsdigita.london.portal.checkWorkspaceReadPermissions.title=Check READ permissions when viewing Workspaces -com.arsdigita.london.portal.checkWorkspaceReadPermissions.purpose=Specify whether we should check READ permissions when viewing workspaces. By default we don't, which is odd. -com.arsdigita.london.portal.checkWorkspaceReadPermissions.format=[boolean] -com.arsdigita.london.portal.checkWorkspaceReadPermissions.example=false diff --git a/ccm-ldn-portal/.classpath b/ccm-portalworkspace/.classpath similarity index 100% rename from ccm-ldn-portal/.classpath rename to ccm-portalworkspace/.classpath diff --git a/ccm-ldn-portal/.project b/ccm-portalworkspace/.project similarity index 100% rename from ccm-ldn-portal/.project rename to ccm-portalworkspace/.project diff --git a/ccm-ldn-portal/.settings/org.eclipse.jdt.core.prefs b/ccm-portalworkspace/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from ccm-ldn-portal/.settings/org.eclipse.jdt.core.prefs rename to ccm-portalworkspace/.settings/org.eclipse.jdt.core.prefs diff --git a/ccm-ldn-portal/.settings/org.eclipse.jdt.ui.prefs b/ccm-portalworkspace/.settings/org.eclipse.jdt.ui.prefs similarity index 100% rename from ccm-ldn-portal/.settings/org.eclipse.jdt.ui.prefs rename to ccm-portalworkspace/.settings/org.eclipse.jdt.ui.prefs diff --git a/ccm-ldn-portal/.svnignore b/ccm-portalworkspace/.svnignore similarity index 100% rename from ccm-ldn-portal/.svnignore rename to ccm-portalworkspace/.svnignore diff --git a/ccm-ldn-portal/application.xml b/ccm-portalworkspace/application.xml similarity index 69% rename from ccm-ldn-portal/application.xml rename to ccm-portalworkspace/application.xml index ea953d0a8..e150d5f89 100755 --- a/ccm-ldn-portal/application.xml +++ b/ccm-portalworkspace/application.xml @@ -1,19 +1,14 @@ - - - diff --git a/ccm-ldn-portal/doc/bebop.xsd b/ccm-portalworkspace/doc/bebop.xsd similarity index 100% rename from ccm-ldn-portal/doc/bebop.xsd rename to ccm-portalworkspace/doc/bebop.xsd diff --git a/ccm-ldn-portal/doc/portal.xsd b/ccm-portalworkspace/doc/portal.xsd similarity index 100% rename from ccm-ldn-portal/doc/portal.xsd rename to ccm-portalworkspace/doc/portal.xsd diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/PageLayout.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/PageLayout.pdl similarity index 71% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/PageLayout.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/PageLayout.pdl index 516747417..ab6d01558 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/PageLayout.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/PageLayout.pdl @@ -15,15 +15,15 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.portal; +model com.arsdigita.portalworkspace; object type PageLayout { - BigDecimal[1..1] id = workspace_page_layouts.layout_id INTEGER; - String[1..1] title = workspace_page_layouts.title VARCHAR(200); - String[0..1] description = workspace_page_layouts.description VARCHAR(4000); - unique String[1..1] format = workspace_page_layouts.format VARCHAR(50); + BigDecimal[1..1] id = pw_workspace_page_layouts.layout_id INTEGER; + String[1..1] title = pw_workspace_page_layouts.title VARCHAR(200); + String[0..1] description = pw_workspace_page_layouts.description VARCHAR(4000); + unique String[1..1] format = pw_workspace_page_layouts.format VARCHAR(50); object key(id); } diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Portal.ora.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Portal.ora.pdl similarity index 84% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/Portal.ora.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Portal.ora.pdl index 9195d140c..ddcfdeb76 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Portal.ora.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Portal.ora.pdl @@ -1,4 +1,4 @@ -model com.arsdigita.london.portal; +model com.arsdigita.portalworkspace; query MaxPortletInstances { Integer maxCount; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Portal.pg.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Portal.pg.pdl similarity index 84% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/Portal.pg.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Portal.pg.pdl index 9e32cb012..c7533b67e 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Portal.pg.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Portal.pg.pdl @@ -1,4 +1,4 @@ -model com.arsdigita.london.portal; +model com.arsdigita.portalworkspace; query MaxPortletInstances { Integer maxCount; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Workspace-extra-queries.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace-extra-queries.pdl similarity index 87% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/Workspace-extra-queries.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace-extra-queries.pdl index 7b48fd919..adcd3d734 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Workspace-extra-queries.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace-extra-queries.pdl @@ -12,13 +12,13 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal; +model com.arsdigita.portalworkspace; query WorkspaceParticipantsWithInitial { BigDecimal participantID; do { select u.user_id as participant_id - from workspaces w, group_member_map m, users u, person_names pn + from pw_workspaces w, group_member_map m, users u, person_names pn where w.workspace_id = :workspaceID and w.party_id = m.group_id and m.member_id = u.user_id and @@ -35,7 +35,7 @@ query WorkspaceParticipantInitials { select name_initial from ( select distinct upper(substr(pn.family_name, 1, 1)) as name_initial - from workspaces w, group_member_map m, users u, person_names pn + from pw_workspaces w, group_member_map m, users u, person_names pn where w.workspace_id = :workspaceID and w.party_id = m.group_id and m.member_id = u.user_id and @@ -50,7 +50,7 @@ query WorkspaceParticipantIDs { BigDecimal id; do { select m.member_id as participant_id - from workspaces w, group_member_map m + from pw_workspaces w, group_member_map m where w.workspace_id = :workspaceID and w.party_id = m.group_id } map { diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Workspace.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl similarity index 72% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/Workspace.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl index df79cf89f..5297772c9 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/Workspace.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/Workspace.pdl @@ -12,30 +12,30 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal; +model com.arsdigita.portalworkspace; import com.arsdigita.kernel.Party; import com.arsdigita.kernel.User; import com.arsdigita.web.Application; object type Workspace extends Application { - Party[1..1] party = join workspaces.party_id to parties.party_id; - component WorkspacePage[0..n] pages = join workspaces.workspace_id - to workspace_pages.workspace_id; - PageLayout[1..1] defaultLayout = join workspaces.default_layout_id - to workspace_page_layouts.layout_id; - WorkspaceTheme[0..1] theme = join workspaces.theme_id to workspace_themes.theme_id; - User[0..1] owner = join workspaces.owner_id to users.user_id; + Party[1..1] party = join pw_workspaces.party_id to parties.party_id; + component WorkspacePage[0..n] pages = join pw_workspaces.workspace_id + to pw_workspace_pages.workspace_id; + PageLayout[1..1] defaultLayout = join pw_workspaces.default_layout_id + to pw_workspace_page_layouts.layout_id; + WorkspaceTheme[0..1] theme = join pw_workspaces.theme_id to pw_workspace_themes.theme_id; + User[0..1] owner = join pw_workspaces.owner_id to users.user_id; Workspace[0..n] relatedWorkspace = - join workspaces.workspace_id - to workspace_workspace_map.referencing_workspace_id, - join workspace_workspace_map.referenced_workspace_id - to workspaces.workspace_id; + join pw_workspaces.workspace_id + to pw_workspace_workspace_map.referencing_workspace_id, + join pw_workspace_workspace_map.referenced_workspace_id + to pw_workspaces.workspace_id; // String description = applications.description VARCHAR(4000); - reference key (workspaces.workspace_id); + reference key (pw_workspaces.workspace_id); aggressive load (party.id); } @@ -62,7 +62,7 @@ query childWorkspacesForApplicationID { from acs_objects, applications, - workspaces + pw_workspaces where applications.parent_application_id = :applicationID -- joins diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspacePage.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspacePage.pdl similarity index 73% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspacePage.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspacePage.pdl index b17ada4f1..0badd0e29 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/WorkspacePage.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspacePage.pdl @@ -15,18 +15,18 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.portal; +model com.arsdigita.portalworkspace; import com.arsdigita.portal.Portal; object type WorkspacePage extends Portal { Integer[1..1] sortKey = applications.sort_key INTEGER; - PageLayout[1..1] layout = join workspace_pages.layout_id - to workspace_page_layouts.layout_id; - composite Workspace[1..1] workspace = join workspace_pages.workspace_id - to workspaces.workspace_id; + PageLayout[1..1] layout = join pw_workspace_pages.layout_id + to pw_workspace_page_layouts.layout_id; + composite Workspace[1..1] workspace = join pw_workspace_pages.workspace_id + to pw_workspaces.workspace_id; - reference key (workspace_pages.page_id); + reference key (pw_workspace_pages.page_id); aggressive load (layout.id, layout.title, layout.description, layout.format); } diff --git a/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspaceTheme.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspaceTheme.pdl new file mode 100755 index 000000000..1f9a8dd2a --- /dev/null +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/WorkspaceTheme.pdl @@ -0,0 +1,35 @@ + +model com.arsdigita.portalworkspace; + +import com.arsdigita.kernel.ACSObject; +import com.arsdigita.web.Application; + +// @author Jim Parsons (jparsons@arsdigita.com) + +object type WorkspaceThemeApplication extends Application { + reference key (pw_workspace_themeapplications.theme_app_id); +} + +object type WorkspaceTheme extends ACSObject { + String[0..1] theme_name = pw_workspace_themes.theme_name VARCHAR(4000); + String[0..1] theme_desc = pw_workspace_themes.theme_desc VARCHAR(4000); + String[0..1] ctx_bar_color = pw_workspace_themes.ctx_bar_color VARCHAR(100); + String[0..1] ctx_bar_text_color = pw_workspace_themes.ctx_bar_text_color VARCHAR(100); + String[0..1] active_tab_color = pw_workspace_themes.active_tab_color VARCHAR(100); + String[0..1] active_tab_text_color = pw_workspace_themes.active_tab_text_color VARCHAR(100); + String[0..1] inactive_tab_color = pw_workspace_themes.inactive_tab_color VARCHAR(100); + String[0..1] inactive_tab_text_color = pw_workspace_themes.inactive_tab_text_color VARCHAR(100); + String[0..1] top_rule = pw_workspace_themes.top_rule VARCHAR(100); + String[0..1] bottom_rule = pw_workspace_themes.bottom_rule VARCHAR(100); + String[0..1] portlet_head = pw_workspace_themes.portlet_head VARCHAR(100); + String[0..1] portlet_icon = pw_workspace_themes.portlet_icon VARCHAR(100); + String[0..1] portlet_border_color = pw_workspace_themes.portlet_border_color VARCHAR(100); + String[0..1] portlet_border_style = pw_workspace_themes.portlet_border_style VARCHAR(100); + String[0..1] portlet_header_text_color = pw_workspace_themes.portlet_header_text_color VARCHAR(100); + String[0..1] page_bg_color = pw_workspace_themes.page_bg_color VARCHAR(100); + String[0..1] page_bg_image = pw_workspace_themes.page_bg_image VARCHAR(100); + String[0..1] narrow_bg_color = pw_workspace_themes.narrow_bg_color VARCHAR(100); + String[0..1] body_text_color = pw_workspace_themes.body_text_color VARCHAR(100); + + reference key (pw_workspace_themes.theme_id); +} diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/ApplicationDirectoryPortlet.pdl similarity index 93% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/ApplicationDirectoryPortlet.pdl index 7ca2b165a..d0703a99d 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/ApplicationDirectoryPortlet.pdl @@ -12,7 +12,7 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/ContentDirectoryPortlet.pdl similarity index 96% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/ContentDirectoryPortlet.pdl index d86abfd34..f05908721 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/ContentDirectoryPortlet.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; import com.arsdigita.categorization.Category; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/FlashPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/FlashPortlet.pdl similarity index 97% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/FlashPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/FlashPortlet.pdl index 4b8512414..5d579d2a4 100644 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/FlashPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/FlashPortlet.pdl @@ -14,7 +14,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/FreeformHTMLPortlet.pdl similarity index 94% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/FreeformHTMLPortlet.pdl index 0da9e29fd..d90b015dc 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/FreeformHTMLPortlet.pdl @@ -12,7 +12,7 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/LoginPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/LoginPortlet.pdl similarity index 93% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/LoginPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/LoginPortlet.pdl index 26143271c..ce513a1ed 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/LoginPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/LoginPortlet.pdl @@ -12,7 +12,7 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/MyWorkspacesPortlet.pdl similarity index 92% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/MyWorkspacesPortlet.pdl index c9dd6e370..7df2393eb 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/MyWorkspacesPortlet.pdl @@ -1,4 +1,4 @@ -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; @@ -18,7 +18,7 @@ query MyWorkspaces { upper(a.title) as sort_key from group_member_trans_index gmti, - workspaces w, + pw_workspaces w, group_subgroup_map m, applications a where @@ -34,7 +34,7 @@ query MyWorkspaces { a.primary_url, upper(a.title) as sort_key from - workspaces w, + pw_workspaces w, group_member_map m, applications a where diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/RSSFeedPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/RSSFeedPortlet.pdl similarity index 94% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/RSSFeedPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/RSSFeedPortlet.pdl index 55f7c9094..445552055 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/RSSFeedPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/RSSFeedPortlet.pdl @@ -12,7 +12,7 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/TimeOfDayPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/TimeOfDayPortlet.pdl similarity index 93% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/TimeOfDayPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/TimeOfDayPortlet.pdl index 4ccf92bf8..1b1296930 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/TimeOfDayPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/TimeOfDayPortlet.pdl @@ -12,7 +12,7 @@ // rights and limitations under the License. // -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/WorkspaceNavigatorPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/WorkspaceNavigatorPortlet.pdl similarity index 68% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/WorkspaceNavigatorPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/WorkspaceNavigatorPortlet.pdl index 4b596a8d5..624e5c0a3 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/WorkspaceNavigatorPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/WorkspaceNavigatorPortlet.pdl @@ -1,4 +1,4 @@ -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.pdl b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/WorkspaceSummaryPortlet.pdl similarity index 67% rename from ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.pdl rename to ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/WorkspaceSummaryPortlet.pdl index 794b51faf..70f33a86b 100755 --- a/ccm-ldn-portal/pdl/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.pdl +++ b/ccm-portalworkspace/pdl/com/arsdigita/portalworkspace/portlet/WorkspaceSummaryPortlet.pdl @@ -1,4 +1,4 @@ -model com.arsdigita.london.portal.portlet; +model com.arsdigita.portalworkspace.portlet; import com.arsdigita.portal.Portlet; diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/add-flash-portlet.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-flash-portlet.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/add-flash-portlet.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-flash-portlet.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/add-navigation-directory-portlet.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-navigation-directory-portlet.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/add-navigation-directory-portlet.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-navigation-directory-portlet.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/add-workspace-pages.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-workspace-pages.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/add-workspace-pages.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/add-workspace-pages.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/content-directory.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/content-directory.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/content-directory.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/content-directory.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/fix-perm-context.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/fix-perm-context.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/upgrade/fix-perm-context.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/default/upgrade/fix-perm-context.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/portal-upgrade-1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-1.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/portal-upgrade-1.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-1.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/portal-upgrade-2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/portal-upgrade-2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portal-upgrade-2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/portlet-upgrade-1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portlet-upgrade-1.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/portlet-upgrade-1.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/portlet-upgrade-1.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace-owner.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-owner.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace-owner.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-owner.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace-pages.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-pages.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace-pages.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-pages.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace-themes.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-themes.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace-themes.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace-themes.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace_workspace_map.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace_workspace_map.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/add-workspace_workspace_map.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/add-workspace_workspace_map.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/freeform-use-clob.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/upgrade/freeform-use-clob.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/oracle-se/upgrade/freeform-use-clob.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/add-workspace-owner.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-owner.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/add-workspace-owner.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-owner.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/add-workspace-themes.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-themes.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/add-workspace-themes.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace-themes.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/add-workspace_workspace_map.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace_workspace_map.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/add-workspace_workspace_map.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/add-workspace_workspace_map.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/freeform-use-clob.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/postgres/upgrade/freeform-use-clob.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/postgres/upgrade/freeform-use-clob.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-1.4.1-1.4.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-1.4.1-1.4.2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-1.4.1-1.4.2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-1.4.1-1.4.2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.0-6.3.1.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.0-6.3.1.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.0-6.3.1.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.1-6.3.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.1-6.3.2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.3.1-6.3.2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.3.1-6.3.2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.5.1-6.5.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.1-6.5.2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.5.1-6.5.2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.1-6.5.2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.5.2-6.5.3.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.2-6.5.3.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/oracle-se-6.5.2-6.5.3.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/oracle-se-6.5.2-6.5.3.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-1.4.1-1.4.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-1.4.1-1.4.2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-1.4.1-1.4.2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-1.4.1-1.4.2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.0-6.3.1.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.0-6.3.1.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.0-6.3.1.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.1-6.3.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.1-6.3.2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.3.1-6.3.2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.3.1-6.3.2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.5.1-6.5.2.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.1-6.5.2.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.5.1-6.5.2.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.1-6.5.2.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.5.2-6.5.3.sql b/ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.2-6.5.3.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/upgrade/postgres-6.5.2-6.5.3.sql rename to ccm-portalworkspace/sql/ccm-ldn-portal-2/upgrade/postgres-6.5.2-6.5.3.sql diff --git a/ccm-portalworkspace/sql/ccm-portalworkspace/default/index-workspaces_party_id_idx.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/default/index-workspaces_party_id_idx.sql new file mode 100755 index 000000000..32e434af9 --- /dev/null +++ b/ccm-portalworkspace/sql/ccm-portalworkspace/default/index-workspaces_party_id_idx.sql @@ -0,0 +1 @@ +create index pw_workspaces_party_id_idx on pw_workspaces(party_id); diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/insert-default-layout.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/default/insert-default-layout.sql similarity index 54% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/insert-default-layout.sql rename to ccm-portalworkspace/sql/ccm-portalworkspace/default/insert-default-layout.sql index fec883512..c0a8eae0b 100755 --- a/ccm-ldn-portal/sql/ccm-ldn-portal/default/insert-default-layout.sql +++ b/ccm-portalworkspace/sql/ccm-portalworkspace/default/insert-default-layout.sql @@ -1,15 +1,15 @@ -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (nextval('acs_object_id_seq'), '1 Column', 'One column', '100%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (nextval('acs_object_id_seq'), '2 Column', 'Two columns, equal size', '50%,50%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (nextval('acs_object_id_seq'), '3 Column', 'Three columns, equal size', '30%,40%,30%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (nextval('acs_object_id_seq'), '4 Column', 'Four columns, equal size', '25%,25%,25%,25%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (nextval('acs_object_id_seq'), '5 Column', 'Five columns, equal size', '20%,20%,20%,20%,20%'); diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/default/table-portlet_content_item.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/default/table-portlet_content_item.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/default/table-portlet_content_item.sql rename to ccm-portalworkspace/sql/ccm-portalworkspace/default/table-portlet_content_item.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se-create.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se-create.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se-create.sql rename to ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se-create.sql diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/insert-page-layouts.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql similarity index 53% rename from ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/insert-page-layouts.sql rename to ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql index 14948f8eb..28e5e258f 100755 --- a/ccm-ldn-portal/sql/ccm-ldn-portal/oracle-se/insert-page-layouts.sql +++ b/ccm-portalworkspace/sql/ccm-portalworkspace/oracle-se/insert-page-layouts.sql @@ -1,14 +1,14 @@ -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (acs_object_id_seq.nextval, '1 Column', 'One column', '100%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (acs_object_id_seq.nextval, '2 Column', 'Two columns, equal size', '50%,50%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (acs_object_id_seq.nextval, '3 Column', 'Three columns, equal size', '30%,40%,30%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (acs_object_id_seq.nextval, '4 Column', 'Four columns, equal size', '25%,25%,25%,25%'); -insert into workspace_page_layouts (layout_id, title, description, format) +insert into pw_workspace_page_layouts (layout_id, title, description, format) values (acs_object_id_seq.nextval, '5 Column', 'Five columns, equal size', '20%,20%,20%,20%,20%'); diff --git a/ccm-ldn-portal/sql/ccm-ldn-portal/postgres-create.sql b/ccm-portalworkspace/sql/ccm-portalworkspace/postgres-create.sql similarity index 100% rename from ccm-ldn-portal/sql/ccm-ldn-portal/postgres-create.sql rename to ccm-portalworkspace/sql/ccm-portalworkspace/postgres-create.sql diff --git a/ccm-ldn-portal/src/WEB-INF/resources/portal-adapters.xml b/ccm-portalworkspace/src/WEB-INF/resources/portalworkspace-adapters.xml similarity index 77% rename from ccm-ldn-portal/src/WEB-INF/resources/portal-adapters.xml rename to ccm-portalworkspace/src/WEB-INF/resources/portalworkspace-adapters.xml index a631b0868..300adb122 100755 --- a/ccm-ldn-portal/src/WEB-INF/resources/portal-adapters.xml +++ b/ccm-portalworkspace/src/WEB-INF/resources/portalworkspace-adapters.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd"> - - + + @@ -17,8 +17,8 @@ - - + + @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/ccm-portalworkspace/src/ccm-portalworkspace.config b/ccm-portalworkspace/src/ccm-portalworkspace.config new file mode 100755 index 000000000..e1958eb97 --- /dev/null +++ b/ccm-portalworkspace/src/ccm-portalworkspace.config @@ -0,0 +1,5 @@ + + + + diff --git a/ccm-ldn-portal/src/ccm-ldn-portal.load b/ccm-portalworkspace/src/ccm-portalworkspace.load similarity index 55% rename from ccm-ldn-portal/src/ccm-ldn-portal.load rename to ccm-portalworkspace/src/ccm-portalworkspace.load index 9ac630a63..8896adbd9 100755 --- a/ccm-ldn-portal/src/ccm-ldn-portal.load +++ b/ccm-portalworkspace/src/ccm-portalworkspace.load @@ -6,19 +6,18 @@ - - + + + - + - - + + diff --git a/ccm-ldn-portal/src/ccm-ldn-portal.upgrade b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade similarity index 87% rename from ccm-ldn-portal/src/ccm-ldn-portal.upgrade rename to ccm-portalworkspace/src/ccm-portalworkspace.upgrade index cd84ec75c..3ab9d61c8 100755 --- a/ccm-ldn-portal/src/ccm-ldn-portal.upgrade +++ b/ccm-portalworkspace/src/ccm-portalworkspace.upgrade @@ -19,4 +19,7 @@