Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 81324 invoked from network); 10 Apr 2008 08:45:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Apr 2008 08:45:22 -0000 Received: (qmail 49089 invoked by uid 500); 10 Apr 2008 08:45:23 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 49050 invoked by uid 500); 10 Apr 2008 08:45:23 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 49037 invoked by uid 99); 10 Apr 2008 08:45:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Apr 2008 01:45:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Apr 2008 08:44:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 228061A9832; Thu, 10 Apr 2008 01:44:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r646684 - /incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java Date: Thu, 10 Apr 2008 08:44:58 -0000 To: sling-commits@incubator.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080410084459.228061A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Thu Apr 10 01:44:56 2008 New Revision: 646684 URL: http://svn.apache.org/viewvc?rev=646684&view=rev Log: SLING-360 Change default URI for console to /system/console Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java Modified: incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java?rev=646684&r1=646683&r2=646684&view=diff ============================================================================== --- incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java (original) +++ incubator/sling/trunk/osgi/console-web/src/main/java/org/apache/sling/osgi/console/web/internal/servlet/SlingManager.java Thu Apr 10 01:44:56 2008 @@ -116,6 +116,12 @@ */ private static final String PROP_PASSWORD = "password"; + /** + * The default value for the {@link #PROP_MANAGER_ROOT} configuration + * property (value is "/system/console"). + */ + private static final String DEFAULT_MANAGER_ROOT = "/system/console"; + private static final Class[] PLUGIN_CLASSES = { AjaxConfigManagerAction.class, ComponentConfigurationPrinter.class, ComponentRenderAction.class, ConfigManager.class, @@ -556,7 +562,7 @@ } // get the web manager root path - webManagerRoot = this.getProperty(config, PROP_MANAGER_ROOT, "/sling"); + webManagerRoot = this.getProperty(config, PROP_MANAGER_ROOT, DEFAULT_MANAGER_ROOT); if (!webManagerRoot.startsWith("/")) { webManagerRoot = "/" + webManagerRoot; }