You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by ju...@apache.org on 2001/03/16 12:52:52 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method PropFindMethod.java
juergen 01/03/16 03:52:52
Modified: src/webdav/server/org/apache/slide/webdav/method
PropFindMethod.java
Log:
if during a propFind an internalServer error occurs, display the stackTrace.
Revision Changes Path
1.10 +22 -22 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PropFindMethod.java 2001/02/20 07:12:25 1.9
+++ PropFindMethod.java 2001/03/16 11:52:51 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.9 2001/02/20 07:12:25 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2001/02/20 07:12:25 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v 1.10 2001/03/16 11:52:51 juergen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/03/16 11:52:51 $
*
* ====================================================================
*
@@ -138,14 +138,14 @@
/**
* Supported privilege set.
*/
- private static final String SUPPORTED_PRIVILEGE_SET =
+ private static final String SUPPORTED_PRIVILEGE_SET =
"supported-privilege-set";
/**
* Supported privileges.
*/
- private static final String SUPPORTED_PRIVILEGES =
+ private static final String SUPPORTED_PRIVILEGES =
"<supported-privilege>"
+ "<privilege><all/></privilege>"
+ "<abstract/>"
@@ -400,13 +400,13 @@
try {
enum = structure.getChildren(slideToken, cur);
} catch (StructureException e) {
+ e.printStackTrace();
resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
- throw new WebdavException
- (WebdavStatus.SC_INTERNAL_SERVER_ERROR);
+ throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
} catch (ServiceAccessException e) {
+ e.printStackTrace();
resp.setStatus(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
- throw new WebdavException
- (WebdavStatus.SC_INTERNAL_SERVER_ERROR);
+ throw new WebdavException(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
}
while (enum.hasMoreElements()) {
@@ -967,7 +967,7 @@
private void showSupportedPrivilegeSet(XMLPrinter generatedXML)
throws WebdavException {
- generatedXML.writeElement(null, SUPPORTED_PRIVILEGE_SET,
+ generatedXML.writeElement(null, SUPPORTED_PRIVILEGE_SET,
XMLPrinter.OPENING);
// FIXME : Make the genaration dynamic (although it needs only to be
@@ -975,7 +975,7 @@
// version before implementing that.
generatedXML.writeText(SUPPORTED_PRIVILEGES);
- generatedXML.writeElement(null, SUPPORTED_PRIVILEGE_SET,
+ generatedXML.writeElement(null, SUPPORTED_PRIVILEGE_SET,
XMLPrinter.CLOSING);
}
@@ -1002,7 +1002,7 @@
try {
- boolean readObject =
+ boolean readObject =
security.hasPermission(object, principalNode,
config.getReadObjectAction());
boolean createObject =
@@ -1048,25 +1048,25 @@
(object, principalNode,
config.getCreateRevisionContentAction());
boolean modifyRevisionContent = security.hasPermission
- (object, principalNode,
+ (object, principalNode,
config.getModifyRevisionContentAction());
boolean removeRevisionContent = security.hasPermission
- (object, principalNode,
+ (object, principalNode,
config.getRemoveRevisionContentAction());
- boolean canRead = readObject && readRevisionMetadata
+ boolean canRead = readObject && readRevisionMetadata
&& readRevisionContent;
- boolean canWrite = createObject && removeObject && lockObject
- && readLocks && createRevisionMetadata
- && modifyRevisionMetadata && removeRevisionMetadata
- && createRevisionContent && modifyRevisionContent
+ boolean canWrite = createObject && removeObject && lockObject
+ && readLocks && createRevisionMetadata
+ && modifyRevisionMetadata && removeRevisionMetadata
+ && createRevisionContent && modifyRevisionContent
&& removeRevisionContent;
boolean canReadAcl = readPermissions;
boolean canWriteAcl = grantPermission && revokePermission;
boolean canAll = canRead && canWrite && canReadAcl && canWriteAcl
&& killLock;
- generatedXML.writeElement(null, CURRENT_USER_PRIVILEGE_SET,
+ generatedXML.writeElement(null, CURRENT_USER_PRIVILEGE_SET,
XMLPrinter.OPENING);
if (canRead) {
@@ -1085,7 +1085,7 @@
writePrivilege(generatedXML, "all", null);
}
- generatedXML.writeElement(null, CURRENT_USER_PRIVILEGE_SET,
+ generatedXML.writeElement(null, CURRENT_USER_PRIVILEGE_SET,
XMLPrinter.CLOSING);
} catch (SlideException e) {
@@ -1098,7 +1098,7 @@
/**
* Write a privilege.
*/
- private void writePrivilege(XMLPrinter generatedXML, String privilege,
+ private void writePrivilege(XMLPrinter generatedXML, String privilege,
String namespace) {
generatedXML.writeElement(null, "privilege", XMLPrinter.OPENING);
generatedXML.writeElement(namespace, privilege, XMLPrinter.NO_CONTENT);