Kleine Bereinigungen bei ccm-ldn-portal

git-svn-id: https://svn.libreccm.org/ccm/trunk@329 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2010-01-16 13:15:37 +00:00
parent aaf77021a0
commit b341967c31
3 changed files with 125 additions and 113 deletions

View File

@ -90,13 +90,16 @@ public class Loader extends PackageLoader {
* @param ctx * @param ctx
*/ */
public void run(final ScriptContext ctx) { public void run(final ScriptContext ctx) {
new KernelExcursion() { new KernelExcursion() {
public void excurse() { public void excurse() {
setEffectiveParty(Kernel.getSystemParty()); setEffectiveParty(Kernel.getSystemParty());
createApplication((String) get(m_url),
(Boolean) get(m_isPublic), (String) get(m_title));
createApplication((String) get(m_url),
(Boolean) get(m_isPublic),
(String) get(m_title));
setupWorkspacePageType(); setupWorkspacePageType();
loadTimeOfDayPortlet(); loadTimeOfDayPortlet();
loadContentDirectoryPortlet(); loadContentDirectoryPortlet();
loadRSSFeedPortlet(); loadRSSFeedPortlet();
@ -167,13 +170,21 @@ public class Loader extends PackageLoader {
return type; return type;
} }
/**
*
* @return
*/
private ResourceType setupWorkspacePageType() { private ResourceType setupWorkspacePageType() {
ResourceType type = ResourceType.createResourceType( ResourceType type = ResourceType.createResourceType(
"Portal Workspace Page", WorkspacePage.BASE_DATA_OBJECT_TYPE); "Portal Workspace Page",
WorkspacePage.BASE_DATA_OBJECT_TYPE);
type.setDescription("Pages for the portal workspaces"); type.setDescription("Pages for the portal workspaces");
return type; return type;
} }
/**
*
*/
private void loadTimeOfDayPortlet() { private void loadTimeOfDayPortlet() {
PortletType type = PortletType.createPortletType("Time of Day", PortletType type = PortletType.createPortletType("Time of Day",
PortletType.WIDE_PROFILE, PortletType.WIDE_PROFILE,

View File

@ -162,7 +162,8 @@ public class Workspace extends Application {
* @return * @return
*/ */
public static Workspace createWorkspace(String url, String title, public static Workspace createWorkspace(String url, String title,
PageLayout layout, Application parent, boolean isPublic) { PageLayout layout, Application parent,
boolean isPublic) {
if (s_log.isDebugEnabled()) { if (s_log.isDebugEnabled()) {
s_log.debug("Creating group workspace, isPublic:" + isPublic s_log.debug("Creating group workspace, isPublic:" + isPublic
+ " on " + url + " with parent " + " on " + url + " with parent "
@ -214,6 +215,7 @@ public class Workspace extends Application {
* @return * @return
*/ */
public static Workspace getDefaultHomepageWorkspace() { public static Workspace getDefaultHomepageWorkspace() {
if (null == defaultHomepageWorkspace) { if (null == defaultHomepageWorkspace) {
// default homepage workspace is created during // default homepage workspace is created during
// com.arsdigita.london.portal.Loader // com.arsdigita.london.portal.Loader
@ -232,7 +234,6 @@ public class Workspace extends Application {
defaultHomepageWorkspace = workspaces.getWorkspace(); defaultHomepageWorkspace = workspaces.getWorkspace();
} }
workspaces.close(); workspaces.close();
} }
return defaultHomepageWorkspace; return defaultHomepageWorkspace;