Author: cziegeler
Date: Wed Dec 19 08:53:24 2007
New Revision: 605615
URL: http://svn.apache.org/viewvc?rev=605615&view=rev
Log:
Fix javadocs and remove unused imports.
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultErrorHandlerServlet.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/ErrorSlingHttpServletRequest.java
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingScriptServlet.java
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java?rev=605615&r1=605614&r2=605615&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java
(original)
+++
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/ServletResolverConstants.java
Wed Dec 19 08:53:24 2007
@@ -33,7 +33,7 @@
* The name of the registered servlet used as the default servlet if no
* other servlet or script could be selected (value is
* "sling.core.servlet.default"). If no servlet is registered under this
- * name, the [EMAIL PROTECTED]
org.apache.sling.core.servlets.DefaultServlet} is used.
+ * name, the [EMAIL PROTECTED]
org.apache.sling.servlet.resolver.defaults.DefaultServlet} is used.
*/
public static final String DEFAULT_SERVLET_NAME =
"sling.core.servlet.default";
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java?rev=605615&r1=605614&r2=605615&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
(original)
+++
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/SlingServletResolver.java
Wed Dec 19 08:53:24 2007
@@ -18,13 +18,9 @@
*/
package org.apache.sling.servlet.resolver;
-import static org.apache.sling.api.SlingConstants.ERROR_MESSAGE;
-import static org.apache.sling.api.SlingConstants.ERROR_REQUEST_URI;
-import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
-import static org.apache.sling.api.SlingConstants.ERROR_STATUS;
-import static org.apache.sling.core.CoreConstants.SLING_CURRENT_SERVLET_NAME;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.DEFAULT_SERVLET_NAME;
-import static
org.apache.sling.servlet.resolver.ServletResolverConstants.SLING_RESOURCE_TYPES;
+import static org.apache.sling.api.SlingConstants.*;
+import static org.apache.sling.core.CoreConstants.*;
+import static org.apache.sling.servlet.resolver.ServletResolverConstants.*;
import java.io.IOException;
import java.util.ArrayList;
@@ -46,7 +42,6 @@
import org.apache.sling.api.scripting.SlingScript;
import org.apache.sling.api.scripting.SlingScriptResolver;
import org.apache.sling.api.servlets.ServletResolver;
-import org.apache.sling.core.CoreConstants;
import org.apache.sling.core.servlets.AbstractServiceReferenceConfig;
import org.apache.sling.core.servlets.ErrorHandler;
import org.apache.sling.servlet.resolver.defaults.DefaultErrorHandlerServlet;
@@ -62,7 +57,7 @@
/**
* The <code>SlingServletResolver</code> TODO
- *
+ *
* @scr.component label="%servletresolver.name"
* description="%servletresolver.description"
* @scr.property name="service.description" value="Sling Servlet Resolver and
@@ -161,7 +156,7 @@
request.setAttribute(ERROR_STATUS, new Integer(
status));
request.setAttribute(ERROR_MESSAGE, message);
-
+
// the servlet name for a sendError handling is still stored
// as the request attribute
Object servletName =
request.getAttribute(SLING_CURRENT_SERVLET_NAME);
@@ -366,20 +361,20 @@
boolean destroy;
Collection<ServiceReference> refs;
-
+
synchronized (this) {
-
+
if (this.servletContext == null) {
-
+
refs = pendingServlets;
pendingServlets = new ArrayList<ServiceReference>();
destroy = false;
-
+
} else {
-
+
refs = new
ArrayList<ServiceReference>(servletsByReference.keySet());
destroy = true;
-
+
}
this.servletContext = newServletContext;
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultErrorHandlerServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultErrorHandlerServlet.java?rev=605615&r1=605614&r2=605615&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultErrorHandlerServlet.java
(original)
+++
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/defaults/DefaultErrorHandlerServlet.java
Wed Dec 19 08:53:24 2007
@@ -70,13 +70,9 @@
}
/**
- * Returns the stack trace for the root exception in this. If this does not
- * contain exception - as is the case if not handling a thrown exception,
- * the method returned the undefined value.
- *
- * @return The stacktrace for the rootException or the undefined value if
- * this has no rootException, that is if not handling a thrown
- * exception.
+ * Print the stack trace for the root exception if the throwable is a
+ * [EMAIL PROTECTED] ServletException}. If this does not contain an
exception,
+ * the throwable itself is printed.
*/
private void printStackTrace(PrintWriter pw, Throwable t) {
// nothing to do, if there is no exception
@@ -123,11 +119,11 @@
pw.println("<h1>" + statusMessage + " (" + statusCode + ")</h1>");
pw.print("<p>The requested URL " + requestUri
+ " resulted in an error");
-
+
if (servletName != null) {
pw.print(" in " + servletName);
}
-
+
pw.println(".</p>");
return pw;
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/ErrorSlingHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/ErrorSlingHttpServletRequest.java?rev=605615&r1=605614&r2=605615&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/ErrorSlingHttpServletRequest.java
(original)
+++
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/ErrorSlingHttpServletRequest.java
Wed Dec 19 08:53:24 2007
@@ -18,21 +18,14 @@
*/
package org.apache.sling.servlet.resolver.helper;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
-import java.util.Map;
import java.util.ResourceBundle;
import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpSession;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
@@ -63,7 +56,7 @@
public void setMethod(String methodName) {
this.methodName = methodName.toLowerCase();
}
-
+
@Override
public String getMethod() {
return methodName;
Modified:
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingScriptServlet.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingScriptServlet.java?rev=605615&r1=605614&r2=605615&view=diff
==============================================================================
---
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingScriptServlet.java
(original)
+++
incubator/sling/trunk/sling/servlet-resolver/src/main/java/org/apache/sling/servlet/resolver/helper/SlingScriptServlet.java
Wed Dec 19 08:53:24 2007
@@ -18,10 +18,8 @@
*/
package org.apache.sling.servlet.resolver.helper;
-import static java.lang.Boolean.TRUE;
-import static org.apache.sling.api.scripting.SlingBindings.FLUSH;
-import static org.apache.sling.api.scripting.SlingBindings.REQUEST;
-import static org.apache.sling.api.scripting.SlingBindings.RESPONSE;
+import static java.lang.Boolean.*;
+import static org.apache.sling.api.scripting.SlingBindings.*;
import java.io.IOException;
@@ -39,12 +37,12 @@
/**
* The <code>SlingScriptServlet</code> is a servlet encapsulating a
* <code>SlingScript</code> instance for unified use in the
- * [EMAIL PROTECTED] SlingServletResolver}.
+ * [EMAIL PROTECTED] org.apache.sling.servlet.resolver.SlingServletResolver}.
*/
public class SlingScriptServlet implements Servlet {
private ServletConfig servletConfig;
-
+
/**
* The script to call in the
* [EMAIL PROTECTED] #service(ServletRequest, ServletResponse)} method.
