Author: cziegeler
Date: Thu Dec 6 06:21:16 2007
New Revision: 601743
URL: http://svn.apache.org/viewvc?rev=601743&view=rev
Log:
More javadoc fixes.
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/AuthorizationHeaderAuthenticationHandler.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/AbstractSlingFilterChain.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/LocaleResolverFilter.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/ThemeResolverFilter.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/log/RequestLoggerFilter.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/EncodedRequestParameter.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/MultipartPostParameter.java
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/SlingHttpServletRequestImpl.java
Thu Dec 6 06:21:16 2007
@@ -33,6 +33,7 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
@@ -88,7 +89,7 @@
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getRequestDispatcher(org.apache.sling.core.component.Content)
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getRequestDispatcher(org.apache.sling.api.resource.Resource)
*/
public RequestDispatcher getRequestDispatcher(Resource resource) {
return getRequestDispatcher(resource, null);
@@ -144,28 +145,28 @@
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getRequestParameter(java.lang.String)
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getRequestParameter(java.lang.String)
*/
public RequestParameter getRequestParameter(String name) {
return this.getParameterSupport().getRequestParameter(name);
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getRequestParameters(java.lang.String)
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getRequestParameters(java.lang.String)
*/
public RequestParameter[] getRequestParameters(String name) {
return this.getParameterSupport().getRequestParameters(name);
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getRequestParameterMap()
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getRequestParameterMap()
*/
public RequestParameterMap getRequestParameterMap() {
return this.getParameterSupport().getRequestParameterMap();
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getCookie(java.lang.String)
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getCookie(java.lang.String)
*/
public Cookie getCookie(String name) {
Cookie[] cookies = getCookies();
@@ -181,12 +182,15 @@
return null;
}
+ /**
+ * @see org.apache.sling.api.SlingHttpServletRequest#getRequestPathInfo()
+ */
public RequestPathInfo getRequestPathInfo() {
return getRequestData().getContentData().getRequestPathInfo();
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getResourceBundle(java.util.Locale)
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getResourceBundle(java.util.Locale)
*/
public ResourceBundle getResourceBundle(Locale locale) {
// TODO should use our resource bundle !!
@@ -194,7 +198,7 @@
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getResponseContentType()
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getResponseContentType()
*/
public String getResponseContentType() {
// TODO Auto-generated method stub
@@ -202,7 +206,7 @@
}
/**
- * @see
org.apache.sling.core.component.ComponentRequest#getResponseContentTypes()
+ * @see
org.apache.sling.api.SlingHttpServletRequest#getResponseContentTypes()
*/
@SuppressWarnings("unchecked")
public Enumeration<String> getResponseContentTypes() {
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/AuthorizationHeaderAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/AuthorizationHeaderAuthenticationHandler.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/AuthorizationHeaderAuthenticationHandler.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/AuthorizationHeaderAuthenticationHandler.java
Thu Dec 6 06:21:16 2007
@@ -87,7 +87,7 @@
* <td><code>null</code>
* <td>no user details were contained in the request </tr>
* <tr>
- * <td>[EMAIL PROTECTED] #DOING_AUTH}
+ * <td>[EMAIL PROTECTED] AuthenticationInfo#DOING_AUTH}
* <td>the handler is in an ongoing authentication exchange with the
* client. The request handling is terminated.
* <tr>
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
Thu Dec 6 06:21:16 2007
@@ -45,6 +45,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import sun.security.krb5.internal.Ticket;
+
/**
* The <code>SlingAuthenticator</code> class is the default implementation of
* the [EMAIL PROTECTED] SlingAuthenticator} interface. This class supports :
@@ -271,8 +273,8 @@
* Any response sent by the handler is also handled by the error handler
* infrastructure.
*
- * @param req The request object
- * @param res The response object to which to send the request
+ * @param request The request object
+ * @param response The response object to which to send the request
*/
public void requestAuthentication(HttpServletRequest request,
HttpServletResponse response) {
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/AbstractSlingFilterChain.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/AbstractSlingFilterChain.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/AbstractSlingFilterChain.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/AbstractSlingFilterChain.java
Thu Dec 6 06:21:16 2007
@@ -38,8 +38,7 @@
}
/**
- * @see
org.apache.sling.core.component.ComponentFilterChain#doFilter(org.apache.sling.core.component.ComponentRequest,
- * org.apache.sling.core.component.ComponentResponse)
+ * @see javax.servlet.FilterChain#doFilter(javax.servlet.ServletRequest,
javax.servlet.ServletResponse)
*/
public void doFilter(ServletRequest request, ServletResponse response)
throws ServletException, IOException {
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/LocaleResolverFilter.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/LocaleResolverFilter.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/LocaleResolverFilter.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/LocaleResolverFilter.java
Thu Dec 6 06:21:16 2007
@@ -58,9 +58,7 @@
private Locale defaultLocale;
/**
- * @see
org.apache.sling.core.component.ComponentFilter#doFilter(org.apache.sling.core.component.ComponentRequest,
- * org.apache.sling.core.component.ComponentResponse,
- * org.apache.sling.core.component.ComponentFilterChain)
+ * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest,
javax.servlet.ServletResponse, javax.servlet.FilterChain)
*/
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain filterChain) throws IOException, ServletException {
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/ThemeResolverFilter.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/ThemeResolverFilter.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/ThemeResolverFilter.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/ThemeResolverFilter.java
Thu Dec 6 06:21:16 2007
@@ -59,7 +59,7 @@
private ThemeResolver themeResolver;
/**
- * Calls the [EMAIL PROTECTED] ThemeResolver#resolveTheme(RenderRequest)}
method if a
+ * Calls the [EMAIL PROTECTED] ThemeResolver#resolveTheme(ServletRequest)}
method if a
* theme resolver is assigned to set the [EMAIL PROTECTED] Theme} for the
current
* request. If no theme resolver is assigned, this method just forwards the
* request to the next filter.
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/log/RequestLoggerFilter.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/log/RequestLoggerFilter.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/log/RequestLoggerFilter.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/log/RequestLoggerFilter.java
Thu Dec 6 06:21:16 2007
@@ -156,7 +156,7 @@
* configuration has already been done by the
* [EMAIL PROTECTED]
#activate(org.osgi.service.component.ComponentContext)} method.
*
- * @param context Not used.
+ * @param config Not used.
*/
public void init(FilterConfig config) {
}
@@ -174,15 +174,15 @@
* <li>Calls loggers configured to be used at request exit time.</li>
* </ol>
*
- * @param request The <code>ComponentRequest</code> representing the
+ * @param sRequest The <code>ServletRequest</code> representing the
* request input sent from the client.
- * @param response The <code>ComponentResponse</code> representing the
+ * @param response The <code>ServletResponse</code> representing the
* response to be sent back to the client.
- * @param filterChain The <code>ComponentFilterChain</code> used to
+ * @param filterChain The <code>FilterChain</code> used to
* forward the request on to the next filter.
* @throws IOException Forwarded if thrown by any filter in the chain or by
* the Component called to handle the request.
- * @throws ComponentException Forwarded if thrown by any filter in the
chain
+ * @throws ServletException Forwarded if thrown by any filter in the chain
* or by the Component called to handle the request.
*/
public void doFilter(ServletRequest sRequest, ServletResponse response,
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/EncodedRequestParameter.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/EncodedRequestParameter.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/EncodedRequestParameter.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/EncodedRequestParameter.java
Thu Dec 6 06:21:16 2007
@@ -41,14 +41,14 @@
}
/**
- * @see org.apache.sling.core.component.RequestParameter#get()
+ * @see org.apache.sling.api.request.RequestParameter#get()
*/
public byte[] get() {
return this.content;
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getContentType()
+ * @see org.apache.sling.api.request.RequestParameter#getContentType()
*/
public String getContentType() {
// none known for www-form-encoded parameters
@@ -56,14 +56,14 @@
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getInputStream()
+ * @see org.apache.sling.api.request.RequestParameter#getInputStream()
*/
public InputStream getInputStream() {
return new ByteArrayInputStream(this.get());
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getFileName()
+ * @see org.apache.sling.api.request.RequestParameter#getFileName()
*/
public String getFileName() {
// no original file name
@@ -71,28 +71,28 @@
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getSize()
+ * @see org.apache.sling.api.request.RequestParameter#getSize()
*/
public long getSize() {
return this.get().length;
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getString()
+ * @see org.apache.sling.api.request.RequestParameter#getString()
*/
public String getString() {
return this.getEncodedString();
}
/**
- * @see
org.apache.sling.core.component.RequestParameter#getString(java.lang.String)
+ * @see
org.apache.sling.api.request.RequestParameter#getString(java.lang.String)
*/
public String getString(String encoding) throws
UnsupportedEncodingException {
return new String(this.get(), encoding);
}
/**
- * @see org.apache.sling.core.component.RequestParameter#isFormField()
+ * @see org.apache.sling.api.request.RequestParameter#isFormField()
*/
public boolean isFormField() {
// www-form-encoded are always form fields
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/MultipartPostParameter.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/MultipartPostParameter.java?rev=601743&r1=601742&r2=601743&view=diff
==============================================================================
---
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/MultipartPostParameter.java
(original)
+++
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/parameters/MultipartPostParameter.java
Thu Dec 6 06:21:16 2007
@@ -45,28 +45,28 @@
}
/**
- * @see org.apache.sling.core.component.RequestParameter#get()
+ * @see org.apache.sling.api.request.RequestParameter#get()
*/
public byte[] get() {
return this.delegatee.get();
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getContentType()
+ * @see org.apache.sling.api.request.RequestParameter#getContentType()
*/
public String getContentType() {
return this.delegatee.getContentType();
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getInputStream()
+ * @see org.apache.sling.api.request.RequestParameter#getInputStream()
*/
public InputStream getInputStream() throws IOException {
return this.delegatee.getInputStream();
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getFileName()
+ * @see org.apache.sling.api.request.RequestParameter#getFileName()
*/
public String getFileName() {
if (this.encodedFileName == null && this.delegatee.getName() != null) {
@@ -86,14 +86,14 @@
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getSize()
+ * @see org.apache.sling.api.request.RequestParameter#getSize()
*/
public long getSize() {
return this.delegatee.getSize();
}
/**
- * @see org.apache.sling.core.component.RequestParameter#getString()
+ * @see org.apache.sling.api.request.RequestParameter#getString()
*/
public String getString() {
// only apply encoding in the case of a form field
@@ -118,14 +118,14 @@
}
/**
- * @see
org.apache.sling.core.component.RequestParameter#getString(java.lang.String)
+ * @see
org.apache.sling.api.request.RequestParameter#getString(java.lang.String)
*/
public String getString(String enc) throws UnsupportedEncodingException {
return this.delegatee.getString(enc);
}
/**
- * @see org.apache.sling.core.component.RequestParameter#isFormField()
+ * @see org.apache.sling.api.request.RequestParameter#isFormField()
*/
public boolean isFormField() {
return this.delegatee.isFormField();
