From e1f6a45065271e6852b8d773b95868ded5429600 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 2 Feb 2016 08:29:16 +0000 Subject: [PATCH] CCM NG: Changed constant name for path of admin servlet from ADMIN_SERVLET to ADMIN_SERVLET_PATH git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3836 8810af33-2d31-482b-a856-94f89814c4df --- .../src/main/java/com/arsdigita/ui/admin/AdminConstants.java | 2 +- .../src/main/java/com/arsdigita/ui/admin/AdminServlet.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminConstants.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminConstants.java index 8150fcefb..f8aebea03 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminConstants.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminConstants.java @@ -404,7 +404,7 @@ interface AdminConstants { public final static String ADMIN_PAGE_URL = "/admin/"; - public final static String ADMIN_SERVLET = "/admin/*"; + public final static String ADMIN_SERVLET_PATH = "/admin/*"; } diff --git a/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminServlet.java b/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminServlet.java index b0ba2ce02..900351e1e 100644 --- a/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminServlet.java +++ b/ccm-core/src/main/java/com/arsdigita/ui/admin/AdminServlet.java @@ -43,7 +43,7 @@ import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static com.arsdigita.ui.login.LoginConstants.*; +import static com.arsdigita.ui.admin.AdminConstants.*; /** * Web Developer Support Application Servlet class, central entry point to @@ -60,7 +60,7 @@ import static com.arsdigita.ui.login.LoginConstants.*; * @author Jens Pelzetter * @author pb */ -@WebServlet(urlPatterns = {LOGIN_SERVLET_PATH}) +@WebServlet(urlPatterns = {ADMIN_SERVLET_PATH}) public class AdminServlet extends BaseApplicationServlet implements AdminConstants {