You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2008/03/11 11:09:13 UTC
svn commit: r635864 - in /incubator/sling/trunk:
osgi/log/src/main/java/org/apache/sling/osgi/log/LogbackManager.java
sling/core/src/main/java/org/apache/sling/core/impl/helper/SlingServletContext.java
Author: cziegeler
Date: Tue Mar 11 03:08:58 2008
New Revision: 635864
URL: http://svn.apache.org/viewvc?rev=635864&view=rev
Log:
Remove unused imports.
Modified:
incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/LogbackManager.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/helper/SlingServletContext.java
Modified: incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/LogbackManager.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/LogbackManager.java?rev=635864&r1=635863&r2=635864&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/LogbackManager.java (original)
+++ incubator/sling/trunk/osgi/log/src/main/java/org/apache/sling/osgi/log/LogbackManager.java Tue Mar 11 03:08:58 2008
@@ -43,7 +43,6 @@
import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
import ch.qos.logback.core.rolling.RollingFileAppender;
import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
-import ch.qos.logback.core.util.FileSize;
/**
* The <code>LogbackManager</code> manages the loggers used by the LogService
@@ -68,7 +67,7 @@
public static final String LOG_FILE = "org.apache.sling.osgi.log.file";
public static final String LOG_FILE_NUMBER = "org.apache.sling.osgi.log.file.number";
-
+
public static final String LOG_FILE_SIZE = "org.apache.sling.osgi.log.file.size";
public static final String LOG_PATTERN = "org.apache.sling.osgi.log.pattern";
@@ -78,9 +77,9 @@
public static final String LOG_PATTERN_DEFAULT = "%d{dd.MM.yyyy HH:mm:ss} *%-5p* %c{1}: %m%n";
public static final int LOG_FILE_NUMBER_DEFAULT = 5;
-
+
public static final String LOG_FILE_SIZE_DEFAULT = "10MB";
-
+
/**
* default log category - set during init()
*/
@@ -308,7 +307,7 @@
if (fileNum <= 0) {
fileNum = LOG_FILE_NUMBER_DEFAULT;
}
-
+
// keep the number old log files
FixedWindowRollingPolicy rolling = new FixedWindowRollingPolicy();
rolling.setFileNamePattern(logFileName + ".%i");
@@ -320,9 +319,9 @@
Object fileSizeObj = context.getProperty(LOG_FILE_SIZE);
String fileSize = (fileSizeObj != null) ? fileSizeObj.toString() : null;
if (fileSize == null || fileSize.length() == 0) {
- fileSize = LOG_FILE_SIZE_DEFAULT;
+ fileSize = LOG_FILE_SIZE_DEFAULT;
}
-
+
// switch log file after 1MB
SizeBasedTriggeringPolicy trigger = new SizeBasedTriggeringPolicy();
trigger.setMaxFileSize(fileSize);
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/helper/SlingServletContext.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/helper/SlingServletContext.java?rev=635864&r1=635863&r2=635864&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/helper/SlingServletContext.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/helper/SlingServletContext.java Tue Mar 11 03:08:58 2008
@@ -30,7 +30,6 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import org.apache.sling.core.impl.SlingMainServlet;
import org.apache.sling.core.impl.request.SlingRequestDispatcher;
@@ -115,7 +114,7 @@
if (delegatee != null) {
return delegatee.getServletContextName();
}
-
+
return null;
}
@@ -144,7 +143,7 @@
if (delegatee != null) {
return delegatee.getInitParameter(name);
}
-
+
return null;
}
@@ -159,7 +158,7 @@
if (delegatee != null) {
return delegatee.getInitParameterNames();
}
-
+
return null;
}
@@ -175,7 +174,7 @@
if (delegatee != null) {
return delegatee.getAttribute(name);
}
-
+
return null;
}
@@ -190,7 +189,7 @@
if (delegatee != null) {
return delegatee.getAttributeNames();
}
-
+
return Collections.enumeration(Collections.<String>emptyList());
}
@@ -239,7 +238,7 @@
if (delegatee != null) {
return delegatee.getMajorVersion();
}
-
+
return 2; // hard coded major version as fall back
}
@@ -254,7 +253,7 @@
if (delegatee != null) {
return delegatee.getMinorVersion();
}
-
+
return 4; // hard coded minor version as fall back
}
@@ -270,7 +269,7 @@
if (delegatee != null) {
return delegatee.getMimeType(file);
}
-
+
return null;
}
@@ -300,7 +299,7 @@
if (delegatee != null) {
return delegatee.getNamedDispatcher(name);
}
-
+
return null;
}
@@ -316,7 +315,7 @@
if (delegatee != null) {
return delegatee.getResource(path);
}
-
+
return null;
}
@@ -330,7 +329,7 @@
if (delegatee != null) {
return delegatee.getResourceAsStream(path);
}
-
+
return null;
}
@@ -345,7 +344,7 @@
if (delegatee != null) {
return delegatee.getResourcePaths(parentPath);
}
-
+
return null;
}
@@ -360,7 +359,7 @@
if (delegatee != null) {
return delegatee.getRealPath(path);
}
-
+
return null;
}
@@ -394,7 +393,7 @@
if (delegatee != null) {
return delegatee.getContext(uripath);
}
-
+
return null;
}