LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nachführen von Änderungen aus ccm-core (security initializer undd populate) in anderen Modulen. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@723 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-01-30 23:39:09 +00:00
parent 490519c5a8
commit 0d1bf1f042
14 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-cms/src/com/arsdigita/cms/CMSConfig.java
View File

@ -428,7 +428,8 @@ 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",
private final Parameter m_defaultItemResolverClass = new SpecificClassParameter
("com.arsdigita.cms.default_item_resolver_class",
Parameter.REQUIRED,
MultilingualItemResolver.class,
ItemResolver.class);

4
ccm-cms/src/com/arsdigita/cms/SecurityManager.java
View File

@ -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);

8
ccm-cms/src/com/arsdigita/cms/dispatcher/ContentCenterDispatcher.java
View File

@ -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,9 +284,9 @@ public class ContentCenterDispatcher extends LockableImpl
protected void redirectToLoginPage(HttpServletRequest req,
HttpServletResponse resp)
throws ServletException {
String url = Initializer.getSecurityHelper()
String url = Util.getSecurityHelper()
.getLoginURL(req)
+"?"+UserContext.RETURN_URL_PARAM_NAME
+"?"+LoginHelper.RETURN_URL_PARAM_NAME
+"="+UserContext.encodeReturnURL(req);
try {
LoginHelper.sendRedirect(req, resp, url);

2
ccm-cms/src/com/arsdigita/cms/lifecycle/Initializer.java
View File

@ -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");

4
ccm-cms/src/com/arsdigita/cms/ui/ContentSectionNavbar.java
View File

@ -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();

4
ccm-cms/src/com/arsdigita/cms/ui/GlobalNavbar.java
View File

@ -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));

8
ccm-cms/src/com/arsdigita/cms/ui/GlobalNavigation.java
View File

@ -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,

2
ccm-cms/src/com/arsdigita/cms/util/PageClassConfigHandler.java
View File

@ -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();

4
ccm-cms/web/packages/content-section/www/content-center-redirect.jsp
View File

@ -1,6 +1,6 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
<jsp:directive.page import="com.arsdigita.kernel.security.Initializer"/>
<jsp:directive.page import="com.arsdigita.kernel.security.LegacyInitializer"/>
<jsp:directive.page import="com.arsdigita.web.URL"/>
<jsp:directive.page import="com.arsdigita.web.RedirectSignal"/>
<jsp:directive.page import="com.arsdigita.cms.ContentSection"/>
@ -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);

11
ccm-forum/src/com/arsdigita/forum/PopulateForum.java → ccm-forum/src/com/arsdigita/forum/PopulateForum.java.nolongerInUse
View File

@ -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
*/

6
ccm-ldn-portal/src/com/arsdigita/london/portal/ui/PersonalPortalPage.java
View File

@ -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);
}
}

12
ccm-ldn-portal/src/com/arsdigita/london/portal/ui/portlet/LoginPortletRenderer.java
View File

@ -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

4
ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java
View File

@ -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 <a href=\"/" + workspaceURL +

4
ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java
View File

@ -37,7 +37,7 @@ import com.arsdigita.kernel.SiteNode;
import com.arsdigita.kernel.security.Initializer;
import com.arsdigita.kernel.security.LegacyInitializer;
import com.arsdigita.bebop.BoxPanel;
import javax.servlet.http.HttpServletRequest;
@ -115,7 +115,7 @@ public abstract class SimpleSurveyPanel extends SimpleContainer {
// Link to the workspace of the site
m_navBar.add(new Link("Workspace",
"/" + Initializer.getURL(Initializer.WORKSPACE_PAGE_KEY)));
"/" + LegacyInitializer.getURL(LegacyInitializer.WORKSPACE_PAGE_KEY)));
}
protected abstract void addComponentsToPage();