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 @@
+
+
+
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Initializer.java
similarity index 87%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/Initializer.java
index d715e92a4..6a5d54f42 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Initializer.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import org.apache.log4j.Logger;
@@ -30,25 +30,21 @@ import com.arsdigita.kernel.ResourceType;
import com.arsdigita.kernel.ResourceTypeConfig;
import com.arsdigita.kernel.ui.ResourceConfigComponent;
import com.arsdigita.kernel.ui.ResourceConfigFormSection;
-// unused import
-// import com.arsdigita.london.navigation.ApplicationNavigationModel;
-// import com.arsdigita.london.navigation.DefaultNavigationModel;
-import com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet;
-import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet;
-import com.arsdigita.london.portal.portlet.FlashPortletInitializer;
-import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet;
-import com.arsdigita.london.portal.portlet.LoginPortlet;
-// import com.arsdigita.london.navigation.portlet.NavigationDirectoryPortlet;
-import com.arsdigita.london.portal.portlet.RSSFeedPortlet;
-import com.arsdigita.london.portal.portlet.TimeOfDayPortlet;
-import com.arsdigita.london.portal.portlet.MyWorkspacesPortlet;
-import com.arsdigita.london.portal.portlet.WorkspaceNavigatorPortlet;
-import com.arsdigita.london.portal.portlet.WorkspaceSummaryPortlet;
-import com.arsdigita.london.portal.ui.admin.WorkspaceConfigFormSection;
-import com.arsdigita.london.portal.ui.portlet.ContentDirectoryPortletEditor;
-import com.arsdigita.london.portal.ui.portlet.FreeformHTMLPortletEditor;
-import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditor;
-import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditorForm;
+import com.arsdigita.portalworkspace.portlet.ApplicationDirectoryPortlet;
+import com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet;
+import com.arsdigita.portalworkspace.portlet.FlashPortletInitializer;
+import com.arsdigita.portalworkspace.portlet.FreeformHTMLPortlet;
+import com.arsdigita.portalworkspace.portlet.LoginPortlet;
+import com.arsdigita.portalworkspace.portlet.RSSFeedPortlet;
+import com.arsdigita.portalworkspace.portlet.TimeOfDayPortlet;
+import com.arsdigita.portalworkspace.portlet.MyWorkspacesPortlet;
+import com.arsdigita.portalworkspace.portlet.WorkspaceNavigatorPortlet;
+import com.arsdigita.portalworkspace.portlet.WorkspaceSummaryPortlet;
+import com.arsdigita.portalworkspace.ui.admin.WorkspaceConfigFormSection;
+import com.arsdigita.portalworkspace.ui.portlet.ContentDirectoryPortletEditor;
+import com.arsdigita.portalworkspace.ui.portlet.FreeformHTMLPortletEditor;
+import com.arsdigita.portalworkspace.ui.portlet.RSSFeedPortletEditor;
+import com.arsdigita.portalworkspace.ui.portlet.RSSFeedPortletEditorForm;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.pdl.NameFilter;
@@ -58,11 +54,9 @@ import com.arsdigita.runtime.PDLInitializer;
import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.xml.XML;
-// import com.arsdigita.london.rss.portlet.WorkspaceDirectoryPortlet;
-
/**
- * Initializes the Portal system
+ * Initializes the Portal Workspace system
*
* @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
*/
@@ -78,7 +72,7 @@ public class Initializer extends CompoundInitializer {
final String url = RuntimeConfig.getConfig().getJDBCURL();
final int database = DbHelper.getDatabaseFromURL(url);
- add(new PDLInitializer(new ManifestSource("ccm-ldn-portal.pdl.mf",
+ add(new PDLInitializer(new ManifestSource("ccm-portalworkspace.pdl.mf",
new NameFilter(DbHelper.getDatabaseSuffix(database),
"pdl"))));
}
@@ -123,8 +117,9 @@ public class Initializer extends CompoundInitializer {
e.getFactory().registerInstantiator(
- ApplicationDirectoryPortlet.BASE_DATA_OBJECT_TYPE,
+ ApplicationDirectoryPortlet.BASE_DATA_OBJECT_TYPE,
new ACSObjectInstantiator() {
+ @Override
public DomainObject doNewInstance(DataObject dataObject) {
return new ApplicationDirectoryPortlet(dataObject);
}
@@ -149,6 +144,7 @@ public class Initializer extends CompoundInitializer {
e.getFactory().registerInstantiator(
LoginPortlet.BASE_DATA_OBJECT_TYPE,
new ACSObjectInstantiator() {
+ @Override
public DomainObject doNewInstance(DataObject dataObject) {
return new LoginPortlet(dataObject);
}
@@ -157,6 +153,7 @@ public class Initializer extends CompoundInitializer {
e.getFactory().registerInstantiator(
MyWorkspacesPortlet.BASE_DATA_OBJECT_TYPE,
new ACSObjectInstantiator() {
+ @Override
public DomainObject doNewInstance(DataObject dataObject) {
return new MyWorkspacesPortlet(dataObject);
}
@@ -165,6 +162,7 @@ public class Initializer extends CompoundInitializer {
e.getFactory().registerInstantiator(
RSSFeedPortlet.BASE_DATA_OBJECT_TYPE,
new ACSObjectInstantiator() {
+ @Override
public DomainObject doNewInstance(DataObject dataObject) {
return new RSSFeedPortlet(dataObject);
}
@@ -206,6 +204,7 @@ public class Initializer extends CompoundInitializer {
});
new ResourceTypeConfig(Workspace.BASE_DATA_OBJECT_TYPE) {
+ @Override
public ResourceConfigFormSection getCreateFormSection(
final ResourceType resType,
final RequestLocal parentAppRL) {
@@ -214,6 +213,7 @@ public class Initializer extends CompoundInitializer {
return config;
}
+ @Override
public ResourceConfigFormSection getModifyFormSection(
final RequestLocal application) {
final ResourceConfigFormSection config =
@@ -223,6 +223,7 @@ public class Initializer extends CompoundInitializer {
};
new ResourceTypeConfig(ContentDirectoryPortlet.BASE_DATA_OBJECT_TYPE) {
+ @Override
public ResourceConfigFormSection getCreateFormSection(
final ResourceType resType,
final RequestLocal parentAppRL) {
@@ -232,6 +233,7 @@ public class Initializer extends CompoundInitializer {
return config;
}
+ @Override
public ResourceConfigFormSection getModifyFormSection(
final RequestLocal application) {
final ContentDirectoryPortletEditor config =
@@ -241,6 +243,7 @@ public class Initializer extends CompoundInitializer {
};
new ResourceTypeConfig(RSSFeedPortlet.BASE_DATA_OBJECT_TYPE) {
+ @Override
public ResourceConfigFormSection getCreateFormSection(
final ResourceType resType,
final RequestLocal parentAppRL) {
@@ -266,6 +269,7 @@ public class Initializer extends CompoundInitializer {
return config;
}
+ @Override
public ResourceConfigComponent getModifyComponent(
final RequestLocal application) {
final RSSFeedPortletEditor config =
@@ -293,13 +297,13 @@ public class Initializer extends CompoundInitializer {
}
};
-// NavigationDirectoryPortlet.registerInstantiator();
-// NavigationDirectoryPortlet.registerResourceTypeConfig();
FlashPortletInitializer.initialize();
// import from london.navigation required
// causes horizontal dependency between portal and navigation
+ // required by NavigationTreePortlet (formerly NavigationDirectroryPortlet)
+ // now moved to ldn-navigation ??
// ApplicationNavigationModel.register(Workspace.class.getName(),
// new DefaultNavigationModel());
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/Loader.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
similarity index 76%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/Loader.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
index 0022cfa44..ebfae2408 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/Loader.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import org.apache.log4j.Logger;
@@ -24,13 +24,15 @@ import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.kernel.ResourceType;
import com.arsdigita.loader.PackageLoader;
-import com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet;
-import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet;
-import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet;
-import com.arsdigita.london.portal.portlet.LoginPortlet;
-// import com.arsdigita.london.navigation.portlet.NavigationDirectoryPortlet;
-import com.arsdigita.london.portal.portlet.RSSFeedPortlet;
-import com.arsdigita.london.portal.portlet.TimeOfDayPortlet;
+import com.arsdigita.portalworkspace.portlet.ApplicationDirectoryPortlet;
+import com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet;
+import com.arsdigita.portalworkspace.portlet.FreeformHTMLPortlet;
+import com.arsdigita.portalworkspace.portlet.LoginPortlet;
+import com.arsdigita.portalworkspace.portlet.MyWorkspacesPortlet ;
+import com.arsdigita.portalworkspace.portlet.RSSFeedPortlet;
+import com.arsdigita.portalworkspace.portlet.TimeOfDayPortlet;
+import com.arsdigita.portalworkspace.portlet.WorkspaceNavigatorPortlet;
+import com.arsdigita.portalworkspace.portlet.WorkspaceSummaryPortlet;
import com.arsdigita.portal.PortletType;
import com.arsdigita.runtime.ScriptContext;
import com.arsdigita.util.Assert;
@@ -42,7 +44,8 @@ import com.arsdigita.web.ApplicationType;
/**
* Executes nonrecurring at install time and loads (and configures ) a default
- * workspace instance (i.e. instance of ccm-ldn-portal) in a default configuration.
+ * workspace instance (i.e. instance of ccm-portalworkspace) in a default
+ * configuration.
*
* Configuration can be modified by configuration parameters before processing,
* otherwise hardcoded default values take effect. A set of portlets, part of
@@ -59,15 +62,18 @@ public class Loader extends PackageLoader {
private static final Logger s_log = Logger.getLogger(Loader.class);
private StringParameter m_url = new StringParameter(
- "com.arsdigita.london.portal.default_url", Parameter.REQUIRED,
+ "com.arsdigita.portalworkspace.default_url", Parameter.REQUIRED,
"/portal/");
private StringParameter m_title = new StringParameter(
- "com.arsdigita.london.portal.default_title", Parameter.REQUIRED,
+ "com.arsdigita.portalworkspace.default_title", Parameter.REQUIRED,
"Portal Homepage");
- private BooleanParameter m_isPublic = new BooleanParameter(
- "com.arsdigita.london.portal.default_is_public",
+ /** Actually a kind of misnomer. In the creation process it is used to
+ * indicate whether a Containergroup should be created.
+ */
+ private BooleanParameter m_isPublic = new BooleanParameter(
+ "com.arsdigita.portalworkspace.default_is_public",
Parameter.REQUIRED, Boolean.TRUE);
/**
@@ -99,9 +105,11 @@ public class Loader extends PackageLoader {
loadContentDirectoryPortlet();
loadFreeformHTMLPortlet();
loadLoginPortlet();
+ loadMyWorkspacesPortlet();
loadRSSFeedPortlet();
loadTimeOfDayPortlet();
-// NavigationDirectoryPortlet.loadPortletType();
+ loadWorkspaceNavigatorPortlet();
+ loadWorkspaceSummaryPortlet();
}
}.run();
}
@@ -161,7 +169,8 @@ public class Loader extends PackageLoader {
// The first string is a key parameter used to create a
// legacy package type to back the new application type.
ApplicationType type = ApplicationType.createApplicationType(
- "workspace", "Portal Workspace",
+ "portalworkspace",
+ "Portal Workspace",
Workspace.BASE_DATA_OBJECT_TYPE);
type.setDescription("Portal based collaborative workspaces");
type.createGroup();
@@ -171,7 +180,7 @@ public class Loader extends PackageLoader {
/**
* Setup WorkspacePage type.
*
- * Creates an entry for class (=type) c.ad.ldn.portal.WorkspacePage in
+ * Creates an entry for class (=type) c.ad.portalworkspace.WorkspacePage in
* table application_types, but not in apm_package_types.
* @return
*/
@@ -191,7 +200,7 @@ public class Loader extends PackageLoader {
PortletType type = PortletType.createPortletType(
"Application Directory", PortletType.WIDE_PROFILE,
ApplicationDirectoryPortlet.BASE_DATA_OBJECT_TYPE);
- type.setDescription("Displays a list of applications");
+ type.setDescription("Displays a list of portal workspace applications");
}
private void loadContentDirectoryPortlet() {
@@ -214,6 +223,12 @@ public class Loader extends PackageLoader {
type.setDescription("Display a login form or user details");
}
+ private void loadMyWorkspacesPortlet() {
+ PortletType type = PortletType.createPortletType("My Workspaces",
+ PortletType.WIDE_PROFILE, MyWorkspacesPortlet.BASE_DATA_OBJECT_TYPE);
+ type.setDescription("MyWorkspaces: Display ????");
+ }
+
private void loadRSSFeedPortlet() {
PortletType type = PortletType.createPortletType("RSS Feed",
PortletType.WIDE_PROFILE, RSSFeedPortlet.BASE_DATA_OBJECT_TYPE);
@@ -229,4 +244,19 @@ public class Loader extends PackageLoader {
TimeOfDayPortlet.BASE_DATA_OBJECT_TYPE);
type.setDescription("Displays the current date and time");
}
+
+ private void loadWorkspaceNavigatorPortlet() {
+ PortletType type = PortletType.createPortletType(
+ "Workspace Navigator Portlet", PortletType.WIDE_PROFILE,
+ WorkspaceNavigatorPortlet.BASE_DATA_OBJECT_TYPE);
+ type.setDescription("Displays ??");
+ }
+
+ private void loadWorkspaceSummaryPortlet() {
+ PortletType type = PortletType.createPortletType(
+ "Workspace Summary Portlet", PortletType.WIDE_PROFILE,
+ WorkspaceSummaryPortlet.BASE_DATA_OBJECT_TYPE);
+ type.setDescription("Displays ???");
+ }
+
}
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader_parameter.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader_parameter.properties
new file mode 100755
index 000000000..f7c5ac88f
--- /dev/null
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader_parameter.properties
@@ -0,0 +1,15 @@
+com.arsdigita.portalworkspace.default_url.title=Portal URL
+com.arsdigita.portalworkspace.default_url.purpose=The URL on which to mount the portal workspace
+com.arsdigita.portalworkspace.default_url.example=/portal/
+com.arsdigita.portalworkspace.default_url.format=[url]
+
+com.arsdigita.portalworkspace.default_title.title=Portal Worksapce Title
+com.arsdigita.portalworkspace.default_title.purpose=The title of the portal workspace
+com.arsdigita.portalworkspace.default_title.example=Portal Homepage
+com.arsdigita.portalworkspace.default_title.format=[string]
+
+com.arsdigita.portalworkspace.default_is_public.title=Is the portal workspace public?
+com.arsdigita.portalworkspace.default_is_public.purpose=Indicate whether or not the Portal Workspace is available to the public
+com.arsdigita.portalworkspace.default_is_public.example=true
+com.arsdigita.portalworkspace.default_is_public.format=true|false
+
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/PageLayout.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/PageLayout.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/PageLayout.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/PageLayout.java
index 3f12fbcbb..60be48f4b 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/PageLayout.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/PageLayout.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import java.math.BigDecimal;
import java.sql.SQLException;
@@ -49,7 +49,8 @@ public class PageLayout extends DomainObject {
public static final String FORMAT_FOUR_COLUMNS = "25%,25%,25%,25%";
- public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.PageLayout";
+ public static final String BASE_DATA_OBJECT_TYPE =
+ "com.arsdigita.portalworkspace.PageLayout";
public PageLayout() {
this(BASE_DATA_OBJECT_TYPE);
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortal.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortal.java
new file mode 100755
index 000000000..1f44a2a48
--- /dev/null
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortal.java
@@ -0,0 +1,202 @@
+/*
+ * 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.portalworkspace;
+
+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.portalworkspace.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalSelectionModel;
+import com.arsdigita.portalworkspace.ui.PortletSelectionModel;
+// import com.arsdigita.portalworkspace.ui.PortletTypeSelectionModel;
+import com.arsdigita.portalworkspace.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;
+
+
+/**
+ * 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!
+ *
+ * @author cgyg9330 <chris.gilbert@westsussex.gov.uk>
+ * @version $Id: StatefulPersistentPortal.java 1271 2006-07-18 13:36:43Z cgyg9330 $
+ */
+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.portalserver.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
+ /**
+ *
+ * @param state
+ * @param parent
+ */
+ @Override
+ 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/StatefulPersistentPortalModelBuilder.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortalModelBuilder.java
similarity index 66%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortalModelBuilder.java
index 28470497a..27ee1d678 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPersistentPortalModelBuilder.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPersistentPortalModelBuilder.java
@@ -14,7 +14,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,40 +24,49 @@ import java.util.Map;
import org.apache.log4j.Logger;
-import com.arsdigita.bebop.Component;
+// import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.PortalModel;
import com.arsdigita.bebop.portal.PortalModelBuilder;
import com.arsdigita.bebop.portal.PortletRenderer;
-import com.arsdigita.london.portal.ui.PortalSelectionModel;
-import com.arsdigita.london.portal.ui.SimplePortlet;
+import com.arsdigita.portalworkspace.ui.PortalSelectionModel;
+// import com.arsdigita.portalworkspace.ui.SimplePortlet;
import com.arsdigita.portal.Portal;
import com.arsdigita.portal.PortletCollection;
import com.arsdigita.util.LockableImpl;
/**
+ * Portal Model Builder that should only be applied to portal in browse mode,
+ * as it does not allow for editing.
+ * Portal in edit mode should have a
+ * com.arsdigita.london.portal.ui.PersistentPortalModelBuilder.
+ *
+ * For stateless portlets, this builder creates a renderer with a reference to
+ * its portlet data object. For stateful portlets the builder retrieves one
+ * of the empty renderers registered to the page and puts the portlet data
+ * object in a requestlocal.
+ *
* @author cgyg9330
- *
- * portal model builder that should only be applied to portal in browse mode, as it does not allow for editing.
- * portal in edit mode should have a com.arsdigita.london.portal.ui.PersistentPortalModelBuilder.
- *
- * For stateless portlets, this builder creates a renderer with a reference to its portlet data object. For stateful portlets
- * the builder retrieves one of the empty renderers registered to the page and puts the portlet data object in
- * a requestlocal.
*/
public class StatefulPersistentPortalModelBuilder
extends LockableImpl
implements PortalModelBuilder {
- private Logger s_log = Logger.getLogger(StatefulPersistentPortalModelBuilder.class);
+ /** Logging instace for debugging purpose. */
+ private Logger s_log =
+ Logger.getLogger(StatefulPersistentPortalModelBuilder.class);
- /**
- * hashmap that maps portlet types to a list of empty renderers that have been registered on the page
- */
+ /** Hashmap that maps portlet types to a list of empty renderers that
+ have been registered on the page */
private Map statefulCollections;
private PortalSelectionModel portalModel;
- public StatefulPersistentPortalModelBuilder(
+ /**
+ * Constructor
+ * @param portal
+ * @param stateful
+ */
+ public StatefulPersistentPortalModelBuilder(
PortalSelectionModel portal,
Map stateful) {
this.portalModel = portal;
@@ -66,16 +75,17 @@ public class StatefulPersistentPortalModelBuilder
}
public PortalModel buildModel(PageState state) {
- // aim of this method is to get hold of a list of renderers for this particular portal
- // and use them to make a PortalModel
+ // aim of this method is to get hold of a list of renderers for
+ // this particular portal and use them to make a PortalModel
s_log.debug("START - buildModel");
List portletRenderers = new ArrayList();
HashMap statefulIterators = new HashMap();
-
- // get iterators for all the renderer lists (this means that each instance of the portlet has it's own renderer)
- // getting iterators in the buildmodel method means that each time model is built, we start at the beginning of the list
+ // get iterators for all the renderer lists (this means that each
+ // instance of the portlet has it's own renderer)
+ // getting iterators in the buildmodel method means that each time
+ // model is built, we start at the beginning of the list
Iterator it = statefulCollections.entrySet().iterator();
while (it.hasNext()) {
Map.Entry entry = (Map.Entry)it.next();
@@ -87,10 +97,13 @@ public class StatefulPersistentPortalModelBuilder
PortletCollection portlets = portal.getPortlets();
while (portlets.next()) {
com.arsdigita.portal.Portlet portlet = portlets.getPortlet();
- s_log.debug("portlet " + portlet.getPortletType().getDescription() + " " + portlet.getTitle());
+ s_log.debug("portlet " + portlet.getPortletType().getDescription() +
+ " " + portlet.getTitle());
if (portlet instanceof StatefulPortlet) {
- StatefulPortletRenderer statefulRenderer = (StatefulPortletRenderer)((Iterator) statefulIterators.get(
- portlet.getPortletType().getResourceObjectType())).next();
+ StatefulPortletRenderer statefulRenderer =
+ (StatefulPortletRenderer)((Iterator) statefulIterators
+ .get(portlet.getPortletType()
+ .getResourceObjectType())).next();
statefulRenderer.setPortlet(portlet, state);
portletRenderers.add(statefulRenderer);
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortlet.java
similarity index 74%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortlet.java
index 2a5e20e70..c0f831c80 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortlet.java
@@ -14,31 +14,31 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import java.util.HashMap;
import java.util.Map;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
import com.arsdigita.xml.Element;
/**
- * @author cgyg9330 <chris.gilbert@westsussex.gov.uk>
- * @version $Id: StatefulPortlet.java 1271 2006-07-18 13:36:43Z cgyg9330 $
+ * In order to register stateful components with the page, stateful portlets
+ * must have the ability to supply renderers that are not tied to any particular
+ * portlet data object.
*
- * In order to register stateful components with the page, stateful portlets must have the ability
- * to supply renderers that are not tied to any particular portlet data object.
+ * This abstract class provides a means of registering a
+ * StatefulPortletRendererFactory that is used when the page is being built,
+ * and provides a final implementation of doGetPortletRenderer that is used
+ * by a portal page in edit mode.
*
- * This abstract class provides a means of registering a StatefulPortletRendererFactory that is used
- * when the page is being built, and provides a final implementation of doGetPortletRenderer that
- * is used by a portal page in edit mode.
- *
- * The framework allows the empty renderers that are registered to a page to be populated via
- * RequestLocals with actual Portlet data objects ready for rendering
+ * The framework allows the empty renderers that are registered to a page to be
+ * populated via RequestLocals with actual Portlet data objects ready for
+ * rendering
*
* To create a stateful portlet:-
*
@@ -48,7 +48,8 @@ import com.arsdigita.xml.Element;
*
*
*
- * public class StatefulExamplePortletRendererFactory implements StatefulPortletRendererFactory {
+ * public class StatefulExamplePortletRendererFactory
+ * implements StatefulPortletRendererFactory {
*
* public StatefulPortletRenderer getRenderer() {
* return new StatefulExamplePortletRenderer();
@@ -63,12 +64,13 @@ import com.arsdigita.xml.Element;
* public void init(DomainInitEvent e) {
* super.init(e);
*
- * StatefulPortlet.registerRendererFactory(StatefulExamplePortlet.BASE_DATA_OBJECT_TYPE, new StatefulExamplePortletRendererFactory());
+ * StatefulPortlet.registerRendererFactory(
+ * StatefulExamplePortlet.BASE_DATA_OBJECT_TYPE,
+ * new StatefulExamplePortletRendererFactory());
*
- *
*
- *
- * ensure that your portlet class extends StatefulPortlet, but apart from that treat is as any other domain object
+ * ensure that your portlet class extends StatefulPortlet, but apart from that
+ * treat is as any other domain object
*
*
*
@@ -110,7 +112,8 @@ import com.arsdigita.xml.Element;
* label1.addPrintListener (new PrintListener() {
* public void prepare(PrintEvent event) {
* PageState state = event.getState();
- * StatefulExamplePortlet thisPortlet = (StatefulExamplePortlet)portlet.get(state);
+ * StatefulExamplePortlet thisPortlet =
+ * (StatefulExamplePortlet)portlet.get(state);
* Label label = event.getTarget();
* label.setLabel(thisPortlet.getLabel1());
* }
@@ -122,7 +125,8 @@ import com.arsdigita.xml.Element;
* label2.addPrintListener (new PrintListener() {
* public void prepare(PrintEvent event) {
* PageState state = event.getState();
- * StatefulExamplePortlet thisPortlet = (StatefulExamplePortlet)portlet.get(state);
+ * StatefulExamplePortlet thisPortlet =
+ * (StatefulExamplePortlet)portlet.get(state);
* Label label = event.getTarget();
* label.setLabel(thisPortlet.getLabel2());
* }
@@ -157,9 +161,10 @@ import com.arsdigita.xml.Element;
*
* }
*
- *
- *
- *
+ *
+ *
+ * @author cgyg9330 <chris.gilbert@westsussex.gov.uk>
+ * @version $Id: StatefulPortlet.java 1271 2006-07-18 13:36:43Z cgyg9330 $
*/
public abstract class StatefulPortlet extends Portlet {
@@ -169,11 +174,14 @@ public abstract class StatefulPortlet extends Portlet {
super(dataObject);
}
- public static void registerRendererFactory(String portletType, StatefulPortletRendererFactory factory) {
+ public static void registerRendererFactory(
+ String portletType,
+ StatefulPortletRendererFactory factory) {
rendererFactories.put(portletType, factory);
}
- public static StatefulPortletRendererFactory getRendererFactory(String portletType) {
+ public static StatefulPortletRendererFactory getRendererFactory(
+ String portletType) {
return (StatefulPortletRendererFactory)rendererFactories.get(portletType);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortletRenderer.java
similarity index 74%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortletRenderer.java
index f8f8e8db4..d50ba915d 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortletRenderer.java
@@ -14,7 +14,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import org.apache.log4j.Logger;
@@ -29,11 +29,13 @@ import com.arsdigita.xml.Element;
* @author chris gilbert
*
* Renderer that stores reference to portlet data object in a request local.
- * When the page is built, enough StatefulPortletRenderers are added to the page as might
- * be needed by any one portal. Hence all portals share the same stateful portlets and so
- * portlet data object cannot be stored as an instane variable.
+ * When the page is built, enough StatefulPortletRenderers are added to the
+ * page as might be needed by any one portal. Hence all portals share the same
+ * stateful portlets and so portlet data object cannot be stored as an instane
+ * variable.
*
- * StatefulPortletModelBuilder sets value of requestlocal when the portlet model is built.
+ * StatefulPortletModelBuilder sets value of requestlocal when the portlet
+ * model is built.
*/
public abstract class StatefulPortletRenderer extends AbstractPortletRenderer {
@@ -54,11 +56,12 @@ public abstract class StatefulPortletRenderer extends AbstractPortletRenderer {
}
/**
- * implementation of abstract method that does nothing. Any components that have been added to the container
- * will be rendered by AbstractPortletRenderer within the bebop:portlet element
+ * Implementation of abstract method that does nothing. Any components
+ * that have been added to the container will be rendered by
+ * AbstractPortletRenderer within the bebop:portlet element
*
- * if you want to include other information within bebop:portlet, override this method
- * otherwise leave it
+ * If you want to include other information within bebop:portlet, override
+ * this method otherwise leave it.
*/
protected void generateBodyXML(
PageState pageState,
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortletRendererFactory.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortletRendererFactory.java
similarity index 68%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortletRendererFactory.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortletRendererFactory.java
index 3901f360c..137a20ecd 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/StatefulPortletRendererFactory.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/StatefulPortletRendererFactory.java
@@ -4,17 +4,16 @@
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
/**
- * @author cgyg9330
+ *Implementers of Stateful Portlets must implement a factory to retrieve the
+ * correct renderer.
*
- *Implementers of Stateful Portlets must implement a factory to retrieve the correct renderer.
+ * @author cgyg9330
*/
public interface StatefulPortletRendererFactory {
-
-
-
- public StatefulPortletRenderer getRenderer();
+
+ public StatefulPortletRenderer getRenderer();
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
index cf008825c..23a8604f1 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/Workspace.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Workspace.java
@@ -12,9 +12,7 @@
* rights and limitations under the License.
*
*/
-package com.arsdigita.london.portal;
-
-import org.apache.log4j.Logger;
+package com.arsdigita.portalworkspace;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory;
@@ -32,8 +30,8 @@ import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PermissionManager;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.london.portal.ui.PersonalPortalPage;
-import com.arsdigita.london.portal.ui.WorkspaceTheme;
+import com.arsdigita.portalworkspace.ui.PersonalPortalPage;
+import com.arsdigita.portalworkspace.ui.WorkspaceTheme;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataCollection;
@@ -52,6 +50,9 @@ import com.arsdigita.web.Web;
import java.util.Iterator;
import java.util.LinkedList;
+import org.apache.log4j.Logger;
+
+
/**
* Workspace domain class.
* A workspace represents an area containing 0...n portals each arranged
@@ -69,7 +70,7 @@ public class Workspace extends Application {
return s_config;
}
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.Workspace";
+ "com.arsdigita.portalworkspace.Workspace";
public static final String PARTY = "party";
public static final String PARTY_ID = PARTY + "." + ACSObject.ID;
public static final String DEFAULT_LAYOUT = "defaultLayout";
@@ -99,8 +100,9 @@ public class Workspace extends Application {
}
/*
- * public String getContextPath() { return "ccm-ldn-portal"; }
+ * public String getContextPath() { return "ccm-portalworkspace"; }
*/
+
/**
*
* @return ServletPath (constant) probably should be synchron with web.xml
@@ -109,7 +111,7 @@ public class Workspace extends Application {
@Override
public String getServletPath() {
// return "/files";
- return "/ccm-ldn-portal/files";
+ return "/ccm-portalworkspace/files";
}
/**
@@ -466,9 +468,9 @@ public class Workspace extends Application {
SessionManager.getSession().retrieve(
"com.arsdigita.kernel.User");
// .retrieve("com.arsdigita.kernel.Party");
- Filter f =
- dc.addNotInSubqueryFilter("id",
- "com.arsdigita.london.portal.WorkspaceParticipantIDs");
+ Filter f = dc.addNotInSubqueryFilter(
+ "id",
+ "com.arsdigita.london.portal.WorkspaceParticipantIDs");
f.set("workspaceID", getID());
return new PartyCollection(dc);
}
@@ -521,8 +523,9 @@ public class Workspace extends Application {
SessionManager.getSession().retrieve(
"com.arsdigita.kernel.User");
Filter f =
- dc.addInSubqueryFilter("id",
- "com.arsdigita.london.portal.WorkspaceParticipantsWithInitial");
+ dc.addInSubqueryFilter(
+ "id",
+ "com.arsdigita.portalworkspace.WorkspaceParticipantsWithInitial");
f.set("workspaceID", getID());
f.set("nameInitial", initial);
@@ -750,7 +753,8 @@ public class Workspace extends Application {
personalWorkspaces.addEqualsFilter("owner", owner.getID());
if (personalWorkspaces.next()) {
- Workspace workspace = (Workspace) Application.retrieveApplication(personalWorkspaces.
+ Workspace workspace = (Workspace) Application
+ .retrieveApplication(personalWorkspaces.
getDataObject());
if (personalWorkspaces.next()) {
s_log.error("more than one personal workspaces for this user!!");
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceCollection.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceCollection.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceCollection.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceCollection.java
index 8d8316159..f29898a02 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceCollection.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceCollection.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import com.arsdigita.domain.DomainCollection;
import com.arsdigita.persistence.DataCollection;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig.java
similarity index 89%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig.java
index df62dd49c..9a8161d87 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.runtime.AbstractConfig;
@@ -61,52 +61,52 @@ public class WorkspaceConfig extends AbstractConfig {
/** File with rules for configuring information in generated XML */
private final Parameter m_adapters =
new ResourceParameter(
- "com.arsdigita.london.portal.traversal_adapters",
+ "com.arsdigita.portalworkspace.traversal_adapters",
Parameter.REQUIRED,
- "/WEB-INF/resources/portal-adapters.xml");
+ "/WEB-INF/resources/portalworkspace-adapters.xml");
/** Default column layout for workspace portals */
private final Parameter m_defaultLayout =
new StringParameter(
- "com.arsdigita.london.portal.default_layout",
+ "com.arsdigita.portalworkspace.default_layout",
Parameter.REQUIRED, PageLayout.FORMAT_THREE_COLUMNS);
/** Whether non-admin users should have their own custom workspaces */
private final Parameter m_createUserWorkspaces =
new BooleanParameter(
- "com.arsdigita.portal.create_user_workspaces",
+ "com.arsdigita.portalworkspace.create_user_workspaces",
Parameter.REQUIRED, Boolean.TRUE);
/** Types not to be included in the drop down list of portlets to add to a page*/
private final Parameter m_excludedPortletTypes =
new StringArrayParameter(
- "com.arsdigita.london.portal.excluded_portlet_types",
+ "com.arsdigita.portalworkspace.excluded_portlet_types",
Parameter.OPTIONAL, new String[0]);
/** Types only available to administrator of homepage, or subsite frontpage*/
private final Parameter m_adminPortletTypes =
new StringArrayParameter(
- "com.arsdigita.london.portal.admin_only_portlet_types",
+ "com.arsdigita.portalworkspace.admin_only_portlet_types",
Parameter.OPTIONAL, new String[0]);
/** Whether to use editor specified by waf.bebop.dhtml_editor for editing
freeform html portlet*/
private final Parameter m_htmlPortletWysiwygEditor =
new BooleanParameter(
- "com.arsdigita.london.portal.portlet.freeform_html_editor",
+ "com.arsdigita.portalworkspace.portlet.freeform_html_editor",
Parameter.REQUIRED, Boolean.FALSE);
/** Which privilege ("read" or "edit") is granted to the workspace party. */
private final Parameter m_workspacePartyPrivilege =
new StringParameter(
- "com.arsdigita.london.portal.workspacePartyPrivilege",
+ "com.arsdigita.portalworkspace.workspacePartyPrivilege",
Parameter.OPTIONAL, "read");
/** Whether READ permissions will be checked when viewing workspaces.
By default we don't, which is odd. */
private final Parameter m_checkWorkspaceReadPermissions =
new BooleanParameter(
- "com.arsdigita.london.portal.checkWorkspaceReadPermissions",
+ "com.arsdigita.portalworkspace.checkWorkspaceReadPermissions",
Parameter.OPTIONAL, Boolean.FALSE);
public WorkspaceConfig() {
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig_parameter.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig_parameter.properties
new file mode 100755
index 000000000..53eaa41c7
--- /dev/null
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceConfig_parameter.properties
@@ -0,0 +1,39 @@
+com.arsdigita.portalworkspace.traversal_adapters.title=XML renderer rules
+com.arsdigita.portalworkspace.traversal_adapters.purpose=Name of File with rules for configuring information in generated XML
+com.arsdigita.portalworkspace.traversal_adapters.format=[string]
+com.arsdigita.portalworkspace.traversal_adapters.example=/WEB-INF/resources/portalworkspace-adapters.xml
+
+com.arsdigita.portalworkspace.default_layout.title=Default workspace layout
+com.arsdigita.portalworkspace.default_layout.purpose=Default column layout for workspace portals
+com.arsdigita.portalworkspace.default_layout.format=[layout]
+com.arsdigita.portalworkspace.default_layout.example=25%,25%,25%,25%
+
+com.arsdigita.portalworkspace.create_user_workspaces.title=Create user workspaces
+com.arsdigita.portalworkspace.create_user_workspaces.purpose=Whether non-admin users should have their own custom workspaces
+com.arsdigita.portalworkspace.create_user_workspaces.format=[boolean]
+com.arsdigita.portalworkspace.create_user_workspaces.example=false
+
+com.arsdigita.portalworkspace.excluded_portlet_types.title=Portlet types not available on this site
+com.arsdigita.portalworkspace.excluded_portlet_types.purpose=Prevent these type appearing in the drop down list of portlets to add to the page
+com.arsdigita.portalworkspace.excluded_portlet_types.format=[string,string,string]
+com.arsdigita.portalworkspace.excluded_portlet_types.example=com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet,com.arsdigita.london.portal.portlet.TimeOfDayPortlet
+
+com.arsdigita.portalworkspace.admin_only_portlet_types.title=Portlet types only available to page admin
+com.arsdigita.portalworkspace.admin_only_portlet_types.purpose=Only available to administrator of homepage, or subsite frontpage
+com.arsdigita.portalworkspace.admin_only_portlet_types.format=[string,string,string]
+com.arsdigita.portalworkspace.admin_only_portlet_types.example=com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet,com.arsdigita.london.portal.portlet.TimeOfDayPortlet
+
+com.arsdigita.portalworkspace.portlet.freeform_html_editor.title=use wysiwyg editor for freeform html portlet
+com.arsdigita.portalworkspace.portlet.freeform_html_editor.purpose=If true, use editor specified by waf.bebop.dhtml_editor when user edits freeform html portlet
+com.arsdigita.portalworkspace.portlet.freeform_html_editor.format=[boolean]
+com.arsdigita.portalworkspace.portal.portlet.freeform_html_editor.example=false
+
+com.arsdigita.portalworkspace.workspacePartyPrivilege.title=Privilege granted to the workspace party
+com.arsdigita.portalworkspace.workspacePartyPrivilege.purpose=Specify which privilege is granted to the workspace party. Should be "read" or "edit".
+com.arsdigita.portalworkspace.workspacePartyPrivilege.format=[string]
+com.arsdigita.portalworkspace.workspacePartyPrivilege.example=edit
+
+com.arsdigita.portalworkspace.checkWorkspaceReadPermissions.title=Check READ permissions when viewing Workspaces
+com.arsdigita.portalworkspace.checkWorkspaceReadPermissions.purpose=Specify whether we should check READ permissions when viewing workspaces. By default we don't, which is odd.
+com.arsdigita.portalworkspace.checkWorkspaceReadPermissions.format=[boolean]
+com.arsdigita.portalworkspace.checkWorkspaceReadPermissions.example=false
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspacePage.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspacePage.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspacePage.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspacePage.java
index 2077483e6..883c2fcf3 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspacePage.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspacePage.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.Resource;
@@ -24,6 +24,10 @@ import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
import com.arsdigita.portal.Portal;
+/**
+ *
+ *
+ */
public class WorkspacePage extends Portal {
public static final String SORT_KEY = "sortKey";
@@ -33,7 +37,7 @@ public class WorkspacePage extends Portal {
public static final String WORKSPACE = "workspace";
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.WorkspacePage";
+ "com.arsdigita.portalworkspace.WorkspacePage";
public WorkspacePage() {
this(BASE_DATA_OBJECT_TYPE);
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspacePageCollection.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspacePageCollection.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspacePageCollection.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspacePageCollection.java
index 9ab34d1d4..78c45ba6b 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspacePageCollection.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspacePageCollection.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal;
+package com.arsdigita.portalworkspace;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.portal.PortalCollection;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties
similarity index 100%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources.properties
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_de.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties
similarity index 100%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_de.properties
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_en.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties
similarity index 100%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_en.properties
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_fr.properties b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties
similarity index 100%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalResources_fr.properties
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/package.html b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/package.html
similarity index 100%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/package.html
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/package.html
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/ApplicationDirectoryPortlet.java
similarity index 84%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/ApplicationDirectoryPortlet.java
index 1e5c3fc13..55fd51ac4 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ApplicationDirectoryPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/ApplicationDirectoryPortlet.java
@@ -13,10 +13,10 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.portlet.ApplicationDirectoryPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.ApplicationDirectoryPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -28,7 +28,7 @@ import com.arsdigita.portal.Portlet;
public class ApplicationDirectoryPortlet extends Portlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet";
+ "com.arsdigita.portalworkspace.portlet.ApplicationDirectoryPortlet";
public static final String CONTENT = "content";
@@ -36,10 +36,12 @@ public class ApplicationDirectoryPortlet extends Portlet {
super(dataObject);
}
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new ApplicationDirectoryPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/ContentDirectoryPortlet.java
similarity index 91%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/ContentDirectoryPortlet.java
index 5043754b7..313b48384 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/ContentDirectoryPortlet.java
@@ -16,12 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
import com.arsdigita.categorization.Category;
import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.portal.ui.portlet.ContentDirectoryPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.ContentDirectoryPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -35,7 +35,7 @@ import com.arsdigita.portal.Portlet;
public class ContentDirectoryPortlet extends Portlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.ContentDirectoryPortlet";
+ "com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet";
public static final String ROOT = "root";
@@ -51,10 +51,12 @@ public class ContentDirectoryPortlet extends Portlet {
super(dataObject);
}
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new ContentDirectoryPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FlashPortlet.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FlashPortlet.java
index 4411d979d..2b5cc14a7 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FlashPortlet.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import java.io.IOException;
import java.io.StringBufferInputStream;
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Properties;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.portlet.FlashPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.FlashPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -37,7 +37,7 @@ import com.arsdigita.portal.Portlet;
public class FlashPortlet extends Portlet
{
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.FlashPortlet";
+ "com.arsdigita.portalworkspace.portlet.FlashPortlet";
public static final String BACKGROUND_COLOUR = "backgroundColour";
@@ -66,11 +66,13 @@ public class FlashPortlet extends Portlet
super(dataObject);
}
+ @Override
protected String getBaseDataObjectType()
{
return BASE_DATA_OBJECT_TYPE;
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer()
{
return new FlashPortletRenderer(this);
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FlashPortletInitializer.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FlashPortletInitializer.java
index 9a4367b75..55183470d 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FlashPortletInitializer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FlashPortletInitializer.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.domain.DomainObject;
@@ -25,7 +25,7 @@ import com.arsdigita.kernel.ACSObjectInstantiator;
import com.arsdigita.kernel.ResourceType;
import com.arsdigita.kernel.ResourceTypeConfig;
import com.arsdigita.kernel.ui.ResourceConfigFormSection;
-import com.arsdigita.london.portal.ui.portlet.FlashPortletEditor;
+import com.arsdigita.portalworkspace.ui.portlet.FlashPortletEditor;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.PortletType;
@@ -56,6 +56,7 @@ public final class FlashPortletInitializer
DomainObjectFactory.registerInstantiator(
FlashPortlet.BASE_DATA_OBJECT_TYPE, new ACSObjectInstantiator()
{
+ @Override
public DomainObject doNewInstance(DataObject dataObject)
{
return new FlashPortlet(dataObject);
@@ -64,6 +65,7 @@ public final class FlashPortletInitializer
new ResourceTypeConfig(FlashPortlet.BASE_DATA_OBJECT_TYPE)
{
+ @Override
public ResourceConfigFormSection getCreateFormSection(
final ResourceType resType,
final RequestLocal parentAppRL)
@@ -71,6 +73,7 @@ public final class FlashPortletInitializer
return new FlashPortletEditor(resType, parentAppRL);
}
+ @Override
public ResourceConfigFormSection getModifyFormSection(
final RequestLocal application)
{
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FreeformHTMLPortlet.java
similarity index 85%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FreeformHTMLPortlet.java
index 6bdcbb316..832e5824a 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/FreeformHTMLPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/FreeformHTMLPortlet.java
@@ -13,10 +13,10 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.portlet.FreeformHTMLPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.FreeformHTMLPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -28,7 +28,7 @@ import com.arsdigita.portal.Portlet;
public class FreeformHTMLPortlet extends Portlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.FreeformHTMLPortlet";
+ "com.arsdigita.portalworkspace.portlet.FreeformHTMLPortlet";
public static final String CONTENT = "content";
@@ -36,6 +36,7 @@ public class FreeformHTMLPortlet extends Portlet {
super(dataObject);
}
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
@@ -48,6 +49,7 @@ public class FreeformHTMLPortlet extends Portlet {
set(CONTENT, text);
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new FreeformHTMLPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/LoginPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/LoginPortlet.java
similarity index 85%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/LoginPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/LoginPortlet.java
index 3e4abfaf2..a680722d3 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/LoginPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/LoginPortlet.java
@@ -13,10 +13,10 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.portlet.LoginPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.LoginPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -27,7 +27,7 @@ import com.arsdigita.portal.Portlet;
public class LoginPortlet extends Portlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.LoginPortlet";
+ "com.arsdigita.portalworkspace.portlet.LoginPortlet";
/**
@@ -44,6 +44,7 @@ public class LoginPortlet extends Portlet {
*
* @return String BaseDataObjectType
*/
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
@@ -52,6 +53,7 @@ public class LoginPortlet extends Portlet {
*
* @return
*/
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new LoginPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/MyWorkspacesPortlet.java
similarity index 93%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/MyWorkspacesPortlet.java
index ef7e3720a..eeee1f870 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/MyWorkspacesPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/MyWorkspacesPortlet.java
@@ -13,21 +13,21 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
-import com.arsdigita.bebop.portal.AbstractPortletRenderer;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.GridPanel;
import com.arsdigita.bebop.PageState;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.bebop.portal.AbstractPortletRenderer;
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.Party;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.portal.apportlet.AppPortlet;
-import com.arsdigita.kernel.Kernel;
-import com.arsdigita.kernel.Party;
import com.arsdigita.util.Assert;
import com.arsdigita.web.Application;
import com.arsdigita.xml.Element;
@@ -35,8 +35,9 @@ import com.arsdigita.xml.Element;
public class MyWorkspacesPortlet extends AppPortlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.MyWorkspacesPortlet";
+ "com.arsdigita.portalworkspace.portlet.MyWorkspacesPortlet";
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
@@ -45,6 +46,7 @@ public class MyWorkspacesPortlet extends AppPortlet {
super(dataObject);
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new MyWorkspacesPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/RSSFeedPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/RSSFeedPortlet.java
similarity index 82%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/RSSFeedPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/RSSFeedPortlet.java
index 76ac8ba7d..2ca8f24c0 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/RSSFeedPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/RSSFeedPortlet.java
@@ -13,10 +13,10 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.RSSFeedPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -27,7 +27,8 @@ import com.arsdigita.portal.Portlet;
*/
public class RSSFeedPortlet extends Portlet {
- public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.portlet.RSSFeedPortlet";
+ public static final String BASE_DATA_OBJECT_TYPE =
+ "com.arsdigita.portalworkspace.portlet.RSSFeedPortlet";
public static final String URL = "url";
@@ -35,6 +36,7 @@ public class RSSFeedPortlet extends Portlet {
super(dataObject);
}
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
@@ -47,6 +49,7 @@ public class RSSFeedPortlet extends Portlet {
set(URL, item);
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new RSSFeedPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/RSSFeedPortletHelper.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/RSSFeedPortletHelper.java
similarity index 99%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/RSSFeedPortletHelper.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/RSSFeedPortletHelper.java
index f666fc593..bd488fbf5 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/RSSFeedPortletHelper.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/RSSFeedPortletHelper.java
@@ -12,7 +12,7 @@
* rights and limitations under the License.
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import java.io.IOException;
import java.io.InputStream;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/TimeOfDayPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/TimeOfDayPortlet.java
similarity index 79%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/TimeOfDayPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/TimeOfDayPortlet.java
index 8494a2b9f..6d30caa84 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/TimeOfDayPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/TimeOfDayPortlet.java
@@ -13,10 +13,10 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.ui.portlet.TimeOfDayPortletRenderer;
+import com.arsdigita.portalworkspace.ui.portlet.TimeOfDayPortletRenderer;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.Portlet;
@@ -27,16 +27,19 @@ import com.arsdigita.portal.Portlet;
*/
public class TimeOfDayPortlet extends Portlet {
- public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.portlet.TimeOfDayPortlet";
+ public static final String BASE_DATA_OBJECT_TYPE =
+ "com.arsdigita.portalworkspace.portlet.TimeOfDayPortlet";
public TimeOfDayPortlet(DataObject dataObject) {
super(dataObject);
}
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new TimeOfDayPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceNavigatorPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/WorkspaceNavigatorPortlet.java
similarity index 90%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceNavigatorPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/WorkspaceNavigatorPortlet.java
index 04c06e794..d64efbd4a 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceNavigatorPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/WorkspaceNavigatorPortlet.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.BlockStylable;
import com.arsdigita.bebop.GridPanel;
@@ -21,9 +21,9 @@ import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspaceCollection;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspaceCollection;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.portal.apportlet.AppPortlet;
import com.arsdigita.web.Application;
@@ -33,14 +33,15 @@ import com.arsdigita.xml.Element;
* WorkspaceNavigatorPortlet.
*
* @author dennis (2003/08/15)
- * @version $Id: //portalserver/dev/src/com/arsdigita/portalserver/WorkspaceNavigatorPortlet.java $
+ * @version $Id: WorkspaceNavigatorPortlet.java pboy $
*/
public class WorkspaceNavigatorPortlet extends AppPortlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.WorkspaceNavigatorPortlet";
+ "com.arsdigita.portalworkspace.portlet.WorkspaceNavigatorPortlet";
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
@@ -49,6 +50,7 @@ public class WorkspaceNavigatorPortlet extends AppPortlet {
super(dataObject);
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new WorkspaceNavigatorPortletRenderer(this);
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/WorkspaceSummaryPortlet.java
similarity index 83%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/WorkspaceSummaryPortlet.java
index 6a9fadb51..c4c63baa7 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/portlet/WorkspaceSummaryPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/portlet/WorkspaceSummaryPortlet.java
@@ -13,25 +13,25 @@
*
*/
-package com.arsdigita.london.portal.portlet;
+package com.arsdigita.portalworkspace.portlet;
import com.arsdigita.bebop.Label;
-import com.arsdigita.bebop.Link;
+// import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.ListPanel;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SegmentedPanel;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.PartyCollection;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspaceCollection;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+// import com.arsdigita.london.portal.WorkspaceCollection;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.DataQuery;
-import com.arsdigita.persistence.SessionManager;
+// import com.arsdigita.persistence.DataQuery;
+// import com.arsdigita.persistence.SessionManager;
import com.arsdigita.portal.apportlet.AppPortlet;
-import com.arsdigita.web.Application;
-import com.arsdigita.web.URL;
+// import com.arsdigita.web.Application;
+// import com.arsdigita.web.URL;
import com.arsdigita.xml.Element;
/**
@@ -39,15 +39,16 @@ import com.arsdigita.xml.Element;
*
*
* @author dennis (2003/08/15)
- * @version $Id: //portalserver/dev/src/com/arsdigita/portalserver/WorkspaceSummaryPortlet.java $
+ * @version $Id: WorkspaceSummaryPortlet.java pboy $
*/
public class WorkspaceSummaryPortlet extends AppPortlet {
public static final String BASE_DATA_OBJECT_TYPE =
- "com.arsdigita.london.portal.portlet.WorkspaceSummaryPortlet";
+ "com.arsdigita.portalworkspace.portlet.WorkspaceSummaryPortlet";
private static final int MAX_PARTICIPANTS_FOR_LISTING = 15;
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
@@ -56,6 +57,7 @@ public class WorkspaceSummaryPortlet extends AppPortlet {
super(dataObject);
}
+ @Override
protected AbstractPortletRenderer doGetPortletRenderer() {
return new WorkspaceSummaryPortletRenderer(this);
}
@@ -114,7 +116,10 @@ public class WorkspaceSummaryPortlet extends AppPortlet {
}
// }
- //Link searchLink = new Link( new Label(GlobalizationUtil.globalize("cw.workspace.search_participants")), "participants/");
+ //Link searchLink = new Link(
+ // new Label(GlobalizationUtil
+ // .globalize("cw.workspace.search_participants")),
+ // "participants/");
//searchLink.addURLVars("action", "search");
//participants.add(searchLink);
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/AbstractWorkspaceComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/AbstractWorkspaceComponent.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/AbstractWorkspaceComponent.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/AbstractWorkspaceComponent.java
index 4eb84eff8..5c3fd29db 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/AbstractWorkspaceComponent.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/AbstractWorkspaceComponent.java
@@ -13,13 +13,13 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
public abstract class AbstractWorkspaceComponent extends SimpleContainer {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationPortlet.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationPortlet.java
index 337ad2d21..cb418e788 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationPortlet.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.PageState;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java
index 01f0af6d8..cc7d94a24 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ApplicationSelector.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.PageState;
@@ -69,7 +69,8 @@ public class ApplicationSelector extends Form {
m_app = app;
m_privilege = privilege;
- s_log.debug("displayed applications will be filtered by privilege " + m_privilege);
+ s_log.debug("displayed applications will be filtered by privilege " +
+ m_privilege);
m_apps = new SingleSelect(new DomainObjectParameter("apps"));
m_apps.addValidationListener(new NotNullValidationListener());
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ColorPicker.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ColorPicker.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ColorPicker.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ColorPicker.java
index 9becec057..ba9258af3 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ColorPicker.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ColorPicker.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.FormSection;
import com.arsdigita.bebop.Label;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultPortalSelectionModel.java
similarity index 92%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultPortalSelectionModel.java
index 50a0fa486..715093344 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultPortalSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultPortalSelectionModel.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -21,9 +21,9 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.domain.DomainObject;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-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;
public class DefaultPortalSelectionModel extends ACSObjectSelectionModel
implements PortalSelectionModel {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultWorkspace.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultWorkspace.java
index 3f5e3c6c5..ff5bc0da9 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspace.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultWorkspace.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -28,9 +28,9 @@ import com.arsdigita.kernel.User;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PermissionService;
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.util.DomainObjectCopier;
import com.arsdigita.portal.Portlet;
import com.arsdigita.portal.PortletCollection;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspaceSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultWorkspaceSelectionModel.java
similarity index 92%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspaceSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultWorkspaceSelectionModel.java
index b4c2fda29..6729b7eaf 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/DefaultWorkspaceSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/DefaultWorkspaceSelectionModel.java
@@ -13,13 +13,13 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
public class DefaultWorkspaceSelectionModel extends WorkspaceSelectionModel {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/Icons.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/Icons.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java
index b44e856b1..946da76ba 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/Icons.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Image;
import org.apache.log4j.Logger;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/LayoutForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/LayoutForm.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/LayoutForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/LayoutForm.java
index 822158bb3..28c34900e 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/LayoutForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/LayoutForm.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.util.TooManyListenersException;
@@ -37,9 +37,9 @@ import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.PageLayout;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.PageLayout;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.persistence.OID;
import com.arsdigita.toolbox.ui.OIDParameter;
import com.arsdigita.util.Assert;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PackageWorkspace.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PackageWorkspace.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PackageWorkspace.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PackageWorkspace.java
index 72e0f0eb0..1720abaee 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PackageWorkspace.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PackageWorkspace.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.Container;
@@ -24,7 +24,7 @@ import com.arsdigita.bebop.event.ActionListener;
import com.arsdigita.dispatcher.AccessDeniedException;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.toolbox.ui.SecurityContainer;
import com.arsdigita.web.LoginSignal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PackageWorkspaceSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PackageWorkspaceSelectionModel.java
similarity index 90%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PackageWorkspaceSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PackageWorkspaceSelectionModel.java
index 9da9aaf3b..aee552953 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PackageWorkspaceSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PackageWorkspaceSelectionModel.java
@@ -13,11 +13,11 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.kernel.Kernel;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
public class PackageWorkspaceSelectionModel extends WorkspaceSelectionModel {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantBrowsePane.java
similarity index 99%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantBrowsePane.java
index 6d03c1d44..155c42097 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantBrowsePane.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantBrowsePane.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
//import com.arsdigita.portalserver.Role;
//import com.arsdigita.portalserver.RoleCollection;
@@ -29,8 +29,8 @@ import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.kernel.*;
import com.arsdigita.kernel.permissions.*;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.persistence.OID;
import com.arsdigita.toolbox.ui.PrivilegedComponentSelector;
import com.arsdigita.toolbox.ui.IteratorListModel;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantDisplay.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantDisplay.java
index 3e8109a6c..6732fbf67 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantDisplay.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantDisplay.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.*;
// import com.arsdigita.bebop.event.*;
@@ -22,8 +22,8 @@ import com.arsdigita.bebop.*;
// import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.kernel.*;
// import com.arsdigita.kernel.permissions.*;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
import org.apache.log4j.Category;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantEdit.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantEdit.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java
index 24063d139..34df5bd60 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantEdit.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.*;
import com.arsdigita.bebop.event.*;
@@ -28,9 +28,9 @@ import com.arsdigita.bebop.table.TableColumn;
import com.arsdigita.toolbox.ui.IteratorListModel;
import com.arsdigita.domain.DomainCollectionIterator;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.london.portal.ui.admin.PartyPermissionEdit;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.ui.admin.PartyPermissionEdit;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
import java.math.BigDecimal;
import java.util.Iterator;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantListModel.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantListModel.java
index b53417115..944e6944e 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantListModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantListModel.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
// import com.arsdigita.bebop.*;
// import com.arsdigita.bebop.event.*;
@@ -23,7 +23,7 @@ import com.arsdigita.bebop.list.ListModel;
import com.arsdigita.kernel.*;
// import com.arsdigita.kernel.permissions.*;
// import com.arsdigita.london.portal.util.GlobalizationUtil;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
import org.apache.log4j.Category;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantModel.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantModel.java
index 9c37e8d1f..bc9df349d 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/ParticipantModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantModel.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.*;
// import com.arsdigita.bebop.event.*;
@@ -22,8 +22,8 @@ import com.arsdigita.bebop.*;
// import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.kernel.*;
// import com.arsdigita.kernel.permissions.*;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.globalization.GlobalizedMessage;
import org.apache.log4j.Category;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersistentPortal.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PersistentPortal.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersistentPortal.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PersistentPortal.java
index 683b32a16..88c8a10a5 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersistentPortal.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PersistentPortal.java
@@ -13,12 +13,12 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
-import com.arsdigita.london.portal.StatefulPersistentPortal;
-import com.arsdigita.london.portal.StatefulPortlet;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.StatefulPersistentPortal;
+import com.arsdigita.portalworkspace.StatefulPortlet;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.bebop.ParameterSingleSelectionModel;
import com.arsdigita.bebop.SingleSelectionModel;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PersonalPortalPage.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PersonalPortalPage.java
index 64dfa336d..568299e50 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PersonalPortalPage.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.event.RequestEvent;
@@ -10,8 +10,8 @@ import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.User;
// import com.arsdigita.kernel.security.LegacyInitializer;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.ui.UI;
import com.arsdigita.web.Application;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalConstants.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalConstants.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalConstants.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalConstants.java
index f9099c659..34e7aad20 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalConstants.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalConstants.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
/**
*
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalEditForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalEditForm.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalEditForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalEditForm.java
index 2cb329a73..49a3a4bb2 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalEditForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalEditForm.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.PageState;
@@ -29,8 +29,8 @@ import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.dispatcher.AccessDeniedException;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.util.Assert;
/**
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalEditModelBuilder.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalEditModelBuilder.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalEditModelBuilder.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalEditModelBuilder.java
index ae0013209..23de06a67 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalEditModelBuilder.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalEditModelBuilder.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.util.ArrayList;
import java.util.HashMap;
@@ -31,7 +31,7 @@ import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.portal.PortalModel;
import com.arsdigita.bebop.portal.PortalModelBuilder;
import com.arsdigita.bebop.portal.PortletRenderer;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.portal.PortletCollection;
import com.arsdigita.portal.PortletType;
import com.arsdigita.util.Assert;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalHelper.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalHelper.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java
index 52d0b5f5b..92e43a3e0 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalHelper.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalHelper.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.kernel.Party;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalList.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalList.java
index 72dae0ddf..60263cdae 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalList.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalList.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.io.IOException;
import java.util.HashMap;
@@ -25,9 +25,9 @@ import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
import com.arsdigita.domain.DomainObjectXMLRenderer;
-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.util.UncheckedWrapperException;
import com.arsdigita.xml.Element;
import com.arsdigita.xml.XML;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalListEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalListEditor.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalListEditor.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalListEditor.java
index b4498c186..41ac6a1e1 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalListEditor.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalListEditor.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -26,8 +26,8 @@ import com.arsdigita.dispatcher.AccessDeniedException;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.persistence.OID;
public class PortalListEditor extends PortalListViewer {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalListViewer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalListViewer.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalListViewer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalListViewer.java
index c73e02a60..9bdbb35e4 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalListViewer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalListViewer.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -23,7 +23,7 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.persistence.OID;
public class PortalListViewer extends PortalList {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalSelectionModel.java
similarity index 89%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalSelectionModel.java
index ac03e1a69..eba668480 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalSelectionModel.java
@@ -13,11 +13,11 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.kernel.ui.DomainObjectSelectionModel;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.WorkspacePage;
public interface PortalSelectionModel extends DomainObjectSelectionModel {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalViewModelBuilder.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalViewModelBuilder.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalViewModelBuilder.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalViewModelBuilder.java
index ad55d64c4..5a4667f39 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortalViewModelBuilder.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortalViewModelBuilder.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.util.ArrayList;
import java.util.Iterator;
@@ -26,7 +26,7 @@ import org.apache.log4j.Logger;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.PortalModel;
import com.arsdigita.bebop.portal.PortalModelBuilder;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.portal.PortletCollection;
import com.arsdigita.util.LockableImpl;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletConfigFormSection.java.nolongerInUse b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletConfigFormSection.java.nolongerInUse
similarity index 100%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletConfigFormSection.java.nolongerInUse
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletConfigFormSection.java.nolongerInUse
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletSelectionModel.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletSelectionModel.java
index f2598d5d6..121447bb3 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletSelectionModel.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java
index 2510cd145..9824476a1 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeForm.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
import java.util.List;
@@ -37,7 +37,7 @@ import com.arsdigita.kernel.User;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.london.subsite.Subsite;
import com.arsdigita.persistence.Filter;
import com.arsdigita.portal.PortletType;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeSelectionModel.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeSelectionModel.java
index f7100545d..abf2555fa 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PortletTypeSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/PortletTypeSelectionModel.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/SimplePortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/SimplePortlet.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/SimplePortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/SimplePortlet.java
index ba0a537de..d25deba6b 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/SimplePortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/SimplePortlet.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.PageState;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/UserWorkspace.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/UserWorkspace.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/UserWorkspace.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/UserWorkspace.java
index 7ef98fbe1..1556b054c 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/UserWorkspace.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/UserWorkspace.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
public class UserWorkspace extends WorkspaceComponent {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/UserWorkspaceSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/UserWorkspaceSelectionModel.java
similarity index 93%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/UserWorkspaceSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/UserWorkspaceSelectionModel.java
index 5dfe025c2..ef38b04ac 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/UserWorkspaceSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/UserWorkspaceSelectionModel.java
@@ -13,13 +13,13 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.LoginSignal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceComponent.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java
index 1bf82b472..58248a05c 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceComponent.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceComponent.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.util.Iterator;
@@ -33,8 +33,8 @@ import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspacePage;
import com.arsdigita.util.Assert;
import com.arsdigita.web.RedirectSignal;
import com.arsdigita.web.URL;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceDetails.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceDetails.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceDetails.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceDetails.java
index 6ea305fd2..8e024fdf9 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceDetails.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceDetails.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleComponent;
@@ -26,7 +26,7 @@ import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.xml.Element;
import com.arsdigita.xml.XML;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceEditor.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceEditor.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceEditor.java
index 9b1980864..cced5e961 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceEditor.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceEditor.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -42,9 +42,9 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.dispatcher.AccessDeniedException;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspacePage;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspacePage;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
public class WorkspaceEditor extends AbstractWorkspaceComponent {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceSelectionModel.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceSelectionModel.java
index 9710d7a9a..d9620da07 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceSelectionModel.java
@@ -13,11 +13,11 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.RequestLocal;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
/**
*
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceTheme.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceTheme.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceTheme.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceTheme.java
index 0ec8c66f9..f9d7ea6df 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceTheme.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceTheme.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -49,8 +49,10 @@ public class WorkspaceTheme extends ACSObject implements WorkspaceThemes {
* The type of the {@link com.arsdigita.persistence.DataObject} that stands
* behind this {@link com.arsdigita.domain.DomainObject}.
*/
- public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.london.portal.WorkspaceTheme";
+ public static final String BASE_DATA_OBJECT_TYPE =
+ "com.arsdigita.portalworkspace.WorkspaceTheme";
+ @Override
protected String getBaseDataObjectType() {
return BASE_DATA_OBJECT_TYPE;
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceThemeCollection.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceThemeCollection.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceThemeCollection.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceThemeCollection.java
index a9ff99203..c80b253e4 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceThemeCollection.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceThemeCollection.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
import java.math.BigDecimal;
@@ -32,6 +32,7 @@ public class WorkspaceThemeCollection extends DomainCollection {
*
* @return the domain object for the current row.
*/
+ @Override
public DomainObject getDomainObject() {
DomainObject domainObject = getWorkspaceTheme();
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceThemes.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceThemes.java
similarity index 86%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceThemes.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceThemes.java
index b02bb8354..0af120fc4 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceThemes.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceThemes.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
public interface WorkspaceThemes {
/**
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceViewer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceViewer.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceViewer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceViewer.java
index 75b9d62ac..27c6addd2 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/WorkspaceViewer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/WorkspaceViewer.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui;
+package com.arsdigita.portalworkspace.ui;
public class WorkspaceViewer extends AbstractWorkspaceComponent {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/AddGrantForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AddGrantForm.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/AddGrantForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AddGrantForm.java
index 95fe12852..0249b8033 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/AddGrantForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AddGrantForm.java
@@ -13,9 +13,9 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.persistence.*;
import com.arsdigita.kernel.*;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/AdminPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/AdminPane.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java
index cf5f33b86..4d1853490 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/AdminPane.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/AdminPane.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
@@ -23,8 +23,8 @@ import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Role;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
public class AdminPane extends SimpleContainer {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationDetails.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationDetails.java
similarity index 94%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationDetails.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationDetails.java
index fda20fa70..aadae4acb 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationDetails.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationDetails.java
@@ -16,14 +16,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.domain.DomainObjectXMLRenderer;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.web.Application;
import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationList.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationList.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationList.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationList.java
index 29c98ab94..cd56147bb 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationList.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationList.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.io.IOException;
@@ -26,7 +26,7 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainObjectXMLRenderer;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.OID;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Application;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationPane.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
index 579b04d46..556e083c6 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationPane.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationPane.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.util.HashMap;
import java.util.Iterator;
@@ -33,7 +33,7 @@ import com.arsdigita.bebop.event.ActionListener;
import com.arsdigita.categorization.Category;
import com.arsdigita.kernel.Resource;
import com.arsdigita.kernel.ui.ResourceConfigComponent;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.OID;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationType;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationSelectionModel.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationSelectionModel.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java
index 8a270f5d1..385639c82 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ApplicationSelectionModel.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ApplicationSelectionModel.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/CategoryComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/CategoryComponent.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java
index 89b32b25d..2bb5cf183 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/CategoryComponent.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryComponent.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
@@ -32,8 +32,8 @@ import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryTreeModelLite;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.Filter;
import com.arsdigita.persistence.SessionManager;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/CategoryTable.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/CategoryTable.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java
index ddc82c078..186a9a092 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/CategoryTable.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/CategoryTable.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.math.BigDecimal;
@@ -36,7 +36,7 @@ import com.arsdigita.categorization.Category;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainCollection;
import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.london.portal.Workspace;
+import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/DeleteApplicationComponent.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/DeleteApplicationComponent.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java
index eda6de5a7..1d2f671aa 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/DeleteApplicationComponent.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/DeleteApplicationComponent.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
@@ -10,9 +10,9 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.event.ActionEvent;
import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.categorization.Category;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationType;
import com.arsdigita.web.RedirectSignal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ErrorMessageDisplay.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ErrorMessageDisplay.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ErrorMessageDisplay.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ErrorMessageDisplay.java
index bb0c983f6..e2d6c4da2 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/ErrorMessageDisplay.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/ErrorMessageDisplay.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import com.arsdigita.bebop.*;
import com.arsdigita.bebop.event.*;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/Grant.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/Grant.java
similarity index 99%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/Grant.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/Grant.java
index 7bc637c3c..07fbe2f0e 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/Grant.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/Grant.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.math.BigDecimal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GrantsTable.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GrantsTable.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GrantsTable.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GrantsTable.java
index dfd91bc80..124a32d67 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GrantsTable.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GrantsTable.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.RequestLocal;
@@ -34,8 +34,8 @@ import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.kernel.permissions.PermissionDescriptor;
//import com.arsdigita.kernel.permissions.ParameterizedPrivilege;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
-import com.arsdigita.london.portal.ui.Icons;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.ui.Icons;
import com.arsdigita.persistence.OID;
import java.util.Iterator;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GroupMemberDisplay.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GroupMemberDisplay.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GroupMemberDisplay.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GroupMemberDisplay.java
index 470c0dadb..646540e8b 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GroupMemberDisplay.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GroupMemberDisplay.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.math.BigDecimal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GroupMemberPicker.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GroupMemberPicker.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GroupMemberPicker.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GroupMemberPicker.java
index 1f5f617c8..efef1d550 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/GroupMemberPicker.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/GroupMemberPicker.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.math.BigDecimal;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/NewApplicationForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/NewApplicationForm.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/NewApplicationForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/NewApplicationForm.java
index 7afd5d039..9c07a6794 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/NewApplicationForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/NewApplicationForm.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormProcessException;
@@ -29,7 +29,7 @@ import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.Submit;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.OID;
import com.arsdigita.toolbox.ui.OIDParameter;
import com.arsdigita.web.ApplicationType;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PartyPermissionEdit.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PartyPermissionEdit.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PartyPermissionEdit.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PartyPermissionEdit.java
index dc665fa68..7eaee3dba 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PartyPermissionEdit.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PartyPermissionEdit.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import com.arsdigita.web.*;
import com.arsdigita.kernel.*;
@@ -22,8 +22,8 @@ import com.arsdigita.bebop.*;
import com.arsdigita.bebop.table.*;
import com.arsdigita.bebop.form.*;
import com.arsdigita.bebop.event.*;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.xml.Element;
import java.util.*;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PeoplePane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PeoplePane.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java
index d634ca8a9..d32c97962 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PeoplePane.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PeoplePane.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
//import com.arsdigita.bebop.*;
//import com.arsdigita.bebop.list.*;
@@ -64,10 +64,10 @@ import com.arsdigita.kernel.permissions.PermissionService;
//import com.arsdigita.portalserver.ui.*;
//import com.arsdigita.portalserver.PortalSite;
//import com.arsdigita.portalserver.permissions.PartyPermissionEdit;
-import com.arsdigita.london.portal.util.GlobalizationUtil;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.ui.ParticipantBrowsePane;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.util.GlobalizationUtil;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.ui.ParticipantBrowsePane;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.london.util.ui.DomainObjectSelectionModel;
import com.arsdigita.persistence.OID;
import com.arsdigita.toolbox.ui.ACSObjectCollectionListModel;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PrivilegeSingleSelect.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PrivilegeSingleSelect.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PrivilegeSingleSelect.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PrivilegeSingleSelect.java
index b93a7a95a..762a4c1dd 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/PrivilegeSingleSelect.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/PrivilegeSingleSelect.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import com.arsdigita.bebop.form.*;
import com.arsdigita.bebop.parameters.*;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/SiteMapPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/SiteMapPane.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/SiteMapPane.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/SiteMapPane.java
index ba3a0efd2..2984e81fa 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/SiteMapPane.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/SiteMapPane.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
@@ -25,7 +25,7 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.event.ChangeEvent;
import com.arsdigita.bebop.event.ChangeListener;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.web.Application;
/**
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/WorkspaceConfigFormSection.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/WorkspaceConfigFormSection.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java
index 363068f80..ecef29591 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/WorkspaceConfigFormSection.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceConfigFormSection.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import java.util.TooManyListenersException;
@@ -33,8 +33,8 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.domain.DomainCollection;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.ResourceType;
-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.persistence.OID;
import com.arsdigita.toolbox.ui.OIDParameter;
import com.arsdigita.util.UncheckedWrapperException;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/WorkspacePermissionsPane.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspacePermissionsPane.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/WorkspacePermissionsPane.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspacePermissionsPane.java
index 1e28cd013..c755b3ed5 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/admin/WorkspacePermissionsPane.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspacePermissionsPane.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.admin;
+package com.arsdigita.portalworkspace.ui.admin;
import org.apache.log4j.Logger;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ApplicationDirectoryPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ApplicationDirectoryPortletRenderer.java
similarity index 92%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ApplicationDirectoryPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ApplicationDirectoryPortletRenderer.java
index 71c72898e..7dea92070 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ApplicationDirectoryPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ApplicationDirectoryPortletRenderer.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
@@ -22,8 +22,8 @@ import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.Resource;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.ApplicationDirectoryPortlet;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationCollection;
import com.arsdigita.web.URL;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletEditor.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java
index 112e189a2..b3faef86a 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletEditor.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletEditor.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import java.math.BigDecimal;
import java.util.Iterator;
@@ -39,7 +39,7 @@ import com.arsdigita.categorization.Category;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet;
+import com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet;
// @deprecated use com.arsdigita.bebop.portal.PortletConfigFormSection
// import com.arsdigita.london.portal.ui.PortletConfigFormSection;
import com.arsdigita.london.util.Categorization;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletRenderer.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletRenderer.java
index 23d373b03..02c666f99 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/ContentDirectoryPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/ContentDirectoryPortletRenderer.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import java.math.BigDecimal;
import java.util.HashMap;
@@ -27,8 +27,8 @@ import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
-import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.ContentDirectoryPortlet;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.OID;
import com.arsdigita.web.ParameterMap;
import com.arsdigita.web.URL;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FlashPortletEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FlashPortletEditor.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FlashPortletEditor.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FlashPortletEditor.java
index 623e3b7d3..7ae7c8e93 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FlashPortletEditor.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FlashPortletEditor.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.FormProcessException;
@@ -33,7 +33,7 @@ import com.arsdigita.bebop.parameters.NotEmptyValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.portal.PortletConfigFormSection;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.portal.portlet.FlashPortlet;
+import com.arsdigita.portalworkspace.portlet.FlashPortlet;
import com.arsdigita.portal.Portlet;
/**
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FlashPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FlashPortletRenderer.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FlashPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FlashPortletRenderer.java
index a4da8b1ae..57dc67388 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FlashPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FlashPortletRenderer.java
@@ -16,15 +16,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import java.util.Iterator;
import java.util.Map;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.portlet.FlashPortlet;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.FlashPortlet;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.xml.Element;
/**
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletEditor.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletEditor.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletEditor.java
index 1f0815c71..66f118056 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletEditor.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletEditor.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import org.apache.log4j.Logger;
@@ -32,8 +32,8 @@ import com.arsdigita.bebop.util.BebopConstants;
import com.arsdigita.cms.ui.CMSDHTMLEditor;
import com.arsdigita.cms.ui.authoring.TextAssetBody.PageTextForm;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.portlet.FreeformHTMLPortlet;
// @deprecated use com.arsdigita.bebop.portal.PortletConfigFormSection
// import com.arsdigita.london.portal.ui.PortletConfigFormSection;
import com.arsdigita.portal.Portlet;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletRenderer.java
similarity index 86%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletRenderer.java
index 382a4f3a7..308cb5409 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/FreeformHTMLPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/FreeformHTMLPortletRenderer.java
@@ -13,12 +13,12 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.FreeformHTMLPortlet;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.xml.Element;
public class FreeformHTMLPortletRenderer extends AbstractPortletRenderer {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/LoginPortletRenderer.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/LoginPortletRenderer.java
index c53a318e6..6f30979d4 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/LoginPortletRenderer.java
@@ -17,7 +17,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.PageState;
@@ -32,8 +32,8 @@ import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.kernel.permissions.UniversalPermissionDescriptor;
import com.arsdigita.kernel.security.Credential;
import com.arsdigita.kernel.security.CredentialEncodingException;
-import com.arsdigita.london.portal.portlet.LoginPortlet;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.LoginPortlet;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletBrowserForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletBrowserForm.java
similarity index 97%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletBrowserForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletBrowserForm.java
index add5e7bc6..2f4fc970c 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletBrowserForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletBrowserForm.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import java.util.Iterator;
import java.util.TooManyListenersException;
@@ -33,7 +33,7 @@ import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.Submit;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.london.portal.portlet.RSSFeedPortletHelper;
+import com.arsdigita.portalworkspace.portlet.RSSFeedPortletHelper;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.xml.Element;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditor.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java
similarity index 98%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditor.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java
index 11233afdb..4106ed798 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditor.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormProcessException;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditorForm.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditorForm.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditorForm.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditorForm.java
index 962750759..5c33b4178 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletEditorForm.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditorForm.java
@@ -13,7 +13,7 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.BoxPanel;
import com.arsdigita.bebop.ColumnPanel;
@@ -27,7 +27,7 @@ import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.portal.portlet.RSSFeedPortlet;
+import com.arsdigita.portalworkspace.portlet.RSSFeedPortlet;
// @deprecated use com.arsdigita.bebop.portal.PortletConfigFormSection
// import com.arsdigita.london.portal.ui.PortletConfigFormSection;
import com.arsdigita.portal.Portlet;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletRenderer.java
similarity index 85%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletRenderer.java
index a6e181c4e..12b503cd0 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/RSSFeedPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletRenderer.java
@@ -13,13 +13,13 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.portlet.RSSFeedPortlet;
-import com.arsdigita.london.portal.portlet.RSSFeedPortletHelper;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.RSSFeedPortlet;
+import com.arsdigita.portalworkspace.portlet.RSSFeedPortletHelper;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.xml.Element;
public class RSSFeedPortletRenderer extends AbstractPortletRenderer {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/TimeOfDayPortletRenderer.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/TimeOfDayPortletRenderer.java
similarity index 86%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/TimeOfDayPortletRenderer.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/TimeOfDayPortletRenderer.java
index cfa49adc4..4af69f91e 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/TimeOfDayPortletRenderer.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/TimeOfDayPortletRenderer.java
@@ -13,14 +13,14 @@
*
*/
-package com.arsdigita.london.portal.ui.portlet;
+package com.arsdigita.portalworkspace.ui.portlet;
import java.util.Date;
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
-import com.arsdigita.london.portal.portlet.TimeOfDayPortlet;
-import com.arsdigita.london.portal.ui.PortalConstants;
+import com.arsdigita.portalworkspace.portlet.TimeOfDayPortlet;
+import com.arsdigita.portalworkspace.ui.PortalConstants;
import com.arsdigita.xml.Element;
public class TimeOfDayPortletRenderer extends AbstractPortletRenderer {
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateContainerGroups.java
similarity index 96%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateContainerGroups.java
index ec9269206..fdd160192 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateContainerGroups.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateContainerGroups.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-package com.arsdigita.london.portal.upgrade;
+package com.arsdigita.portalworkspace.upgrade;
import org.apache.commons.cli.CommandLine;
import org.apache.log4j.Logger;
@@ -24,8 +24,8 @@ import org.apache.log4j.Logger;
import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.GroupCollection;
import com.arsdigita.kernel.Party;
-import com.arsdigita.london.portal.Workspace;
-import com.arsdigita.london.portal.WorkspaceCollection;
+import com.arsdigita.portalworkspace.Workspace;
+import com.arsdigita.portalworkspace.WorkspaceCollection;
import com.arsdigita.london.util.Program;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateFlashPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateFlashPortlet.java
similarity index 91%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateFlashPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateFlashPortlet.java
index 1bdb581db..a03e93e1c 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateFlashPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateFlashPortlet.java
@@ -16,12 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.portal.upgrade;
+package com.arsdigita.portalworkspace.upgrade;
import org.apache.commons.cli.CommandLine;
-import com.arsdigita.london.portal.portlet.FlashPortlet;
-import com.arsdigita.london.portal.portlet.FlashPortletInitializer;
+import com.arsdigita.portalworkspace.portlet.FlashPortlet;
+import com.arsdigita.portalworkspace.portlet.FlashPortletInitializer;
import com.arsdigita.london.util.Transaction;
import com.arsdigita.packaging.Program;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateNavigationDirectoryPortlet.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java
similarity index 95%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateNavigationDirectoryPortlet.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java
index a795dec19..ee74d5359 100644
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/upgrade/CreateNavigationDirectoryPortlet.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/upgrade/CreateNavigationDirectoryPortlet.java
@@ -1,4 +1,4 @@
-package com.arsdigita.london.portal.upgrade;
+package com.arsdigita.portalworkspace.upgrade;
import org.apache.commons.cli.CommandLine;
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/util/GlobalizationUtil.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/util/GlobalizationUtil.java
similarity index 72%
rename from ccm-ldn-portal/src/com/arsdigita/london/portal/util/GlobalizationUtil.java
rename to ccm-portalworkspace/src/com/arsdigita/portalworkspace/util/GlobalizationUtil.java
index 637bfb074..26870414f 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/util/GlobalizationUtil.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/util/GlobalizationUtil.java
@@ -1,10 +1,11 @@
-package com.arsdigita.london.portal.util;
+package com.arsdigita.portalworkspace.util;
import com.arsdigita.globalization.Globalized;
import com.arsdigita.globalization.GlobalizedMessage;
public class GlobalizationUtil implements Globalized {
- private static final String BUNDLE_NAME = "com.arsdigita.london.portal.ui.PortalResources";
+ private static final String BUNDLE_NAME =
+ "com.arsdigita.portalworkspace.WorkspaceResources";
public static GlobalizedMessage globalize(String key) {
return new GlobalizedMessage(key, BUNDLE_NAME);
diff --git a/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml b/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml
similarity index 64%
rename from ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml
rename to ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml
index fcfbb692f..2d5250201 100644
--- a/ccm-ldn-portal/web/WEB-INF/web.ccm-ldn-portal.xml
+++ b/ccm-portalworkspace/web/WEB-INF/web.ccm-portalworkspace.xml
@@ -5,14 +5,14 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
- portal-files
+ portalworkspace-files
com.arsdigita.web.ApplicationFileServlet
template-path
- /templates/ccm-ldn-portal
+ /templates/ccm-portalworkspace
@@ -20,18 +20,18 @@
portlet-type-xsl
com.arsdigita.dispatcher.PortletTypeXSLServlet
-
+
-
+
- portal-files
- /ccm-ldn-portal/files/*
+ portalworkspace-files
+ /ccm-portalworkspace/files/*
portlet-type-xsl
/__ccm__/servlet/portlet-type/*
-
+
diff --git a/ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/admin.xsl b/ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/admin.xsl
similarity index 76%
rename from ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/admin.xsl
rename to ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/admin.xsl
index 302cc630f..09b32f049 100755
--- a/ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/admin.xsl
+++ b/ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/admin.xsl
@@ -4,6 +4,6 @@
-
+
diff --git a/ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/edit.xsl b/ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/edit.xsl
similarity index 81%
rename from ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/edit.xsl
rename to ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/edit.xsl
index 847b800e9..ddcb9c72f 100755
--- a/ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/edit.xsl
+++ b/ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/edit.xsl
@@ -3,7 +3,7 @@
xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
version="1.0">
-
+
View
diff --git a/ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/index.xsl b/ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/index.xsl
similarity index 82%
rename from ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/index.xsl
rename to ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/index.xsl
index 7562d07b7..7fd4eacc9 100755
--- a/ccm-ldn-portal/web/__ccm__/apps/workspace/xsl/index.xsl
+++ b/ccm-portalworkspace/web/__ccm__/apps/portalworkspace/xsl/index.xsl
@@ -3,7 +3,7 @@
xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
version="1.0">
-
+
diff --git a/ccm-ldn-portal/web/assets/fckeditor/config/fckconfig_portlet.js b/ccm-portalworkspace/web/assets/fckeditor/config/fckconfig_portlet.js
similarity index 100%
rename from ccm-ldn-portal/web/assets/fckeditor/config/fckconfig_portlet.js
rename to ccm-portalworkspace/web/assets/fckeditor/config/fckconfig_portlet.js
diff --git a/ccm-ldn-portal/web/assets/swfobject15/expressinstall.html b/ccm-portalworkspace/web/assets/swfobject15/expressinstall.html
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/expressinstall.html
rename to ccm-portalworkspace/web/assets/swfobject15/expressinstall.html
diff --git a/ccm-ldn-portal/web/assets/swfobject15/expressinstall.swf b/ccm-portalworkspace/web/assets/swfobject15/expressinstall.swf
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/expressinstall.swf
rename to ccm-portalworkspace/web/assets/swfobject15/expressinstall.swf
diff --git a/ccm-ldn-portal/web/assets/swfobject15/flashversion.html b/ccm-portalworkspace/web/assets/swfobject15/flashversion.html
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/flashversion.html
rename to ccm-portalworkspace/web/assets/swfobject15/flashversion.html
diff --git a/ccm-ldn-portal/web/assets/swfobject15/fullpage.html b/ccm-portalworkspace/web/assets/swfobject15/fullpage.html
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/fullpage.html
rename to ccm-portalworkspace/web/assets/swfobject15/fullpage.html
diff --git a/ccm-ldn-portal/web/assets/swfobject15/readme.txt b/ccm-portalworkspace/web/assets/swfobject15/readme.txt
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/readme.txt
rename to ccm-portalworkspace/web/assets/swfobject15/readme.txt
diff --git a/ccm-ldn-portal/web/assets/swfobject15/so_tester.swf b/ccm-portalworkspace/web/assets/swfobject15/so_tester.swf
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/so_tester.swf
rename to ccm-portalworkspace/web/assets/swfobject15/so_tester.swf
diff --git a/ccm-ldn-portal/web/assets/swfobject15/source/com/deconcept/expressinstall/ExpressInstall.as b/ccm-portalworkspace/web/assets/swfobject15/source/com/deconcept/expressinstall/ExpressInstall.as
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/source/com/deconcept/expressinstall/ExpressInstall.as
rename to ccm-portalworkspace/web/assets/swfobject15/source/com/deconcept/expressinstall/ExpressInstall.as
diff --git a/ccm-ldn-portal/web/assets/swfobject15/source/expressinstall.fla b/ccm-portalworkspace/web/assets/swfobject15/source/expressinstall.fla
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/source/expressinstall.fla
rename to ccm-portalworkspace/web/assets/swfobject15/source/expressinstall.fla
diff --git a/ccm-ldn-portal/web/assets/swfobject15/source/so_tester.fla b/ccm-portalworkspace/web/assets/swfobject15/source/so_tester.fla
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/source/so_tester.fla
rename to ccm-portalworkspace/web/assets/swfobject15/source/so_tester.fla
diff --git a/ccm-ldn-portal/web/assets/swfobject15/source/swfobject_source.js b/ccm-portalworkspace/web/assets/swfobject15/source/swfobject_source.js
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/source/swfobject_source.js
rename to ccm-portalworkspace/web/assets/swfobject15/source/swfobject_source.js
diff --git a/ccm-ldn-portal/web/assets/swfobject15/swfobject.html b/ccm-portalworkspace/web/assets/swfobject15/swfobject.html
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/swfobject.html
rename to ccm-portalworkspace/web/assets/swfobject15/swfobject.html
diff --git a/ccm-ldn-portal/web/assets/swfobject15/swfobject.js b/ccm-portalworkspace/web/assets/swfobject15/swfobject.js
similarity index 100%
rename from ccm-ldn-portal/web/assets/swfobject15/swfobject.js
rename to ccm-portalworkspace/web/assets/swfobject15/swfobject.js
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/CheckEmpty16.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckEmpty16.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/CheckEmpty16.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckEmpty16.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/CheckFull16.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckFull16.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/CheckFull16.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckFull16.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/Group16.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/Group16.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/Group16.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/Group16.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/RadioEmpty16.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioEmpty16.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/RadioEmpty16.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioEmpty16.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/RadioFull16.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioFull16.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/RadioFull16.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioFull16.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/User16.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/User16.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/User16.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/User16.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/delete.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/delete.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/delete.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/delete.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/down.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/down.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/down.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/down.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/left.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/left.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/left.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/left.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/right.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/right.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/right.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/right.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/www/assets/up.gif b/ccm-portalworkspace/web/packages/portalworkspace/www/assets/up.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/www/assets/up.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/www/assets/up.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/admin.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/admin.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/admin.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/admin.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/application-directory-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/application-directory-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/application-directory-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/application-directory-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/content-directory-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-directory-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/content-directory-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/content-directory-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/content-item-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-item-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/content-item-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/content-item-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/content-sections-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-sections-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/content-sections-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/content-sections-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/customize.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/customize.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/customize.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/customize.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/delete.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/delete.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/delete.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/delete.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/display.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/display.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/display.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/display.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/flash-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/flash-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/flash-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/flash-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/freeform-html-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/freeform-html-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/freeform-html-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/freeform-html-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/lib.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/lib.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/lib.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/lib.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/login-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/login-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/login-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/login-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/moveDown.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveDown.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/moveDown.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/moveDown.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/moveLeft.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveLeft.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/moveLeft.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/moveLeft.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/moveRight.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveRight.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/moveRight.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/moveRight.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/moveUp.gif b/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveUp.gif
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/moveUp.gif
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/moveUp.gif
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/portal.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/portal.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/portal.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/portal.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/portlets.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/portlets.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/portlets.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/portlets.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/rss-feed-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/rss-feed-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/rss-feed-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/rss-feed-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/tasklist-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/tasklist-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/tasklist-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/tasklist-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/time-of-day-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/time-of-day-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/time-of-day-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/time-of-day-portlet.xsl
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/workspace-directory-portlet.xsl b/ccm-portalworkspace/web/packages/portalworkspace/xsl/workspace-directory-portlet.xsl
similarity index 100%
rename from ccm-ldn-portal/web/packages/workspace/xsl/workspace-directory-portlet.xsl
rename to ccm-portalworkspace/web/packages/portalworkspace/xsl/workspace-directory-portlet.xsl
diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/edit.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/edit.jsp
similarity index 83%
rename from ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/edit.jsp
rename to ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/edit.jsp
index 0853d5abc..b95df7b41 100755
--- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/edit.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/edit.jsp
@@ -5,7 +5,7 @@
-
+
@@ -18,7 +18,7 @@
adminPage.addRequestListener(new ApplicationAuthenticationListener());
-
+
StringParameter action = new StringParameter("action");
diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/index.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/index.jsp
similarity index 87%
rename from ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/index.jsp
rename to ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/index.jsp
index 70e88fbed..81e2ac43b 100755
--- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/index.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/index.jsp
@@ -15,7 +15,7 @@
adminPage.addRequestListener(new ApplicationAuthenticationListener());
-
+
diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/sitemap.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/sitemap.jsp
similarity index 87%
rename from ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/sitemap.jsp
rename to ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/sitemap.jsp
index 2c9bc2feb..7ca951838 100755
--- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/admin/sitemap.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/admin/sitemap.jsp
@@ -15,7 +15,7 @@
sitemapPage.addRequestListener(new ApplicationAuthenticationListener());
-
+
diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/edit.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp
similarity index 67%
rename from ccm-ldn-portal/web/templates/ccm-ldn-portal/edit.jsp
rename to ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp
index c10fee135..eab5c0a83 100755
--- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/edit.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/edit.jsp
@@ -5,15 +5,15 @@
version="1.2">
-
-
+
+
DispatcherHelper.cacheDisable(response);
-
+
((AbstractWorkspaceComponent)edit).setWorkspaceModel(new DefaultWorkspaceSelectionModel());
diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp
similarity index 76%
rename from ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp
rename to ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp
index 0e8cb7000..7b0aaebb0 100755
--- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/index.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/index.jsp
@@ -5,9 +5,9 @@
-
-
-
+
+
+
@@ -24,7 +24,7 @@
+ classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer" />
((AbstractWorkspaceComponent) view).setWorkspaceModel(
new DefaultWorkspaceSelectionModel());
diff --git a/ccm-ldn-portal/web/templates/ccm-ldn-portal/workspaces.jsp b/ccm-portalworkspace/web/templates/ccm-portalworkspace/workspaces.jsp
similarity index 78%
rename from ccm-ldn-portal/web/templates/ccm-ldn-portal/workspaces.jsp
rename to ccm-portalworkspace/web/templates/ccm-portalworkspace/workspaces.jsp
index d02d8c526..1e68ccb32 100755
--- a/ccm-ldn-portal/web/templates/ccm-ldn-portal/workspaces.jsp
+++ b/ccm-portalworkspace/web/templates/ccm-portalworkspace/workspaces.jsp
@@ -4,7 +4,7 @@
xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2">
<%-- This page is used by class in method getChannel(PageState pageState)
- com.arsdigita.london.portal.ui.WorkspaceDirectoryComponent --%>
+ com.arsdigita.portalworkspace.ui.WorkspaceDirectoryComponent --%>
@@ -18,7 +18,7 @@
cache="true">
+ classname="com.arsdigita.portalworkspace.ui.WorkspaceDirectoryComponent" />
diff --git a/ccm-zes-aplaws/application.xml b/ccm-zes-aplaws/application.xml
index ad03295f9..e09ada36f 100644
--- a/ccm-zes-aplaws/application.xml
+++ b/ccm-zes-aplaws/application.xml
@@ -9,7 +9,7 @@
-
+
- portal-files
+ portalworkspace-files
com.arsdigita.web.ApplicationFileServlet
template-path
- /templates/ccm-ldn-portal
+ /templates/ccm-portalworkspace
@@ -357,8 +357,8 @@
- portal-files
- /ccm-ldn-portal/files/*
+ portalworkspace-files
+ /ccm-portalworkspace/files/*
diff --git a/ccm-zes-aplaws/src/ccm-zes-aplaws.load b/ccm-zes-aplaws/src/ccm-zes-aplaws.load
index 8fd14b0c0..cad4f63c6 100644
--- a/ccm-zes-aplaws/src/ccm-zes-aplaws.load
+++ b/ccm-zes-aplaws/src/ccm-zes-aplaws.load
@@ -7,7 +7,7 @@
-
+
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
index ff4a63f3a..c3a3968a0 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -23,8 +23,8 @@ import com.arsdigita.london.navigation.Template;
import com.arsdigita.london.navigation.TemplateMapping;
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-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
index df6e2aec4..5aecfcebe 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
+++ b/ccm-zes-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-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java
index d154948d7..65c0b2dab 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java
+++ b/ccm-zes-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-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
index 7d8997669..01b6059ad 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
+++ b/ccm-zes-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-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
index d1a8bcdb7..fc6fc5d57 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
+++ b/ccm-zes-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-zes-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
index d56eee455..4a55dc1c1 100644
--- a/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
@@ -210,11 +210,11 @@
- portal-files
+ portalworkspace-files
com.arsdigita.web.ApplicationFileServlet
template-path
- /templates/ccm-ldn-portal
+ /templates/ccm-portalworkspace
@@ -361,8 +361,8 @@
- portal-files
- /ccm-ldn-portal/files/*
+ portalworkspace-files
+ /ccm-portalworkspace/files/*
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
index 30d9905c6..e57acfc81 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
@@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
version="1.0">
-
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
index e76ed6279..519b63d70 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
@@ -11,7 +11,7 @@
exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"
version="1.0">
-
+
@@ -41,7 +41,8 @@
- Skip over navigation
+ Skip over navigation
|
@@ -76,7 +77,8 @@
-