juergen 01/02/20 01:16:57
Modified: src/webdav/server/org/apache/slide/webdav WebdavServlet.java
Log:
nothing changed
Revision Changes Path
1.5 +172 -171
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebdavServlet.java 2001/02/14 12:25:49 1.4
+++ WebdavServlet.java 2001/02/20 09:16:57 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
1.4 2001/02/14 12:25:49 juergen Exp $
- * $Revision: 1.4 $
- * $Date: 2001/02/14 12:25:49 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
1.5 2001/02/20 09:16:57 juergen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/02/20 09:16:57 $
*
* ====================================================================
*
@@ -121,91 +121,91 @@
* Show HTTP header information.
*/
private void showRequestInfo(HttpServletRequest req) {
-
- System.out.println();
- System.out.println("SlideDAV Request Info");
- System.out.println();
-
- // Show generic info
- System.out.println("Encoding : " + req.getCharacterEncoding());
- System.out.println("Length : " + req.getContentLength());
- System.out.println("Type : " + req.getContentType());
-
- System.out.println();
- System.out.println("Parameters");
-
- Enumeration parameters = req.getParameterNames();
-
- while (parameters.hasMoreElements()) {
- String paramName = (String) parameters.nextElement();
- String[] values = req.getParameterValues(paramName);
- System.out.print(paramName + " : ");
- for (int i = 0; i < values.length; i++) {
- System.out.print(values[i] + ", ");
- }
- System.out.println();
- }
-
- System.out.println();
-
- System.out.println("Protocol : " + req.getProtocol());
- System.out.println("Address : " + req.getRemoteAddr());
- System.out.println("Host : " + req.getRemoteHost());
- System.out.println("Scheme : " + req.getScheme());
- System.out.println("Server Name : " + req.getServerName());
- System.out.println("Server Port : " + req.getServerPort());
-
- System.out.println();
- System.out.println("Attributes");
-
- Enumeration attributes = req.getAttributeNames();
-
- while (attributes.hasMoreElements()) {
- String attributeName = (String) attributes.nextElement();
- System.out.print(attributeName + " : ");
- System.out.println(req.getAttribute(attributeName).toString());
- }
-
- System.out.println();
-
- // Show HTTP info
- System.out.println();
- System.out.println("HTTP Header Info");
- System.out.println();
-
- System.out.println("Authentication Type : " + req.getAuthType());
- System.out.println("HTTP Method : " + req.getMethod());
- System.out.println("Path Info : " + req.getPathInfo());
- System.out.println("Path translated : " + req.getPathTranslated());
- System.out.println("Query string : " + req.getQueryString());
- System.out.println("Remote user : " + req.getRemoteUser());
- System.out.println("Requested session id : "
- + req.getRequestedSessionId());
- System.out.println("Request URI : " + req.getRequestURI());
- System.out.println("Context path : " + req.getContextPath());
- System.out.println("Servlet path : " + req.getServletPath());
- System.out.println("User principal : " + req.getUserPrincipal());
-
-
- System.out.println();
- System.out.println("Headers : ");
-
- Enumeration headers = req.getHeaderNames();
-
- while (headers.hasMoreElements()) {
- String headerName = (String) headers.nextElement();
- System.out.print(headerName + " : ");
- System.out.println(req.getHeader(headerName));
- }
-
- // Show session info
- HttpSession session = req.getSession(false);
-
- System.out.println();
- System.out.println("End Request Info");
- System.out.println();
- System.out.println();
-
+
+ System.out.println();
+ System.out.println("SlideDAV Request Info");
+ System.out.println();
+
+ // Show generic info
+ System.out.println("Encoding : " + req.getCharacterEncoding());
+ System.out.println("Length : " + req.getContentLength());
+ System.out.println("Type : " + req.getContentType());
+
+ System.out.println();
+ System.out.println("Parameters");
+
+ Enumeration parameters = req.getParameterNames();
+
+ while (parameters.hasMoreElements()) {
+ String paramName = (String) parameters.nextElement();
+ String[] values = req.getParameterValues(paramName);
+ System.out.print(paramName + " : ");
+ for (int i = 0; i < values.length; i++) {
+ System.out.print(values[i] + ", ");
+ }
+ System.out.println();
+ }
+
+ System.out.println();
+
+ System.out.println("Protocol : " + req.getProtocol());
+ System.out.println("Address : " + req.getRemoteAddr());
+ System.out.println("Host : " + req.getRemoteHost());
+ System.out.println("Scheme : " + req.getScheme());
+ System.out.println("Server Name : " + req.getServerName());
+ System.out.println("Server Port : " + req.getServerPort());
+
+ System.out.println();
+ System.out.println("Attributes");
+
+ Enumeration attributes = req.getAttributeNames();
+
+ while (attributes.hasMoreElements()) {
+ String attributeName = (String) attributes.nextElement();
+ System.out.print(attributeName + " : ");
+ System.out.println(req.getAttribute(attributeName).toString());
+ }
+
+ System.out.println();
+
+ // Show HTTP info
+ System.out.println();
+ System.out.println("HTTP Header Info");
+ System.out.println();
+
+ System.out.println("Authentication Type : " + req.getAuthType());
+ System.out.println("HTTP Method : " + req.getMethod());
+ System.out.println("Path Info : " + req.getPathInfo());
+ System.out.println("Path translated : " + req.getPathTranslated());
+ System.out.println("Query string : " + req.getQueryString());
+ System.out.println("Remote user : " + req.getRemoteUser());
+ System.out.println("Requested session id : "
+ + req.getRequestedSessionId());
+ System.out.println("Request URI : " + req.getRequestURI());
+ System.out.println("Context path : " + req.getContextPath());
+ System.out.println("Servlet path : " + req.getServletPath());
+ System.out.println("User principal : " + req.getUserPrincipal());
+
+
+ System.out.println();
+ System.out.println("Headers : ");
+
+ Enumeration headers = req.getHeaderNames();
+
+ while (headers.hasMoreElements()) {
+ String headerName = (String) headers.nextElement();
+ System.out.print(headerName + " : ");
+ System.out.println(req.getHeader(headerName));
+ }
+
+ // Show session info
+ HttpSession session = req.getSession(false);
+
+ System.out.println();
+ System.out.println("End Request Info");
+ System.out.println();
+ System.out.println();
+
}
@@ -214,29 +214,29 @@
* Show HTTP header information.
*/
private void showResponseInfo(HttpServletResponse req) {
-
- System.out.println();
- System.out.println("SlideDAV Response Info");
- System.out.println();
-
- // Show generic info
- System.out.println("Encoding : " + req.getCharacterEncoding());
- System.out.println("Buffer size : " + req.getBufferSize());
-
- System.out.println();
- System.out.println("End Response Info");
- System.out.println();
- System.out.println();
-
+
+ System.out.println();
+ System.out.println("SlideDAV Response Info");
+ System.out.println();
+
+ // Show generic info
+ System.out.println("Encoding : " + req.getCharacterEncoding());
+ System.out.println("Buffer size : " + req.getBufferSize());
+
+ System.out.println();
+ System.out.println("End Response Info");
+ System.out.println();
+ System.out.println();
+
}
+
+
+
-
-
-
-
-
-
+
+
+
/**
* Create Slide Method form the HTTP Method.
*
@@ -244,47 +244,47 @@
* @exception WebdavException
*/
private WebdavMethod createWebdavMethod
- (HttpServletRequest req, HttpServletResponse resp)
- throws WebdavException {
+ (HttpServletRequest req, HttpServletResponse resp)
+ throws WebdavException {
- String methodName = req.getMethod();
-
- WebdavMethod resultMethod = null;
-
- if (methodName.equalsIgnoreCase("GET")) {
- resultMethod = new GetMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("PROPFIND")) {
- resultMethod = new PropFindMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("HEAD")) {
- resultMethod = new HeadMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("LOCK")) {
- resultMethod = new LockMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("UNLOCK")) {
- resultMethod = new UnlockMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("OPTIONS")) {
- resultMethod = new OptionsMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("PUT")) {
- resultMethod = new PutMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("MKCOL")) {
- resultMethod = new MkcolMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("POST")) {
- resultMethod = new PostMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("COPY")) {
- resultMethod = new CopyMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("MOVE")) {
- resultMethod = new MoveMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("DELETE")) {
- resultMethod = new DeleteMethod(this, token, req, resp);
- } else if (methodName.equalsIgnoreCase("PROPPATCH")) {
- resultMethod = new PropPatchMethod(this, token, req, resp);
- }
-
- if (resultMethod == null) {
- throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
- }
+ String methodName = req.getMethod();
+
+ WebdavMethod resultMethod = null;
+
+ if (methodName.equalsIgnoreCase("GET")) {
+ resultMethod = new GetMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("PROPFIND")) {
+ resultMethod = new PropFindMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("HEAD")) {
+ resultMethod = new HeadMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("LOCK")) {
+ resultMethod = new LockMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("UNLOCK")) {
+ resultMethod = new UnlockMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("OPTIONS")) {
+ resultMethod = new OptionsMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("PUT")) {
+ resultMethod = new PutMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("MKCOL")) {
+ resultMethod = new MkcolMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("POST")) {
+ resultMethod = new PostMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("COPY")) {
+ resultMethod = new CopyMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("MOVE")) {
+ resultMethod = new MoveMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("DELETE")) {
+ resultMethod = new DeleteMethod(this, token, req, resp);
+ } else if (methodName.equalsIgnoreCase("PROPPATCH")) {
+ resultMethod = new PropPatchMethod(this, token, req, resp);
+ }
- return resultMethod;
-
+ if (resultMethod == null) {
+ throw new WebdavException(WebdavStatus.SC_BAD_REQUEST);
+ }
+
+ return resultMethod;
+
}
@@ -295,7 +295,7 @@
throws ServletException, IOException {
//showRequestInfo(req);
- long startTime = System.currentTimeMillis();
+ long startTime = System.currentTimeMillis();
resp.setStatus(WebdavStatus.SC_OK);
WebdavMethod method = null;
@@ -313,9 +313,9 @@
e.printStackTrace();
}
-
+
//showResponseInfo(resp);
-
+
Domain.info
(req.getMethod()
//+ " = " + resp.get // wanted to print the status code of this
webdav call
@@ -336,27 +336,27 @@
String managerServletPath = "/manager/";
String value = null;
- try {
- value = getServletConfig().getInitParameter("namespace");
- if (value != null)
- namespaceName = value;
- } catch (Throwable t) {
- ;
- }
- try {
- value = getServletConfig().getInitParameter("domain");
- if (value != null)
- domainConfigFile = value;
- } catch (Throwable t) {
- ;
- }
- try {
- value = getServletConfig().getInitParameter("manager");
- if (value != null)
- managerServletPath = value;
- } catch (Throwable t) {
- ;
- }
+ try {
+ value = getServletConfig().getInitParameter("namespace");
+ if (value != null)
+ namespaceName = value;
+ } catch (Throwable t) {
+ ;
+ }
+ try {
+ value = getServletConfig().getInitParameter("domain");
+ if (value != null)
+ domainConfigFile = value;
+ } catch (Throwable t) {
+ ;
+ }
+ try {
+ value = getServletConfig().getInitParameter("manager");
+ if (value != null)
+ managerServletPath = value;
+ } catch (Throwable t) {
+ ;
+ }
WebdavMethod.init(managerServletPath);
@@ -400,3 +400,4 @@
}
}
+
