stefano 2003/12/11 18:59:23
Modified: src/webdav/server/org/apache/slide/webdav/method/report
ExpandPropertyReport.java VersionTreeReport.java
PrincipalPropertySearchReport.java
AbstractReport.java PrincipalMatchReport.java
LocateByHistoryReport.java
src/webdav/server/org/apache/slide/webdav/method
BindMethod.java RebindMethod.java
OptionsMethod.java UnlockMethod.java
LabelMethod.java HeadMethod.java MethodUtil.java
PostMethod.java AbstractWebdavMethod.java
UpdateMethod.java SearchMethod.java
MkcolMethod.java
src/webdav/server/org/apache/slide/webdav/logger
XServletOutputStreamFacade.java
XHttpServletResponseFacade.java
XServletWriterFacade.java
XHttpServletRequestFacade.java
src/webdav/server/org/apache/slide/webdav/util
WorkspacePathHandler.java
ResourceWithProvidedProperties.java
WorkingresourcePathHandler.java
HistoryPathHandler.java DeltavConstants.java
DeltavUriRedirector.java
src/webdav/server/org/apache/slide/webdav
WebdavMethodFactory.java WebdavServlet.java
Log:
cleaning up unused import statements
Revision Changes Path
1.2 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/ExpandPropertyReport.java
Index: ExpandPropertyReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/ExpandPropertyReport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExpandPropertyReport.java 1 Dec 2003 12:10:50 -0000 1.1
+++ ExpandPropertyReport.java 12 Dec 2003 02:59:22 -0000 1.2
@@ -68,6 +68,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyParseException;
import org.apache.slide.common.RequestedProperties;
@@ -82,7 +83,6 @@
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.WebdavUtils;
import org.jdom.Element;
-import org.jdom.JDOMException;
import org.jdom.Namespace;
1.2 +4 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/VersionTreeReport.java
Index: VersionTreeReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/VersionTreeReport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VersionTreeReport.java 1 Dec 2003 12:10:50 -0000 1.1
+++ VersionTreeReport.java 12 Dec 2003 02:59:22 -0000 1.2
@@ -67,6 +67,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyParseException;
import org.apache.slide.common.RequestedProperties;
@@ -83,7 +84,6 @@
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
-import org.apache.slide.webdav.util.PropertyRetrieverImpl;
import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
@@ -94,7 +94,6 @@
import org.apache.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.JDOMException;
-
/**
* DAV:version-tree report worker.
1.3 +4 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalPropertySearchReport.java
Index: PrincipalPropertySearchReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalPropertySearchReport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PrincipalPropertySearchReport.java 2 Dec 2003 14:07:02 -0000 1.2
+++ PrincipalPropertySearchReport.java 12 Dec 2003 02:59:22 -0000 1.3
@@ -67,6 +67,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyParseException;
import org.apache.slide.common.RequestedProperties;
@@ -83,14 +84,12 @@
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
-import org.apache.slide.webdav.util.PropertyHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.Namespace;
import org.jdom.output.XMLOutputter;
-
/**
* DAV:principal-property-search report worker.
1.3 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AbstractReport.java
Index: AbstractReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AbstractReport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractReport.java 2 Dec 2003 14:07:02 -0000 1.2
+++ AbstractReport.java 12 Dec 2003 02:59:22 -0000 1.3
@@ -66,14 +66,15 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.RequestedProperties;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
import org.apache.slide.content.Content;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionNumber;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.search.Search;
import org.apache.slide.security.Security;
import org.apache.slide.structure.Structure;
@@ -81,7 +82,6 @@
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
-import org.apache.slide.webdav.util.PropertyHelper;
import org.apache.slide.webdav.util.PropertyRetriever;
import org.apache.slide.webdav.util.PropertyRetrieverImpl;
import org.apache.slide.webdav.util.WebdavUtils;
1.3 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalMatchReport.java
Index: PrincipalMatchReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalMatchReport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PrincipalMatchReport.java 2 Dec 2003 14:07:02 -0000 1.2
+++ PrincipalMatchReport.java 12 Dec 2003 02:59:22 -0000 1.3
@@ -66,6 +66,7 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyParseException;
import org.apache.slide.common.RequestedProperties;
@@ -82,7 +83,6 @@
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
-import org.apache.slide.webdav.util.PropertyHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.util.WebdavStatus;
1.2 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/LocateByHistoryReport.java
Index: LocateByHistoryReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/LocateByHistoryReport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocateByHistoryReport.java 1 Dec 2003 12:10:50 -0000 1.1
+++ LocateByHistoryReport.java 12 Dec 2003 02:59:22 -0000 1.2
@@ -67,6 +67,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.PropertyParseException;
import org.apache.slide.common.RequestedProperties;
@@ -82,7 +83,6 @@
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.UriHandler;
-import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
1.11 +4 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/BindMethod.java
Index: BindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/BindMethod.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BindMethod.java 18 Sep 2003 11:01:07 -0000 1.10
+++ BindMethod.java 12 Dec 2003 02:59:22 -0000 1.11
@@ -65,11 +65,11 @@
import java.io.IOException;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.structure.CrossServerBindingException;
import org.apache.slide.structure.ObjectNode;
1.9 +4 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/RebindMethod.java
Index: RebindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/RebindMethod.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RebindMethod.java 18 Sep 2003 11:01:07 -0000 1.8
+++ RebindMethod.java 12 Dec 2003 02:59:22 -0000 1.9
@@ -65,11 +65,11 @@
import java.io.IOException;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.structure.CrossServerBindingException;
import org.apache.slide.structure.ObjectNode;
@@ -81,7 +81,6 @@
import org.apache.slide.webdav.util.ViolatedPrecondition;
import org.apache.util.WebdavStatus;
import org.jdom.JDOMException;
-
/**
* REBIND method.
1.37 +4 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/OptionsMethod.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- OptionsMethod.java 5 Nov 2003 14:24:34 -0000 1.36
+++ OptionsMethod.java 12 Dec 2003 02:59:22 -0000 1.37
@@ -65,9 +65,9 @@
import java.io.IOException;
import java.util.Iterator;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.SlideException;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.search.SearchLanguage;
@@ -87,7 +87,6 @@
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
-import org.jdom.Namespace;
import org.jdom.output.XMLOutputter;
1.30 +24 -21
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UnlockMethod.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- UnlockMethod.java 1 Dec 2003 12:10:50 -0000 1.29
+++ UnlockMethod.java 12 Dec 2003 02:59:22 -0000 1.30
@@ -63,30 +63,33 @@
package org.apache.slide.webdav.method;
-import java.security.Principal;
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.util.WebdavStatus;
-import org.apache.slide.common.*;
-import org.apache.slide.webdav.*;
-import org.apache.slide.macro.*;
-import org.apache.slide.lock.*;
-import org.apache.slide.content.*;
+import java.io.IOException;
+import java.util.Enumeration;
+
+import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.common.SlideException;
+import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.content.NodeRevisionDescriptors;
+import org.apache.slide.content.RevisionDescriptorNotFoundException;
import org.apache.slide.content.NodeProperty.NamespaceCache;
-import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.structure.*;
-import org.apache.slide.webdav.util.WebdavUtils;
+import org.apache.slide.lock.LockTokenNotFoundException;
+import org.apache.slide.lock.NodeLock;
+import org.apache.slide.structure.LinkedObjectNotFoundException;
+import org.apache.slide.structure.ObjectNode;
+import org.apache.slide.structure.ObjectNotFoundException;
+import org.apache.slide.util.Configuration;
+import org.apache.slide.webdav.WebdavException;
+import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.DeltavConstants;
-import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.PreconditionViolationException;
+import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.UriHandler;
-import org.apache.slide.webdav.util.resourcekind.ResourceKind;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.CheckedOutVersionControlled;
-import org.apache.slide.util.Configuration;
+import org.apache.slide.webdav.util.resourcekind.ResourceKind;
+import org.apache.util.WebdavStatus;
/**
* UNLOCK method.
1.21 +6 -9
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java
Index: LabelMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LabelMethod.java 5 Nov 2003 14:24:35 -0000 1.20
+++ LabelMethod.java 12 Dec 2003 02:59:22 -0000 1.21
@@ -61,24 +61,22 @@
*
*/
-
package org.apache.slide.webdav.method;
-// import list
import java.io.IOException;
import java.util.Enumeration;
import java.util.Iterator;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NestedSlideException;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.content.NodeProperty;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.structure.ObjectNode;
+import org.apache.slide.util.XMLValue;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.DeltavConstants;
@@ -88,7 +86,6 @@
import org.apache.slide.webdav.util.VersioningHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
import org.apache.slide.webdav.util.WebdavUtils;
-import org.apache.slide.util.XMLValue;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
import org.apache.slide.webdav.util.resourcekind.CheckedInVersionControlled;
import org.apache.slide.webdav.util.resourcekind.ResourceKind;
1.7 +5 -15
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/HeadMethod.java
Index: HeadMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/HeadMethod.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HeadMethod.java 14 Jun 2002 12:24:05 -0000 1.6
+++ HeadMethod.java 12 Dec 2003 02:59:22 -0000 1.7
@@ -63,18 +63,8 @@
package org.apache.slide.webdav.method;
-import java.security.Principal;
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.util.WebdavStatus;
-import org.apache.slide.common.*;
-import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.webdav.*;
-import org.apache.slide.lock.*;
-import org.apache.slide.structure.*;
-import org.apache.slide.content.*;
+import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.webdav.WebdavServletConfig;
/**
* HEAD method.
1.3 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MethodUtil.java
Index: MethodUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MethodUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MethodUtil.java 18 Sep 2003 11:01:07 -0000 1.2
+++ MethodUtil.java 12 Dec 2003 02:59:22 -0000 1.3
@@ -64,11 +64,11 @@
package org.apache.slide.webdav.method;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.RevisionNotFoundException;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.macro.ConflictException;
import org.apache.slide.macro.ForbiddenException;
1.10 +8 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PostMethod.java
Index: PostMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PostMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PostMethod.java 12 Aug 2002 12:55:02 -0000 1.9
+++ PostMethod.java 12 Dec 2003 02:59:22 -0000 1.10
@@ -63,14 +63,12 @@
package org.apache.slide.webdav.method;
+import java.io.IOException;
+
+import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.webdav.WebdavException;
+import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.util.WebdavStatus;
-import org.apache.slide.common.*;
-import org.apache.slide.webdav.*;
-import java.security.Principal;
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
/**
* POST method.
1.20 +7 -10
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java
Index: AbstractWebdavMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractWebdavMethod.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractWebdavMethod.java 1 Dec 2003 12:10:50 -0000 1.19
+++ AbstractWebdavMethod.java 12 Dec 2003 02:59:22 -0000 1.20
@@ -72,8 +72,10 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NestedSlideException;
@@ -83,21 +85,16 @@
import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.content.Content;
import org.apache.slide.content.NodeProperty;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.lock.Lock;
-import org.apache.slide.lock.ObjectLockedException;
-import org.apache.slide.lock.UnlockListener;
import org.apache.slide.lock.NodeLock;
-import org.apache.slide.macro.ConflictException;
-import org.apache.slide.macro.ForbiddenException;
+import org.apache.slide.lock.UnlockListener;
import org.apache.slide.macro.Macro;
import org.apache.slide.search.Search;
-import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.security.Security;
-import org.apache.slide.structure.ObjectAlreadyExistsException;
import org.apache.slide.structure.ObjectNode;
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
1.23 +4 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java
Index: UpdateMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UpdateMethod.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- UpdateMethod.java 2 Dec 2003 14:07:02 -0000 1.22
+++ UpdateMethod.java 12 Dec 2003 02:59:22 -0000 1.23
@@ -67,6 +67,7 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
+
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NestedSlideException;
import org.apache.slide.common.PropertyParseException;
@@ -75,7 +76,6 @@
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
@@ -85,7 +85,6 @@
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.LabeledRevisionNotFoundException;
import org.apache.slide.webdav.util.PreconditionViolationException;
-import org.apache.slide.webdav.util.PropertyHelper;
import org.apache.slide.webdav.util.PropertyRetriever;
import org.apache.slide.webdav.util.PropertyRetrieverImpl;
import org.apache.slide.webdav.util.UriHandler;
1.35 +19 -43
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java
Index: SearchMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/SearchMethod.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- SearchMethod.java 2 Dec 2003 14:07:02 -0000 1.34
+++ SearchMethod.java 12 Dec 2003 02:59:22 -0000 1.35
@@ -63,63 +63,39 @@
package org.apache.slide.webdav.method;
-import org.apache.util.WebdavStatus;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
-import org.apache.slide.common.RequestedProperties;
import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.common.RequestedProperties;
import org.apache.slide.common.SlideException;
-import org.apache.slide.util.Configuration;
-import org.apache.slide.common.Uri;
-import org.apache.slide.structure.ObjectNotFoundException;
-
-import org.apache.slide.content.NodeProperty;
-
-import org.apache.slide.webdav.util.WebdavUtils;
-
-import org.apache.slide.search.SearchQuery;
-import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.search.RequestedResource;
-import org.apache.slide.search.SearchQueryResult;
-import org.apache.slide.search.Search;
-import org.apache.slide.search.SearchLanguage;
+import org.apache.slide.search.BadGatewayException;
import org.apache.slide.search.BadQueryException;
import org.apache.slide.search.InvalidQueryException;
import org.apache.slide.search.InvalidScopeException;
-import org.apache.slide.search.BadGatewayException;
-import org.apache.slide.search.PropertyProvider;
import org.apache.slide.search.QueryScope;
+import org.apache.slide.search.RequestedResource;
+import org.apache.slide.search.Search;
+import org.apache.slide.search.SearchQuery;
+import org.apache.slide.search.SearchQueryResult;
import org.apache.slide.search.basic.IBasicQuery;
-
-//import org.apache.slide.lock.LockException;
-//import org.apache.slide.lock.LockTokenNotFoundException;
-//import org.apache.slide.lock.ObjectLockedException;
-//import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
+import org.apache.slide.security.AccessDeniedException;
+import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.StructureException;
-//import org.apache.slide.structure.LinkedObjectNotFoundException;
-//import org.apache.slide.structure.ObjectNotFoundException;
-
-import org.apache.slide.webdav.WebdavServletConfig;
+import org.apache.slide.util.Configuration;
import org.apache.slide.webdav.WebdavException;
+import org.apache.slide.webdav.WebdavServletConfig;
+import org.apache.slide.webdav.util.ComputedPropertyProvider;
import org.apache.slide.webdav.util.PropertyRetriever;
-import org.apache.slide.webdav.util.PropertyHelper;
import org.apache.slide.webdav.util.PropertyRetrieverImpl;
import org.apache.slide.webdav.util.WebdavConstants;
-import org.apache.slide.webdav.util.ComputedPropertyProvider;
-
+import org.apache.slide.webdav.util.WebdavUtils;
+import org.apache.util.WebdavStatus;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
-
import org.jdom.output.XMLOutputter;
-
-
-import java.security.Principal;
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
/**
* SEARCH method.
1.29 +19 -18
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java
Index: MkcolMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MkcolMethod.java 5 Nov 2003 14:24:35 -0000 1.28
+++ MkcolMethod.java 12 Dec 2003 02:59:22 -0000 1.29
@@ -63,24 +63,25 @@
package org.apache.slide.webdav.method;
-import java.security.Principal;
-import java.io.*;
-import java.util.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import org.apache.util.WebdavStatus;
-import org.apache.slide.common.*;
-import org.apache.slide.webdav.*;
-import org.apache.slide.structure.*;
-import org.apache.slide.content.*;
-import org.apache.slide.lock.*;
-import org.apache.slide.security.AccessDeniedException;
+import java.io.IOException;
+import java.util.Date;
+
+import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.common.ServiceAccessException;
+import org.apache.slide.common.SlideException;
+import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.structure.LinkedObjectNotFoundException;
+import org.apache.slide.structure.ObjectAlreadyExistsException;
+import org.apache.slide.structure.ObjectNotFoundException;
+import org.apache.slide.structure.SubjectNode;
import org.apache.slide.util.Configuration;
-import org.apache.slide.webdav.util.VersioningHelper;
+import org.apache.slide.webdav.WebdavException;
+import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.UriHandler;
+import org.apache.slide.webdav.util.VersioningHelper;
+import org.apache.util.WebdavStatus;
/**
1.5 +1 -1
jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XServletOutputStreamFacade.java
Index: XServletOutputStreamFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XServletOutputStreamFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XServletOutputStreamFacade.java 25 Apr 2002 21:15:18 -0000 1.4
+++ XServletOutputStreamFacade.java 12 Dec 2003 02:59:23 -0000 1.5
@@ -60,8 +60,8 @@
package org.apache.slide.webdav.logger;
-import java.io.PrintStream;
import java.io.IOException;
+
import javax.servlet.ServletOutputStream;
import org.apache.slide.common.Domain;
1.4 +7 -9
jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XHttpServletResponseFacade.java
Index: XHttpServletResponseFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XHttpServletResponseFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XHttpServletResponseFacade.java 18 Dec 2002 16:06:50 -0000 1.3
+++ XHttpServletResponseFacade.java 12 Dec 2003 02:59:23 -0000 1.4
@@ -64,19 +64,17 @@
package org.apache.slide.webdav.logger;
-import java.io.Writer;
+import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.util.Locale;
+import java.io.Writer;
import java.util.Enumeration;
import java.util.Vector;
-import javax.servlet.http.Cookie;
+
import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.http.HttpServletRequest;
import org.apache.slide.common.Domain;
1.4 +2 -2
jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XServletWriterFacade.java
Index: XServletWriterFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XServletWriterFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XServletWriterFacade.java 25 Apr 2002 21:15:18 -0000 1.3
+++ XServletWriterFacade.java 12 Dec 2003 02:59:23 -0000 1.4
@@ -60,8 +60,8 @@
package org.apache.slide.webdav.logger;
-import java.io.*;
-import javax.servlet.ServletOutputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
/**
* Facade to the PrintWriter returned by Response.
1.4 +8 -17
jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XHttpServletRequestFacade.java
Index: XHttpServletRequestFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/logger/XHttpServletRequestFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XHttpServletRequestFacade.java 18 Dec 2002 16:06:50 -0000 1.3
+++ XHttpServletRequestFacade.java 12 Dec 2003 02:59:23 -0000 1.4
@@ -63,22 +63,13 @@
package org.apache.slide.webdav.logger;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletInputStream;
-import javax.servlet.RequestDispatcher;
-
-import java.io.InputStream;
-import java.io.BufferedInputStream;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.security.Principal;
+import java.io.InputStreamReader;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
import org.apache.slide.common.Domain;
1.9 +9 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java
Index: WorkspacePathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkspacePathHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WorkspacePathHandler.java 18 Mar 2003 11:36:14 -0000 1.8
+++ WorkspacePathHandler.java 12 Dec 2003 02:59:23 -0000 1.9
@@ -63,10 +63,13 @@
package org.apache.slide.webdav.util;
-import java.util.*;
-import org.apache.slide.common.Domain;
-import org.apache.slide.common.NamespaceAccessToken;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.slide.common.Domain;
public class WorkspacePathHandler extends UriHandler {
1.3 +14 -20
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java
Index: ResourceWithProvidedProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceWithProvidedProperties.java 20 Jun 2002 09:20:48 -0000 1.2
+++ ResourceWithProvidedProperties.java 12 Dec 2003 02:59:23 -0000 1.3
@@ -60,27 +60,21 @@
* [Additional notices, if required by prior licensing conditions]
*
*/
-package org.apache.slide.webdav.util;
-
-// import list
-import org.apache.slide.common.NamespaceAccessToken;
-import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideException;
-import org.apache.slide.common.PropertyName;
-import org.apache.slide.search.RequestedResource;
-import org.apache.slide.search.PropertyProvider;
-
-import org.apache.slide.content.NodeRevisionDescriptor;
-import org.apache.slide.content.NodeRevisionDescriptors;
-import org.apache.slide.content.NodeProperty;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
+package org.apache.slide.webdav.util;
-import java.util.Iterator;
import java.util.Enumeration;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import org.apache.slide.common.PropertyName;
+import org.apache.slide.common.SlideException;
+import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeRevisionDescriptor;
+import org.apache.slide.content.NodeRevisionDescriptors;
+import org.apache.slide.search.PropertyProvider;
+import org.apache.slide.search.RequestedResource;
/**
* This is an adapter that creates a RequestedResource from a given
1.10 +9 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java
Index: WorkingresourcePathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WorkingresourcePathHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WorkingresourcePathHandler.java 12 Aug 2002 16:04:21 -0000 1.9
+++ WorkingresourcePathHandler.java 12 Dec 2003 02:59:23 -0000 1.10
@@ -63,10 +63,13 @@
package org.apache.slide.webdav.util;
-import java.util.*;
-import org.apache.slide.common.Domain;
-import org.apache.slide.common.NamespaceAccessToken;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.slide.common.Domain;
public class WorkingresourcePathHandler extends UriHandler {
1.11 +9 -6
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java
Index: HistoryPathHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/HistoryPathHandler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HistoryPathHandler.java 18 Mar 2003 11:36:14 -0000 1.10
+++ HistoryPathHandler.java 12 Dec 2003 02:59:23 -0000 1.11
@@ -63,10 +63,13 @@
package org.apache.slide.webdav.util;
-import java.util.*;
-import org.apache.slide.common.Domain;
-import org.apache.slide.common.NamespaceAccessToken;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.slide.common.Domain;
public class HistoryPathHandler extends UriHandler {
1.27 +4 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java
Index: DeltavConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavConstants.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DeltavConstants.java 18 Aug 2003 06:59:57 -0000 1.26
+++ DeltavConstants.java 12 Dec 2003 02:59:23 -0000 1.27
@@ -63,10 +63,9 @@
package org.apache.slide.webdav.util;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.List;
/**
* DeltaV constants.
1.5 +3 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java
Index: DeltavUriRedirector.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/DeltavUriRedirector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeltavUriRedirector.java 11 Jul 2002 14:57:08 -0000 1.4
+++ DeltavUriRedirector.java 12 Dec 2003 02:59:23 -0000 1.5
@@ -63,10 +63,8 @@
package org.apache.slide.webdav.util;
-import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.util.Configuration;
-
/**
* Redirects version URIs to the associated histoy URI.
1.4 +3 -4
jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavMethodFactory.java
Index: WebdavMethodFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavMethodFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebdavMethodFactory.java 18 Jun 2002 15:44:37 -0000 1.3
+++ WebdavMethodFactory.java 12 Dec 2003 02:59:23 -0000 1.4
@@ -63,7 +63,6 @@
package org.apache.slide.webdav;
-import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.webdav.method.DefaultMethodFactory;
/**
1.54 +6 -5
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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- WebdavServlet.java 1 Dec 2003 12:10:50 -0000 1.53
+++ WebdavServlet.java 12 Dec 2003 02:59:23 -0000 1.54
@@ -67,6 +67,7 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
+
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -74,13 +75,13 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.slide.authenticate.SecurityToken;
import org.apache.slide.common.Domain;
import org.apache.slide.common.DomainInitializationFailedError;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenImpl;
import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.structure.LinkedObjectNotFoundException;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
