diff --git a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java
index 926a7479b..c9ebf49b7 100755
--- a/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java
+++ b/ccm-cms-types-organization/src/com/arsdigita/cms/contenttypes/ui/OrganizationImageStep.java
@@ -19,7 +19,6 @@
package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.cms.contenttypes.Organization;
-import com.arsdigita.cms.contenttypes.ui.OrganizationImageForm;
import com.arsdigita.cms.contenttypes.util.OrganizationGlobalizationUtil;
import com.arsdigita.bebop.PageState;
@@ -28,7 +27,6 @@ import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
import com.arsdigita.cms.ui.authoring.SimpleEditStep;
-import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.domain.DomainObject;
import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
@@ -55,7 +53,9 @@ public class OrganizationImageStep
super( itemModel, parent, "_image" );
setDefaultEditKey(IMAGE_SHEET_NAME);
- add( IMAGE_SHEET_NAME, "Change", new WorkflowLockedComponentAccess(new OrganizationImageForm("OrganizationImageForm", itemModel, this), itemModel));
+ add( IMAGE_SHEET_NAME, "Change",
+ new WorkflowLockedComponentAccess(new OrganizationImageForm(
+ "OrganizationImageForm", itemModel, this), itemModel));
DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel, false);
sheet.add(OrganizationGlobalizationUtil.globalize
diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/Initializer.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/Initializer.java
index 9bfe7d12c..4dd25c05f 100755
--- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/Initializer.java
+++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/installer/Initializer.java
@@ -127,8 +127,11 @@ public class Initializer extends CompoundInitializer {
setup.setDescription
("The document manager empowers users to share documents.");
setup.setDispatcherClass("com.arsdigita.cms.docmgr.ui.DMDispatcher");
- setup.setStylesheet("/packages/cms-docmgr/xsl/docs.xsl");
+ // Class Stylesheet and database backed stylesheet locations are
+ // deprecated and removed. New StylesheetResolver is pattern based.
+ // setup.setStylesheet("/packages/cms-docmgr/xsl/docs.xsl");
setup.setInstantiator(new ACSObjectInstantiator() {
+ @Override
public DomainObject doNewInstance(DataObject dataObject) {
return new Repository(dataObject);
}
@@ -164,7 +167,9 @@ public class Initializer extends CompoundInitializer {
setup.setDescription
("Browse documents by category.");
setup.setDispatcherClass("com.arsdigita.cms.docmgr.ui.DCNDispatcher");
- setup.setStylesheet("/packages/cms-docmgr/xsl/docs.xsl");
+ // Class Stylesheet and database backed stylesheet locations are
+ // deprecated and removed. New StylesheetResolver is pattern based.
+ //setup.setStylesheet("/packages/cms-docmgr/xsl/docs.xsl");
setup.setInstantiator(new ACSObjectInstantiator() {
public DomainObject doNewInstance(DataObject dataObject) {
return new DocumentCategoryBrowserApplication(dataObject);
@@ -182,7 +187,9 @@ public class Initializer extends CompoundInitializer {
setup.setDescription
("Browse documents by category.");
setup.setDispatcherClass("com.arsdigita.cms.docmgr.ui.DCNDispatcher");
- setup.setStylesheet("/packages/cms-docmgr/xsl/docs.xsl");
+ // Class Stylesheet and database backed stylesheet locations are
+ // deprecated and removed. New StylesheetResolver is pattern based.
+ //setup.setStylesheet("/packages/cms-docmgr/xsl/docs.xsl");
setup.setInstantiator(new ACSObjectInstantiator() {
public DomainObject doNewInstance(DataObject dataObject) {
return new LegacyCategoryBrowserApplication(dataObject);
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java
index 10e70d804..64dfa336d 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java
@@ -9,9 +9,10 @@ import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.User;
-import com.arsdigita.kernel.security.LegacyInitializer;
+// import com.arsdigita.kernel.security.LegacyInitializer;
import com.arsdigita.london.portal.Workspace;
import com.arsdigita.london.portal.util.GlobalizationUtil;
+import com.arsdigita.ui.UI;
import com.arsdigita.web.Application;
import org.apache.log4j.Logger;
@@ -56,7 +57,8 @@ public class PersonalPortalPage extends Page {
Party party = Kernel.getContext().getParty();
if (party == null) {
- sUrl = LegacyInitializer.getURL(LegacyInitializer.LOGIN_PAGE_KEY);
+// sUrl = LegacyInitializer.getURL(LegacyInitializer.LOGIN_PAGE_KEY);
+ sUrl = UI.getLoginPageURL();
} else {
try {
user = User.retrieve(party.getOID());
@@ -97,7 +99,8 @@ public class PersonalPortalPage extends Page {
sUrl = personalWorkspace.getPath();
} catch (DataObjectNotFoundException donfe) {
- sUrl = LegacyInitializer.getURL(LegacyInitializer.LOGIN_PAGE_KEY);
+// sUrl = LegacyInitializer.getURL(LegacyInitializer.LOGIN_PAGE_KEY);
+ sUrl = UI.getLoginPageURL();
}
}
diff --git a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java
index 11ebcac04..c53a318e6 100755
--- a/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java
+++ b/ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java
@@ -1,15 +1,19 @@
/*
- * Copyright (C) 2001 ArsDigita Corporation. All Rights Reserved.
+ * Copyright (C) 2001-2004 Red Hat Inc. 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
*
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
@@ -28,12 +32,12 @@ 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.kernel.security.LegacyInitializer;
import com.arsdigita.london.portal.portlet.LoginPortlet;
import com.arsdigita.london.portal.ui.PortalConstants;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.ui.UI;
import com.arsdigita.ui.login.LoginConstants;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.web.Application;
@@ -41,13 +45,23 @@ import com.arsdigita.web.ApplicationCollection;
import com.arsdigita.xml.Element;
public class LoginPortletRenderer extends AbstractPortletRenderer {
+
private LoginPortlet m_portlet;
- public LoginPortletRenderer(LoginPortlet portlet) {
+ /**
+ * Constructor.
+ * @param portlet
+ */
+ public LoginPortletRenderer(LoginPortlet portlet) {
m_portlet = portlet;
}
- public void generateBodyXML(PageState state, Element parent) {
+ /**
+ *
+ * @param state
+ * @param parent
+ */
+ public void generateBodyXML(PageState state, Element parent) {
Element login = parent.newChildElement("portlet:login",
PortalConstants.PORTLET_XML_NS);
@@ -68,8 +82,10 @@ public class LoginPortletRenderer extends AbstractPortletRenderer {
Element content = login.newChildElement("portlet:loginform",
PortalConstants.PORTLET_XML_NS);
- content.addAttribute("url", LegacyInitializer
- .getURL(LegacyInitializer.LOGIN_PAGE_KEY));
+
+ // content.addAttribute("url", LegacyInitializer
+ // .getURL(LegacyInitializer.LOGIN_PAGE_KEY));
+ content.addAttribute("url", UI.getLoginPageURL() );
content.addAttribute("timestamp", timestamp);
} else {
User user = (User) party;
@@ -81,16 +97,19 @@ public class LoginPortletRenderer extends AbstractPortletRenderer {
content.addAttribute("familyName", user.getPersonName()
.getFamilyName());
- Link editProfile = new Link("Edit profile", "/"
- + LegacyInitializer.getURL(LegacyInitializer.EDIT_PAGE_KEY));
+ Link editProfile = new Link("Edit profile",
+ UI.getEditUserProfilePageURL());
+// "/" + LegacyInitializer.getURL(LegacyInitializer.EDIT_PAGE_KEY));
editProfile.generateXML(state, content);
- Link changePassword = new Link("Change password", "/"
- + LegacyInitializer.getURL(LegacyInitializer.CHANGE_PAGE_KEY));
+ Link changePassword = new Link("Change password",
+ UI.getRecoverPasswordPageURL());
+// "/" + LegacyInitializer.getURL(LegacyInitializer.CHANGE_PAGE_KEY));
changePassword.generateXML(state, content);
- Link logout = new Link("Logout", "/"
- + LegacyInitializer.getURL(LegacyInitializer.LOGOUT_PAGE_KEY));
+ Link logout = new Link("Logout",
+ UI.getLogoutPageURL() );
+// "/" + LegacyInitializer.getURL(LegacyInitializer.LOGOUT_PAGE_KEY));
logout.generateXML(state, content);
// Test whether the user can do anything in any content section
diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java
index 20b4f3b11..c2148b4eb 100755
--- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java
+++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java
@@ -18,28 +18,8 @@
*/
package com.arsdigita.simplesurvey.ui;
-
-
-import com.arsdigita.bebop.event.FormSectionEvent;
-import com.arsdigita.bebop.event.FormProcessListener;
-
-
-
-
-
-
-
-
-
-
-
import com.arsdigita.bebop.Label;
-
-
-
-import com.arsdigita.simplesurvey.ui.SimpleSurveyPanel;
-
-import com.arsdigita.kernel.security.LegacyInitializer;
+import com.arsdigita.ui.UI;
/**
@@ -58,12 +38,12 @@ public class ConfirmationPanel extends SimpleSurveyPanel {
protected void addComponentsToPage() {
- String workspaceURL =
- LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY);
+ String workspaceURL = UI.getWorkspaceURL() ;
+ // LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY);
Label bodyText = new Label("Your survey response has been submitted. " +
- "You may return to your workspace");
+ "You may return to your workspace");
bodyText.setOutputEscaping(false);
add(bodyText);
diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java
index 0c6d1f41d..43cf56647 100755
--- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java
+++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java
@@ -21,32 +21,19 @@ package com.arsdigita.simplesurvey.ui;
import com.arsdigita.simplesurvey.util.GlobalizationUtil ;
+import com.arsdigita.bebop.BoxPanel;
+import com.arsdigita.bebop.Label;
+import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.Page;
import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.Link;
-
-
-
-import com.arsdigita.ui.login.UserAuthenticationListener;
-
-
-
-
-
-import com.arsdigita.kernel.SiteNode;
-
-
-
-import com.arsdigita.kernel.security.LegacyInitializer;
-
-import com.arsdigita.bebop.BoxPanel;
-import javax.servlet.http.HttpServletRequest;
-
+import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.bebop.event.PrintListener;
import com.arsdigita.bebop.event.PrintEvent;
+import com.arsdigita.kernel.SiteNode;
+import com.arsdigita.ui.UI;
+import com.arsdigita.ui.login.UserAuthenticationListener;
-import com.arsdigita.bebop.SimpleContainer;
-import com.arsdigita.bebop.Label;
+import javax.servlet.http.HttpServletRequest;
/**
@@ -114,8 +101,8 @@ public abstract class SimpleSurveyPanel extends SimpleContainer {
protected void addWorkspaceToNavBar() {
// Link to the workspace of the site
- m_navBar.add(new Link("Workspace",
- "/" + LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY)));
+ m_navBar.add(new Link("Workspace",UI.getWorkspaceURL()));
+ // "/" + LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY)));
}
protected abstract void addComponentsToPage();