tdraier 2005/10/14 17:04:15 CEST
Modified files:
core/src/java/org/jahia/services/webdav DAVFileAccess.java
Log:
cleaned up code
Revision Changes Path
1.25 +17 -24
jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java.diff?r1=1.24&r2=1.25&f=h
Index: DAVFileAccess.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DAVFileAccess.java 13 Oct 2005 10:43:20 -0000 1.24
+++ DAVFileAccess.java 14 Oct 2005 15:04:15 -0000 1.25
@@ -184,7 +184,7 @@
ns.token.commit ();
} catch (Exception e) {
// anything to do ?
- e.printStackTrace ();
+ logger.error ("Cannot commit transaction", e);
}
}
@@ -193,7 +193,7 @@
ns.token.rollback ();
} catch (Exception e) {
// anything to do ?
- e.printStackTrace ();
+ logger.error ("Cannot rollback transaction", e);
}
}
@@ -314,17 +314,9 @@
result.removeAll (grantedUsers);
return result;
} catch (JahiaACLException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
- } catch (ServiceAccessException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
- } catch (ObjectNotFoundException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
- } catch (VetoException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
- } catch (LinkedObjectNotFoundException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
- } catch (AccessDeniedException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error ("Cannot compare permissions", e);
+ } catch (SlideException e) {
+ logger.error ("Cannot compare permissions", e);
}
return new HashSet ();
}
@@ -451,7 +443,7 @@
(SubjectNode) ns.security.getPrincipal (slideToken),
ns.getPermission (
perm));
} catch (SlideException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error ("Cannot check permissions", e);
return false;
}
}
@@ -475,7 +467,7 @@
(slideToken, revisionDescriptors,
revisionDescriptor).streamContent ();
} catch (Exception e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error ("Cannot download file", e);
}
return null;
}
@@ -655,12 +647,13 @@
// Prevent dirty reads
slideToken.setForceStoreEnlistment (true);
- NodePermission r = new NodePermission (objectNode.getUri (), user,
"/actions/read",
- true, perm.charAt (0) == '-');
- NodePermission w = new NodePermission (objectNode.getUri (), user,
"/actions/write",
- true, perm.charAt (1) == '-');
- NodePermission a = new NodePermission (objectNode.getUri (), user,
"/actions/manage",
- true, perm.charAt (2) == '-');
+ NodePermission r = new NodePermission(objectNode.getUri(), user,
+ "/actions/read", true, perm.charAt(JahiaBaseACL.READ_RIGHTS) ==
'-');
+ NodePermission w = new NodePermission(objectNode.getUri(), user,
+ "/actions/write", true, perm.charAt(JahiaBaseACL.WRITE_RIGHTS) ==
'-');
+ NodePermission a = new NodePermission(objectNode.getUri(), user,
+ "/actions/manage", true, perm.charAt(JahiaBaseACL.ADMIN_RIGHTS) ==
'-');
+
try {
ns.security.grantPermission (slideToken, r);
ns.security.grantPermission (slideToken, w);
@@ -743,7 +736,7 @@
try {
ns.content.store (slideToken, objectNode.getUri (),
revisionDescriptor, null);
} catch (SlideException e) {
- e.printStackTrace ();
+ logger.error ("Cannot set name", e);
}
}
}
@@ -774,7 +767,7 @@
ns.content.store (prot ? ns.rootToken : slideToken,
objectNode.getUri (),
revisionDescriptor, null);
} catch (SlideException e) {
- e.printStackTrace (); //To change body of catch statement use
Options | File Templates.
+ logger.error ("Cannot set property", e);
}
}
@@ -933,7 +926,7 @@
ns.lock.unlock (ns.rootToken, nodeLock);
}
} catch (SlideException e) {
- e.printStackTrace ();
+ logger.error ("Cannot unlock file", e);
return false;
}
return true;
