You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/03/04 15:37:40 UTC
svn commit: r633491 -
/incubator/sling/trunk/launchpad/launchpad-webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Author: fmeschbe
Date: Tue Mar 4 06:37:39 2008
New Revision: 633491
URL: http://svn.apache.org/viewvc?rev=633491&view=rev
Log:
Drop dependency on LogbackManager class from servlet and instead just define
the constant as a copy.
Modified:
incubator/sling/trunk/launchpad/launchpad-webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
Modified: incubator/sling/trunk/launchpad/launchpad-webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java?rev=633491&r1=633490&r2=633491&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/main/java/org/apache/sling/launcher/webapp/SlingServlet.java Tue Mar 4 06:37:39 2008
@@ -40,7 +40,6 @@
import org.apache.felix.framework.Logger;
import org.apache.sling.launcher.app.ResourceProvider;
import org.apache.sling.launcher.app.Sling;
-import org.apache.sling.osgi.log.LogbackManager;
import org.eclipse.equinox.http.servlet.HttpServiceServlet;
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
@@ -111,8 +110,11 @@
private static final String[] logLevels = { "FATAL", "ERROR", "WARN",
"INFO", "DEBUG" };
- /** The Sling configuration property name setting the initial log level */
- private static final String PROP_LOG_LEVEL = LogbackManager.LOG_LEVEL;
+ /**
+ * The Sling configuration property name setting the initial log level
+ * (corresponds to LogbackManager.LOG_LEVEL constant)
+ */
+ private static final String PROP_LOG_LEVEL = "org.apache.sling.osgi.log.level";
/**
* The name of the configuration property defining the obr repository.