You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2009/06/17 16:42:37 UTC
svn commit: r785631 - in
/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi:
./ hierarchy/ nodetype/ operation/ state/ xml/
Author: angela
Date: Wed Jun 17 14:42:36 2009
New Revision: 785631
URL: http://svn.apache.org/viewvc?rev=785631&view=rev
Log:
JCR-2156: Usage of "qualified name" in JavaDoc and Comments
Modified:
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java Wed Jun 17 14:42:36 2009
@@ -529,7 +529,7 @@
* @return the primary path to this <code>Item</code>
*/
Path getQPath() throws RepositoryException {
- return state.getQPath();
+ return state.getPath();
}
/**
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Wed Jun 17 14:42:36 2009
@@ -151,8 +151,8 @@
*/
public Node addNode(String relPath, String primaryNodeTypeName) throws ItemExistsException, PathNotFoundException, NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException {
checkIsWritable();
- // 1. build qualified path and retrieve parent node
- Path nodePath = getQPath(relPath).getNormalizedPath();
+ // build path object and retrieve parent node
+ Path nodePath = getPath(relPath).getNormalizedPath();
if (nodePath.getNameElement().getIndex() != Path.INDEX_UNDEFINED) {
String msg = "Illegal subscript specified: " + relPath;
log.debug(msg);
@@ -176,11 +176,11 @@
}
}
- // 2. get qualified names for node and nt
+ // get names objects for node and nt
Name nodeName = nodePath.getNameElement().getName();
Name ntName = (primaryNodeTypeName == null) ? null : getQName(primaryNodeTypeName);
- // 3. create new node (including validation checks)
+ // create new node (including validation checks)
return parentNode.createNode(nodeName, ntName);
}
@@ -621,8 +621,7 @@
}
/**
- * Returns true, if this <code>Node</code> has a property with the given
- * qualified name.
+ * Returns true, if this <code>Node</code> has a property with the given name.
*
* @param propertyName
* @return <code>true</code>, if this <code>Node</code> has a property with
@@ -1091,7 +1090,7 @@
getNode(relPath).restore(version, removeExisting);
} else {
// node at 'relPath' does not yet exist -> build the NodeId
- Path nPath = getQPath(relPath);
+ Path nPath = getPath(relPath);
Path parentPath = nPath.getAncestor(1);
ItemManager itemMgr = getItemManager();
if (itemMgr.nodeExists(parentPath)) {
@@ -1684,29 +1683,28 @@
}
/**
- *
- * @param relativePath
- * @return
+ * @param relativeJcrPath
+ * @return Path object for the specified relative JCR path string.
* @throws RepositoryException
*/
- private Path getQPath(String relativePath) throws RepositoryException {
+ private Path getPath(String relativeJcrPath) throws RepositoryException {
try {
- Path p = session.getPathResolver().getQPath(relativePath);
- return getQPath(p);
+ Path p = session.getPathResolver().getQPath(relativeJcrPath);
+ return getPath(p);
} catch (NameException e) {
- String msg = "Invalid relative path: " + relativePath;
+ String msg = "Invalid relative path: " + relativeJcrPath;
log.debug(msg);
throw new RepositoryException(msg, e);
}
}
/**
- *
* @param relativePath
- * @return
+ * @return normalized absolute path calculated from the given relative
+ * path and the path of this node.
* @throws RepositoryException
*/
- private Path getQPath(Path relativePath) throws RepositoryException {
+ private Path getPath(Path relativePath) throws RepositoryException {
// shortcut
if (relativePath.getLength() == 1 && relativePath.getNameElement() == session.getPathFactory().getCurrentElement()) {
return getQPath();
@@ -1743,7 +1741,7 @@
}
} else {
// rp length > 1
- Path p = getQPath(rp);
+ Path p = getPath(rp);
targetEntry = session.getHierarchyManager().getNodeEntry(p.getCanonicalPath());
}
} catch (PathNotFoundException e) {
@@ -1781,7 +1779,7 @@
targetEntry = getNodeEntry().getPropertyEntry(propName, true);
} else {
// build and resolve absolute path
- Path p = getQPath(rp).getCanonicalPath();
+ Path p = getPath(rp).getCanonicalPath();
try {
targetEntry = session.getHierarchyManager().getPropertyEntry(p);
} catch (PathNotFoundException e) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java Wed Jun 17 14:42:36 2009
@@ -59,7 +59,8 @@
public PropertyImpl(SessionImpl session, PropertyState state, ItemLifeCycleListener[] listeners) {
super(session, state, listeners);
- // value will be read (and converted from qualified value) on demand.
+ // NOTE: JCR value(s) will be read (and converted from the internal value
+ // representation) on demand.
}
//-----------------------------------------------------< Item interface >---
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Wed Jun 17 14:42:36 2009
@@ -149,7 +149,7 @@
valueFactory = new ValueFactoryQImpl(config.getRepositoryService().getQValueFactory(), npResolver);
// build nodetype manager
- ntManager = new NodeTypeManagerImpl(workspace.getNodeTypeRegistry(), this, getJcrValueFactory());
+ ntManager = new NodeTypeManagerImpl(workspace.getNodeTypeRegistry(), this);
validator = new ItemStateValidator(this, getPathFactory());
itemStateManager = createSessionItemStateManager(workspace.getUpdatableItemStateManager(), workspace.getItemStateFactory());
@@ -310,7 +310,7 @@
checkSupportedOption(Repository.LEVEL_2_SUPPORTED);
checkIsAlive();
- // retrieve qualified paths
+ // build paths from the given JCR paths.
Path srcPath = getQPath(srcAbsPath);
Path destPath = getQPath(destAbsPath);
@@ -845,12 +845,12 @@
}
/**
- * Builds an qualified path from the given absolute path.
+ * Builds a <code>Path</code> object from the given absolute JCR path string.
*
* @param absPath
- * @return
- * @throws RepositoryException if the resulting qualified path is not absolute
- * or if the given path cannot be resolved to a qualified path.
+ * @return A <code>Path</code> object.
+ * @throws RepositoryException if the resulting path isn't absolute
+ * or if the given JCR path cannot be resolved to a path object.
*/
Path getQPath(String absPath) throws RepositoryException {
try {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java Wed Jun 17 14:42:36 2009
@@ -767,13 +767,13 @@
/**
* Returns a unmodifiable List of NodeEntry objects even if the name map
* only contains a single entry for the given name. If no matching entry
- * exists for the given qualified name an empty list is returned.
+ * exists for the given <code>Name</code> an empty list is returned.
*
- * @param qName
+ * @param name
* @return list of entries or an empty list.
*/
- public List getList(Name qName) {
- Object obj = get(qName);
+ public List getList(Name name) {
+ Object obj = get(name);
if (obj == null) {
return Collections.EMPTY_LIST;
} else if (obj instanceof List) {
@@ -785,8 +785,8 @@
}
}
- public NodeEntry getNodeEntry(Name qName, int index) {
- Object obj = get(qName);
+ public NodeEntry getNodeEntry(Name name, int index) {
+ Object obj = get(name);
if (obj == null) {
return null;
}
@@ -802,35 +802,35 @@
return null;
}
- public LinkedEntries.LinkNode getLinkNode(Name qName, int index) {
+ public LinkedEntries.LinkNode getLinkNode(Name name, int index) {
if (index < Path.INDEX_DEFAULT) {
throw new IllegalArgumentException("Illegal index " + index);
}
- LinkedEntries.LinkNode val = (LinkedEntries.LinkNode) nameMap.get(qName);
+ LinkedEntries.LinkNode val = (LinkedEntries.LinkNode) nameMap.get(name);
if (val != null) {
return (index == Path.INDEX_DEFAULT) ? val : null;
} else {
// look in snsMap
- List l = (List) snsMap.get(qName);
+ List l = (List) snsMap.get(name);
int pos = index - 1; // Index of NodeEntry is 1-based
return (l != null && pos < l.size()) ? (LinkedEntries.LinkNode) l.get(pos) : null;
}
}
- public LinkedEntries.LinkNode getLinkNode(Name qName, int index, String uniqueID) {
+ public LinkedEntries.LinkNode getLinkNode(Name name, int index, String uniqueID) {
if (uniqueID != null) {
// -> try if any entry matches.
// if none matches it be might that entry doesn't have uniqueID
// set yet -> search without uniqueID
- LinkedEntries.LinkNode val = (LinkedEntries.LinkNode) nameMap.get(qName);
+ LinkedEntries.LinkNode val = (LinkedEntries.LinkNode) nameMap.get(name);
if (val != null) {
if (uniqueID.equals(val.getNodeEntry().getUniqueID())) {
return val;
}
} else {
// look in snsMap
- List l = (List) snsMap.get(qName);
+ List l = (List) snsMap.get(name);
if (l != null) {
for (Iterator it = l.iterator(); it.hasNext();) {
LinkedEntries.LinkNode ln = (LinkedEntries.LinkNode) it.next();
@@ -843,25 +843,25 @@
}
// no uniqueID passed or not match.
// try to load the child entry by name and index.
- return getLinkNode(qName, index);
+ return getLinkNode(name, index);
}
- public void put(Name qName, int index, LinkedEntries.LinkNode value) {
+ public void put(Name name, int index, LinkedEntries.LinkNode value) {
// if 'nameMap' already contains a single entry -> move it to snsMap
- LinkedEntries.LinkNode single = (LinkedEntries.LinkNode) nameMap.remove(qName);
+ LinkedEntries.LinkNode single = (LinkedEntries.LinkNode) nameMap.remove(name);
List l;
if (single != null) {
l = new ArrayList();
l.add(single);
- snsMap.put(qName, l);
+ snsMap.put(name, l);
} else {
// if 'snsMap' already contains list
- l = (List) snsMap.get(qName);
+ l = (List) snsMap.get(name);
}
if (l == null) {
// no same name siblings -> simply put to the name map.
- nameMap.put(qName, value);
+ nameMap.put(name, value);
} else {
// sibling(s) already present -> insert into the list
int position = index - 1;
@@ -873,10 +873,10 @@
}
}
- public LinkedEntries.LinkNode remove(Name qName, LinkedEntries.LinkNode value) {
- Object rm = nameMap.remove(qName);
+ public LinkedEntries.LinkNode remove(Name name, LinkedEntries.LinkNode value) {
+ Object rm = nameMap.remove(name);
if (rm == null) {
- List l = (List) snsMap.get(qName);
+ List l = (List) snsMap.get(name);
if (l != null && l.remove(value)) {
rm = value;
}
@@ -884,8 +884,8 @@
return ((LinkedEntries.LinkNode) rm);
}
- public void reorder(Name qName, LinkedEntries.LinkNode insertValue, int position) {
- List sns = (List) snsMap.get(qName);
+ public void reorder(Name name, LinkedEntries.LinkNode insertValue, int position) {
+ List sns = (List) snsMap.get(name);
if (sns == null) {
// no same name siblings -> no special handling required
return;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java Wed Jun 17 14:42:36 2009
@@ -118,7 +118,7 @@
/**
*
* @param ntDef
- * @param validatedDefs Map of qualified nodetype names and nodetype definitions
+ * @param validatedDefs Map of nodetype names and nodetype definitions
* that are known to be valid or are already registered. This map is used to
* validated dependencies and check for circular inheritance
* @return
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java Wed Jun 17 14:42:36 2009
@@ -29,7 +29,7 @@
public interface EffectiveNodeTypeProvider {
/**
- * Build the <code>EffectiveNodeType</code> from the given qualified
+ * Build the <code>EffectiveNodeType</code> from the given
* <code>NodeType</code> name.
*
* @param ntName
@@ -40,7 +40,7 @@
throws NoSuchNodeTypeException;
/**
- * Build the <code>EffectiveNodeType</code> from the given qualified
+ * Build the <code>EffectiveNodeType</code> from the given array of
* <code>NodeType</code> names.
*
* @param ntNames
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java Wed Jun 17 14:42:36 2009
@@ -22,7 +22,6 @@
import org.apache.jackrabbit.spi.QNodeTypeDefinition;
import org.apache.jackrabbit.spi.QPropertyDefinition;
import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.spi.QValueFactory;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
@@ -37,7 +36,6 @@
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import javax.jcr.ValueFactory;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
import javax.jcr.nodetype.NodeDefinition;
@@ -92,31 +90,6 @@
}
/**
- * ValueFactory used to convert JCR values from one type to another in order
- * to determine whether a property specified by name and value(s) would be
- * allowed.
- *
- * @see NodeType#canSetProperty(String, Value)
- * @see NodeType#canSetProperty(String, Value[])
- * @return ValueFactory used to convert JCR values.
- * @throws javax.jcr.RepositoryException If an error occurs.
- */
- private ValueFactory valueFactory() throws RepositoryException {
- return mgrProvider.getJcrValueFactory();
- }
-
- /**
- * ValueFactory used to convert JCR values to qualified ones in order to
- * determine value constraints within the NodeType interface.
- *
- * @return ValueFactory used to convert JCR values to qualified ones.
- * @throws javax.jcr.RepositoryException If an error occurs.
- */
- private QValueFactory qValueFactory() throws RepositoryException {
- return mgrProvider.getQValueFactory();
- }
-
- /**
* Returns the applicable property definition for a property with the
* specified name and type.
*
@@ -150,7 +123,7 @@
/**
* Returns the node type definition.
*
- * @return the qualified definition
+ * @return the internal node type definition.
*/
QNodeTypeDefinition getDefinition() {
return ntd;
@@ -384,13 +357,13 @@
if (def.getRequiredType() != PropertyType.UNDEFINED
&& def.getRequiredType() != value.getType()) {
// type conversion required
- v = ValueHelper.convert(value, def.getRequiredType(), valueFactory());
+ v = ValueHelper.convert(value, def.getRequiredType(), mgrProvider.getJcrValueFactory());
} else {
// no type conversion required
v = value;
}
// create QValue from Value
- QValue qValue = ValueFormat.getQValue(v, resolver(), qValueFactory());
+ QValue qValue = ValueFormat.getQValue(v, resolver(), mgrProvider.getQValueFactory());
checkSetPropertyValueConstraints(def, new QValue[]{qValue});
return true;
} catch (NameException re) {
@@ -457,8 +430,8 @@
if (values[i] != null) {
// create QValue from Value and perform
// type conversion as necessary
- Value v = ValueHelper.convert(values[i], targetType, valueFactory());
- QValue qValue = ValueFormat.getQValue(v, resolver(), qValueFactory());
+ Value v = ValueHelper.convert(values[i], targetType, mgrProvider.getJcrValueFactory());
+ QValue qValue = ValueFormat.getQValue(v, resolver(), mgrProvider.getQValueFactory());
list.add(qValue);
}
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java Wed Jun 17 14:42:36 2009
@@ -78,7 +78,7 @@
private final NodeTypeRegistry ntReg;
/**
- * The ValueFactory used to convert qualified values to JCR values.
+ * The ValueFactory used to build property definitions.
*/
private final ValueFactory valueFactory;
@@ -105,15 +105,14 @@
*
* @param ntReg node type registry
* @param mgrProvider the manager provider
- * @param valueFactory the JCR value factory
+ * @throws RepositoryException If an error occurs.
*/
public NodeTypeManagerImpl(NodeTypeRegistry ntReg,
- ManagerProvider mgrProvider,
- ValueFactory valueFactory) {
+ ManagerProvider mgrProvider) throws RepositoryException {
this.mgrProvider = mgrProvider;
this.ntReg = ntReg;
this.ntReg.addListener(this);
- this.valueFactory = valueFactory;
+ this.valueFactory = mgrProvider.getJcrValueFactory();
// setup caches with soft references to node type
ntCache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java Wed Jun 17 14:42:36 2009
@@ -96,8 +96,8 @@
}
/**
- * Relative qualified path to the non-existing restore target or <code>null</code>
- * if the state returned by {@link #getNodeState()} is the target.
+ * Relative path to the non-existing restore target or <code>null</code>
+ * if the state identified by {@link #getNodeId()} is the target.
*
* @return
* @see javax.jcr.Node#restore(Version, String, boolean)
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java Wed Jun 17 14:42:36 2009
@@ -186,13 +186,13 @@
/**
* Utility method:
- * Returns the qualified path of this item state. Shortcut for calling
+ * Returns the path of this item state. Shortcut for calling
* 'getPath' on the {@link ItemState#getHierarchyEntry() hierarchy entry}.
*
* @return
* @throws RepositoryException if an error occurs
*/
- public Path getQPath() throws RepositoryException {
+ public Path getPath() throws RepositoryException {
return getHierarchyEntry().getPath();
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java Wed Jun 17 14:42:36 2009
@@ -223,7 +223,7 @@
* <code>null</code> if the created <code>NodeState</code>
* cannot be identified by a unique ID.
* @param nodeTypeName name of the node type of the new node state.
- * @param definition The qualified definition for the new node state.
+ * @param definition The definition for the new node state.
* @param parent the parent of the new node state.
* @return a new transient {@link NodeState}.
*/
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java?rev=785631&r1=785630&r2=785631&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Wed Jun 17 14:42:36 2009
@@ -100,8 +100,8 @@
/**
* Creates a new <code>WorkspaceImporter</code> instance.
*
- * @param parentPath qualified path of target node where to add the imported
- * subtree
+ * @param parentPath Path of target node where to add the imported
+ * subtree.
* @param session
* @param uuidBehavior Flag that governs how incoming UUIDs are handled.
* @throws PathNotFoundException If no node exists at <code>parentPath</code>
@@ -338,7 +338,7 @@
case ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING:
// make sure conflicting node is not importTarget or an ancestor thereof
- Path p0 = importTarget.getQPath();
+ Path p0 = importTarget.getPath();
Path p1 = conflicting.getPath();
if (p1.equals(p0) || p1.isAncestorOf(p0)) {
msg = "cannot remove ancestor node";