From 74fb0b9aa4c3e2b2ed6a9a76bbe5d1798bc99aba Mon Sep 17 00:00:00 2001 From: pb Date: Thu, 5 May 2011 08:31:54 +0000 Subject: [PATCH] Portal Admin Seite funktioniert wieder, Benennungskonvention nicht richtig interpretiert. git-svn-id: https://svn.libreccm.org/ccm/trunk@896 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/templating/ApplicationPatternGenerator.java | 4 ++-- ccm-core/src/com/arsdigita/web/URL.java | 4 ++-- ...-workspace-admin.xsl => portal-workspace-portal-admin.xsl} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename ccm-gen-aplaws/web/themes/static/aplaws-generic/{portal-workspace-admin.xsl => portal-workspace-portal-admin.xsl} (100%) diff --git a/ccm-core/src/com/arsdigita/templating/ApplicationPatternGenerator.java b/ccm-core/src/com/arsdigita/templating/ApplicationPatternGenerator.java index 2a5f20893..fa9d7a85a 100755 --- a/ccm-core/src/com/arsdigita/templating/ApplicationPatternGenerator.java +++ b/ccm-core/src/com/arsdigita/templating/ApplicationPatternGenerator.java @@ -56,7 +56,7 @@ public class ApplicationPatternGenerator implements PatternGenerator { final Application app = Web.getContext().getApplication(); if (app != null) { String[] returnValue = { app.getApplicationType().getName() }; - s_log.warn("Found application >>"+returnValue+"<< in Application."); + s_log.debug("Found application >>"+returnValue+"<< in Application."); return returnValue; } @@ -84,7 +84,7 @@ public class ApplicationPatternGenerator implements PatternGenerator { return returnValue; } - s_log.warn("ApplicationType for " +key + + s_log.debug("ApplicationType for " +key + " could not be found in SiteNodes either. Returning empty String[]"); return new String[] {}; diff --git a/ccm-core/src/com/arsdigita/web/URL.java b/ccm-core/src/com/arsdigita/web/URL.java index 682cce0ac..dc7383591 100755 --- a/ccm-core/src/com/arsdigita/web/URL.java +++ b/ccm-core/src/com/arsdigita/web/URL.java @@ -867,12 +867,12 @@ public class URL { return url; } - public static final URL excursion(final HttpServletRequest sreq, + public final URL excursion(final HttpServletRequest sreq, final String path) { return URL.excursion(sreq, path, new ParameterMap()); } - static final URL login(final HttpServletRequest sreq) { + static URL login(final HttpServletRequest sreq) { return URL.excursion(sreq, Util.getSecurityHelper().getLoginURL(sreq), (ParameterMap) s_empty.get()); } diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl similarity index 100% rename from ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-admin.xsl rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl