Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java	(revision 647364)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java	(working copy)
@@ -4917,4 +4917,17 @@
             }
         }
     }
+    
+    /**
+     * Returns the name and type for this node
+     *
+     * @return node information
+     */
+    public String toString() {
+        try {
+            return "NodeImpl[Name: '" + getName() + "' Type: '" + getPrimaryNodeType().getName() + "']";
+        } catch (RepositoryException re) {
+            return super.toString();
+        }
+    }
 }
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java
===================================================================
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java	(revision 647364)
+++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java	(working copy)
@@ -749,12 +749,16 @@
     //--------------------------------------------------------------< Object >
 
     /**
-     * Returns the (safe) path of this property.
+     * Returns the name and type for this property
      *
-     * @return property path
+     * @return property information
      */
     public String toString() {
-        return safeGetJCRPath();
+        try {
+            return "PropertyImpl[Name: '" + getName() + "' Type: '" + PropertyType.nameFromValue(getType()) + "']";
+        } catch (RepositoryException re) {
+            return safeGetJCRPath();
+        }
     }
 
 }