stefan 2004/07/13 08:49:58
Modified: proposals/jcrri/src/org/apache/slide/jcr/core
AccessManagerImpl.java ItemImpl.java
NamespaceRegistryImpl.java
Log:
jcrri
Revision Changes Path
1.6 +4 -4
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/AccessManagerImpl.java
Index: AccessManagerImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/AccessManagerImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AccessManagerImpl.java 22 Jun 2004 18:03:24 -0000 1.5
+++ AccessManagerImpl.java 13 Jul 2004 15:49:58 -0000 1.6
@@ -42,8 +42,8 @@
private static Logger log = Logger.getLogger(AccessManagerImpl.class);
- protected HierarchyManager hierMgr;
- protected NamespaceResolver nsResolver;
+ protected final HierarchyManager hierMgr;
+ protected final NamespaceResolver nsResolver;
/**
* Package private constructor
1.11 +7 -7
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/ItemImpl.java
Index: ItemImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/ItemImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ItemImpl.java 7 Jul 2004 16:05:24 -0000 1.10
+++ ItemImpl.java 13 Jul 2004 15:49:58 -0000 1.11
@@ -348,7 +348,7 @@
if (!nodeState.getRemovedChildNodeEntries().isEmpty() ||
!nodeState.getRemovedPropertyEntries().isEmpty()) {
// check REMOVE_ITEM permission
if (!accessMgr.isGranted(id, Permission.REMOVE_ITEM)) {
- String msg = "not allowed to remove a child item of " +
node.safeGetJCRPath();
+ String msg = node.safeGetJCRPath() + ": not allowed to remove
a child item";
log.error(msg);
throw new AccessDeniedException(msg);
}
@@ -367,7 +367,7 @@
if (!childDef.isAutoCreate()) {
// check ADD_NODE permission
if (!accessMgr.isGranted(id, Permission.ADD_NODE)) {
- String msg = "not allowed to add node " +
childNode.getPath();
+ String msg = node.safeGetJCRPath() + ": not allowed to add
node " + childNode.getName();
log.error(msg);
throw new AccessDeniedException(msg);
}
@@ -378,7 +378,7 @@
for (int i = 0; i < propDefs.length; i++) {
PropertyDefImpl pd = (PropertyDefImpl) propDefs[i];
if (!nodeState.hasPropertyEntry(pd.getQName())) {
- String msg = "mandatory property " + pd.getName() + " does not
exist";
+ String msg = node.safeGetJCRPath() + ": mandatory property " +
pd.getName() + " does not exist";
log.error(msg);
throw new ConstraintViolationException(msg);
}
@@ -388,7 +388,7 @@
for (int i = 0; i < nodeDefs.length; i++) {
NodeDefImpl nd = (NodeDefImpl) nodeDefs[i];
if (!nodeState.hasChildNodeEntry(nd.getQName())) {
- String msg = "mandatory child node " + nd.getName() + " does
not exist";
+ String msg = node.safeGetJCRPath() + ": mandatory child node "
+ nd.getName() + " does not exist";
log.error(msg);
throw new ConstraintViolationException(msg);
}
@@ -405,7 +405,7 @@
if (!def.isAutoCreate()) {
// check SET_PROPERTY permission
if (!accessMgr.isGranted(nodeId, Permission.SET_PROPERTY)) {
- String msg = "not allowed to set property " + prop.getPath();
+ String msg = itemMgr.safeGetJCRPath(nodeId) + ": not allowed
to set property " + prop.getName();
log.error(msg);
throw new AccessDeniedException(msg);
}
1.5 +3 -3
jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/NamespaceRegistryImpl.java
Index: NamespaceRegistryImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/jcrri/src/org/apache/slide/jcr/core/NamespaceRegistryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamespaceRegistryImpl.java 1 Jul 2004 18:29:41 -0000 1.4
+++ NamespaceRegistryImpl.java 13 Jul 2004 15:49:58 -0000 1.5
@@ -162,7 +162,7 @@
in.close();
}
} catch (Exception e) {
- String msg = "failed to persist namespace registry";
+ String msg = "failed to load namespace registry";
log.error(msg, e);
throw new RepositoryException(msg, e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
