diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java index 8d58fd7e0..5898037fa 100755 --- a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java +++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java @@ -428,10 +428,11 @@ public final class CMSConfig extends AbstractConfig { // to SectionInitializer. However, it still may be useful to // keep these for the default values. // /////////////////////////////////////////// - private final Parameter m_defaultItemResolverClass = new SpecificClassParameter("com.arsdigita.cms.default_item_resolver_class", - Parameter.REQUIRED, - MultilingualItemResolver.class, - ItemResolver.class); + private final Parameter m_defaultItemResolverClass = new SpecificClassParameter + ("com.arsdigita.cms.default_item_resolver_class", + Parameter.REQUIRED, + MultilingualItemResolver.class, + ItemResolver.class); private final Parameter m_defaultTemplateResolverClass = new SpecificClassParameter("com.arsdigita.cms.default_template_resolver_class", Parameter.REQUIRED, DefaultTemplateResolver.class, diff --git a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java index 8c6fc8957..a470c2ee0 100755 --- a/ccm-cms/src/com/arsdigita/cms/SecurityManager.java +++ b/ccm-cms/src/com/arsdigita/cms/SecurityManager.java @@ -500,9 +500,9 @@ public class SecurityManager implements Security, SecurityConstants { throws IOException, ServletException { if (KernelHelper.getCurrentUser(request) != null) { return; } - String url = com.arsdigita.kernel.security.Initializer + String url = com.arsdigita.kernel.security.Util .getSecurityHelper().getLoginURL(request) - + "?" + UserContext.RETURN_URL_PARAM_NAME + + "?" + LoginHelper.RETURN_URL_PARAM_NAME + "=" + UserContext.encodeReturnURL(request); LoginHelper.sendRedirect(request, response, url); diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java index a9cbb5a28..b3e8ec91e 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java @@ -19,13 +19,13 @@ package com.arsdigita.cms.dispatcher; import com.arsdigita.cms.WorkspaceSetup; -import com.arsdigita.cms.util.PageClassConfigHandler; +// import com.arsdigita.cms.util.PageClassConfigHandler; import com.arsdigita.developersupport.DeveloperSupport; import com.arsdigita.dispatcher.Dispatcher; import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.dispatcher.JSPApplicationDispatcher; import com.arsdigita.dispatcher.RequestContext; -import com.arsdigita.kernel.security.Initializer; +import com.arsdigita.kernel.security.Util; import com.arsdigita.kernel.security.UserContext; import com.arsdigita.ui.login.LoginHelper; import com.arsdigita.util.LockableImpl; @@ -284,10 +284,10 @@ public class ContentCenterDispatcher extends LockableImpl protected void redirectToLoginPage(HttpServletRequest req, HttpServletResponse resp) throws ServletException { - String url = Initializer.getSecurityHelper() - .getLoginURL(req) - +"?"+UserContext.RETURN_URL_PARAM_NAME - +"="+UserContext.encodeReturnURL(req); + String url = Util.getSecurityHelper() + .getLoginURL(req) + +"?"+LoginHelper.RETURN_URL_PARAM_NAME + +"="+UserContext.encodeReturnURL(req); try { LoginHelper.sendRedirect(req, resp, url); } catch (IOException e) { diff --git a/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java b/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java index e422c6e86..efc19834c 100755 --- a/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java +++ b/ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java @@ -60,6 +60,7 @@ public class Initializer extends com.arsdigita.runtime.GenericInitializer { * A delay value of 0 inhibits start of processing. * @param evt The context init event. */ + @Override public void init(ContextInitEvent evt) { s_log.debug("lifecycle background startup beginn."); @@ -83,6 +84,7 @@ public class Initializer extends com.arsdigita.runtime.GenericInitializer { /** * */ + @Override public void close(ContextCloseEvent evt) { Scheduler.stopTimer(); s_log.debug("lifecycle background processing stopped"); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java index 6bd724e23..016e0a81a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java @@ -26,7 +26,7 @@ import com.arsdigita.cms.CMS; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.util.GlobalizationUtil; -import com.arsdigita.kernel.security.Initializer; +import com.arsdigita.kernel.security.LegacyInitializer; import com.arsdigita.xml.Element; /** @@ -45,7 +45,7 @@ public class ContentSectionNavbar extends CMSContainer { setClassAttr("section"); String wsUrl = - "/" + Initializer.getURL(Initializer.WORKSPACE_PAGE_KEY); + "/" + LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY); String csUrl = Utilities.getWorkspaceURL(); m_navbar = new DimensionalNavbar(); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java index 658e3003a..097968a2a 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java @@ -22,7 +22,7 @@ import com.arsdigita.bebop.DimensionalNavbar; import com.arsdigita.bebop.Link; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.globalization.GlobalizedMessage; -import com.arsdigita.kernel.security.Initializer; +import com.arsdigita.kernel.security.LegacyInitializer; /** * Delimited dimensional navbar. @@ -40,7 +40,7 @@ public class GlobalNavbar extends DimensionalNavbar { // add(new Link("Help", "help")); String signOutURL = Utilities.getWebappContext() + "/" + - Initializer.getURL(Initializer.LOGOUT_PAGE_KEY); + LegacyInitializer.getURL(LegacyInitializer.LOGOUT_PAGE_KEY); add(new Link((String) globalize("cms.ui.sign_out").localize(), signOutURL)); diff --git a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java index 24164aae4..5f8cb5ab4 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java @@ -22,7 +22,7 @@ import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.cms.CMS; import com.arsdigita.cms.dispatcher.Utilities; -import com.arsdigita.kernel.security.Initializer; +import com.arsdigita.kernel.security.LegacyInitializer; import com.arsdigita.web.URL; import com.arsdigita.xml.Element; import org.apache.log4j.Logger; @@ -47,8 +47,8 @@ class GlobalNavigation extends SimpleComponent { GlobalNavigation() { m_centerPath = Utilities.getWorkspaceURL(); - m_wspcPath = path(Initializer.WORKSPACE_PAGE_KEY); - m_signOutPath = path(Initializer.LOGOUT_PAGE_KEY); + m_wspcPath = path(LegacyInitializer.WORKSPACE_PAGE_KEY); + m_signOutPath = path(LegacyInitializer.LOGOUT_PAGE_KEY); m_helpPath = "/nowhere"; // We don't have this yet XXX. } @@ -72,7 +72,7 @@ class GlobalNavigation extends SimpleComponent { } private static String path(final String key) { - return "/" + Initializer.getURL(key); + return "/" + LegacyInitializer.getURL(key); } private static Element link(final HttpServletRequest sreq, diff --git a/ccm-cms/src/com/arsdigita/cms/util/PageClassConfigHandler.java b/ccm-cms/src/com/arsdigita/cms/util/PageClassConfigHandler.java index 31ef078e7..118c10bd6 100755 --- a/ccm-cms/src/com/arsdigita/cms/util/PageClassConfigHandler.java +++ b/ccm-cms/src/com/arsdigita/cms/util/PageClassConfigHandler.java @@ -60,12 +60,14 @@ public class PageClassConfigHandler extends DefaultHandler { m_buffer = new StringBuffer(); } + @Override public void characters(char[] ch, int start, int len) { for (int i = 0; i < len; i++) { m_buffer.append(ch[start + i]); } } + @Override public void endElement(String uri, String localName, String qn) { if ( qn.equals("url") ) { m_url = m_buffer.toString().trim(); diff --git a/ccm-cms/web/packages/content-section/www/content-center-redirect.jsp b/ccm-cms/web/packages/content-section/www/content-center-redirect.jsp index 521c86b71..c401523c4 100755 --- a/ccm-cms/web/packages/content-section/www/content-center-redirect.jsp +++ b/ccm-cms/web/packages/content-section/www/content-center-redirect.jsp @@ -1,6 +1,6 @@ - + @@ -26,7 +26,7 @@ if (hasAccess) { url = Utilities.getWorkspaceURL(); } else { - url = Initializer.getFullURL(Initializer.WORKSPACE_PAGE_KEY, request); + url = LegacyInitializer.getFullURL(LegacyInitializer.WORKSPACE_PAGE_KEY, request); } throw new RedirectSignal(URL.there(request, url), false); diff --git a/ccm-forum/src/com/arsdigita/forum/PopulateForum.java b/ccm-forum/src/com/arsdigita/forum/PopulateForum.java.nolongerInUse similarity index 94% rename from ccm-forum/src/com/arsdigita/forum/PopulateForum.java rename to ccm-forum/src/com/arsdigita/forum/PopulateForum.java.nolongerInUse index 64068c68a..0f6a4a284 100755 --- a/ccm-forum/src/com/arsdigita/forum/PopulateForum.java +++ b/ccm-forum/src/com/arsdigita/forum/PopulateForum.java.nolongerInUse @@ -32,6 +32,17 @@ import com.arsdigita.populate.apps.PopulateApp; import com.arsdigita.util.Assert; import com.arsdigita.web.ApplicationType; +// +// Class is not used anywhere in the source tree, obviously even not in the +// test code tree. +// No Documentation how to use available. +// +// Retained temporarily for easy reference until the refactoring of the +// test cases is completed. +// +// (pboy 2011-01-30) + + /** * @author bche */ 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 69feebabb..10e70d804 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,7 +9,7 @@ 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.Initializer; +import com.arsdigita.kernel.security.LegacyInitializer; import com.arsdigita.london.portal.Workspace; import com.arsdigita.london.portal.util.GlobalizationUtil; import com.arsdigita.web.Application; @@ -56,7 +56,7 @@ public class PersonalPortalPage extends Page { Party party = Kernel.getContext().getParty(); if (party == null) { - sUrl = Initializer.getURL(Initializer.LOGIN_PAGE_KEY); + sUrl = LegacyInitializer.getURL(LegacyInitializer.LOGIN_PAGE_KEY); } else { try { user = User.retrieve(party.getOID()); @@ -97,7 +97,7 @@ public class PersonalPortalPage extends Page { sUrl = personalWorkspace.getPath(); } catch (DataObjectNotFoundException donfe) { - sUrl = Initializer.getURL(Initializer.LOGIN_PAGE_KEY); + sUrl = LegacyInitializer.getURL(LegacyInitializer.LOGIN_PAGE_KEY); } } 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 573fcb989..11ebcac04 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 @@ -28,7 +28,7 @@ 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.Initializer; +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; @@ -68,8 +68,8 @@ public class LoginPortletRenderer extends AbstractPortletRenderer { Element content = login.newChildElement("portlet:loginform", PortalConstants.PORTLET_XML_NS); - content.addAttribute("url", Initializer - .getURL(Initializer.LOGIN_PAGE_KEY)); + content.addAttribute("url", LegacyInitializer + .getURL(LegacyInitializer.LOGIN_PAGE_KEY)); content.addAttribute("timestamp", timestamp); } else { User user = (User) party; @@ -82,15 +82,15 @@ public class LoginPortletRenderer extends AbstractPortletRenderer { .getFamilyName()); Link editProfile = new Link("Edit profile", "/" - + Initializer.getURL(Initializer.EDIT_PAGE_KEY)); + + LegacyInitializer.getURL(LegacyInitializer.EDIT_PAGE_KEY)); editProfile.generateXML(state, content); Link changePassword = new Link("Change password", "/" - + Initializer.getURL(Initializer.CHANGE_PAGE_KEY)); + + LegacyInitializer.getURL(LegacyInitializer.CHANGE_PAGE_KEY)); changePassword.generateXML(state, content); Link logout = new Link("Logout", "/" - + Initializer.getURL(Initializer.LOGOUT_PAGE_KEY)); + + 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 ef188d4e9..20b4f3b11 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java @@ -39,7 +39,7 @@ import com.arsdigita.bebop.Label; import com.arsdigita.simplesurvey.ui.SimpleSurveyPanel; -import com.arsdigita.kernel.security.Initializer; +import com.arsdigita.kernel.security.LegacyInitializer; /** @@ -59,7 +59,7 @@ public class ConfirmationPanel extends SimpleSurveyPanel { protected void addComponentsToPage() { String workspaceURL = - Initializer.getURL(Initializer.WORKSPACE_PAGE_KEY); + LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY); Label bodyText = new Label("Your survey response has been submitted. " + "You may return to your