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:52:19 UTC
svn commit: r785635 - in /jackrabbit/trunk:
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/
jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/
jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/
Author: angela
Date: Wed Jun 17 14:52:18 2009
New Revision: 785635
URL: http://svn.apache.org/viewvc?rev=785635&view=rev
Log:
JCR-2156: Usage of "qualified name" in JavaDoc and Comments
Modified:
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/PropertyInfoImpl.java
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoImpl.java
jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/BatchReadConfig.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/NodeInfoImpl.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeDefinitionImpl.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeTypeDefinitionImpl.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QPropertyDefinitionImpl.java
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/PropertyInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/PropertyInfoImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/PropertyInfoImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/PropertyInfoImpl.java Wed Jun 17 14:52:18 2009
@@ -68,7 +68,7 @@
String typeName = propSet.get(ItemResourceConstants.JCR_TYPE).getValue().toString();
type = PropertyType.valueFromName(typeName);
- // values from jcr-server must be converted to qualified values.
+ // values from jcr-server must be converted to SPI values.
if (propSet.contains(ItemResourceConstants.JCR_VALUE)) {
ValuesProperty vp = new ValuesProperty(propSet.get(ItemResourceConstants.JCR_VALUE), type, valueFactory);
Value jcrValue = vp.getJcrValue(type, valueFactory);
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/QPropertyDefinitionImpl.java Wed Jun 17 14:52:18 2009
@@ -135,7 +135,8 @@
|| requiredType == PropertyType.WEAKREFERENCE) ? PropertyType.NAME : requiredType;
String qValue = DomUtil.getText(it.nextElement());
// in case of name and path constraint, the value must be
- // converted to be in qualified format
+ // converted to SPI values
+ // TODO: tobefixed. path-constraint may contain trailing *
if (constType == PropertyType.NAME || constType == PropertyType.PATH) {
qValue = ValueFormat.getQValue(qValue, constType, resolver, qValueFactory).getString();
}
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java Wed Jun 17 14:52:18 2009
@@ -2422,7 +2422,7 @@
} else {
// TODO: use multipart-POST instead of ValuesProperty
DavPropertySet setProperties = new DavPropertySet();
- // qualified values must be converted to jcr values
+ // SPI values must be converted to jcr values
Value[] jcrValues = new Value[values.length];
for (int i = 0; i < values.length; i++) {
jcrValues[i] = ValueFormat.getJCRValue(values[i], resolver, valueFactory);
@@ -2439,7 +2439,7 @@
}
private RequestEntity getEntity(QValue value) throws RepositoryException {
- // qualified value must be converted to jcr value
+ // SPI value must be converted to jcr value
InputStream in;
int type = value.getType();
String contentType = JcrValueType.contentTypeFromType(type);
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/ItemInfoImpl.java Wed Jun 17 14:52:18 2009
@@ -40,8 +40,7 @@
private final boolean isNode;
/**
- * Creates a new serializable item info for the given qualified
- * <code>item</code> info.
+ * Creates a new <code>ItemInfo</code>.
*
* @param path the path to this item.
* @param isNode if this item is a node.
Modified: jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2davex/NodeInfoImpl.java Wed Jun 17 14:52:18 2009
@@ -55,8 +55,7 @@
private int numberOfChildNodes = -1;
/**
- * Creates a new serializable item info for the given qualified
- * <code>item</code> info.
+ * Creates a new <code>NodeInfo</code>.
*
* @param id The node id.
* @param path the path to this item.
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/BatchReadConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/BatchReadConfig.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/BatchReadConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/BatchReadConfig.java Wed Jun 17 14:52:18 2009
@@ -34,7 +34,7 @@
private Map depthMap = new HashMap(0);
/**
- * Return the depth for the given qualified node type name. If the name is
+ * Return the depth for the given node type name. If the name is
* not defined in this configuration, the {@link #DEPTH_DEFAULT default value}
* is returned.
*
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/EventSubscription.java Wed Jun 17 14:52:18 2009
@@ -317,12 +317,12 @@
}
/**
- * Returns the qualified names of the passed node types using the namespace
+ * Returns the names of the passed node types using the namespace
* resolver to parse the names.
*
* @param nt the node types
* @param resolver
- * @return the qualified names of the node types.
+ * @return the names of the node types.
* @throws NameException if a node type returns an illegal name.
* @throws NamespaceException if the name of a node type contains a
* prefix that is not known to <code>resolver</code>.
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/NodeInfoImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/NodeInfoImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/NodeInfoImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/NodeInfoImpl.java Wed Jun 17 14:52:18 2009
@@ -59,12 +59,12 @@
}
/**
- * Returns the qualified names of the passed node types using the namespace
+ * Returns the names of the passed node types using the namespace
* resolver to parse the names.
*
- * @param nt the node types
- * @param resolver
- * @return the qualified names of the node types.
+ * @param nt the node types from which the names should be retrieved.
+ * @param resolver The name and path resolver.
+ * @return the names of the node types.
* @throws NameException if a node type returns an illegal name.
* @throws NamespaceException if the name of a node type contains a
* prefix that is not known to <code>resolver</code>.
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeDefinitionImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeDefinitionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeDefinitionImpl.java Wed Jun 17 14:52:18 2009
@@ -31,7 +31,7 @@
extends org.apache.jackrabbit.spi.commons.QNodeDefinitionImpl {
/**
- * Creates a new qualified node definition based on a JCR NodeDefinition.
+ * Creates a new node definition based on a JCR <code>NodeDefinition</code>.
*
* @param nodeDef the node definition.
* @param resolver
@@ -54,12 +54,12 @@
}
/**
- * Returns the qualified names of the passed node types using the namespace
+ * Returns the names of the passed node types using the namespace
* resolver to parse the names.
*
* @param nt the node types
* @param resolver
- * @return the qualified names of the node types.
+ * @return the names of the node types.
* @throws NameException if a node type returns an illegal name.
* @throws NamespaceException if the name of a node type contains a
* prefix that is not known to <code>resolver</code>.
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeTypeDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeTypeDefinitionImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeTypeDefinitionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QNodeTypeDefinitionImpl.java Wed Jun 17 14:52:18 2009
@@ -31,14 +31,14 @@
import javax.jcr.NamespaceException;
/**
- * <code>QNodeTypeDefinitionImpl</code> implements a qualified node type
+ * <code>QNodeTypeDefinitionImpl</code> implements a SPI node type
* definition based on a JCR {@link NodeType}.
*/
class QNodeTypeDefinitionImpl
extends org.apache.jackrabbit.spi.commons.QNodeTypeDefinitionImpl {
/**
- * Creates a new qualified node type definition based on a JCR
+ * Creates a new SPI node type definition based on a JCR
* <code>NodeType</code>.
*
* @param nt the JCR node type.
@@ -66,12 +66,11 @@
}
/**
- * Returns the qualified names of the passed node types using the namespace
- * resolver to parse the names.
+ * Builds the names of the passed node types using the given <code>resolver</code>.
*
* @param nt the node types.
* @param resolver the name and path resolver.
- * @return the qualified names of the node types.
+ * @return the names of the node types.
* @throws IllegalNameException if a node type returns an illegal name.
* @throws NamespaceException if the name of a node type contains a
* prefix that is not known to <code>rResolver</code>.
@@ -88,12 +87,12 @@
}
/**
- * Returns qualified property definitions for JCR property definitions.
+ * Builds SPI property definitions from the given {@link javax.jcr.nodetype.PropertyDefinition}s.
*
* @param propDefs the JCR property definitions.
* @param resolver
* @param factory the value factory.
- * @return qualified property definitions.
+ * @return property definitions.
* @throws RepositoryException if an error occurs while converting the
* definitions.
*/
@@ -109,11 +108,11 @@
}
/**
- * Returns qualified node definitions for JCR node definitions.
+ * Builds SPI node definitions from the given JCR node definitions.
*
* @param nodeDefs the JCR node definitions.
* @param resolver the name and path resolver.
- * @return qualified node definitions.
+ * @return node definitions.
* @throws IllegalNameException if the node definition contains an illegal
* name.
* @throws NamespaceException if the name of a node definition contains
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QPropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QPropertyDefinitionImpl.java?rev=785635&r1=785634&r2=785635&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QPropertyDefinitionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/src/main/java/org/apache/jackrabbit/spi2jcr/QPropertyDefinitionImpl.java Wed Jun 17 14:52:18 2009
@@ -31,14 +31,14 @@
import javax.jcr.NamespaceException;
/**
- * <code>QPropertyDefinitionImpl</code> implements a qualified property
+ * <code>QPropertyDefinitionImpl</code> implements a property
* definition based on a JCR {@link javax.jcr.nodetype.PropertyDefinition}.
*/
class QPropertyDefinitionImpl
extends org.apache.jackrabbit.spi.commons.QPropertyDefinitionImpl {
/**
- * Creates a new qualified property definition based on
+ * Creates a new property definition based on
* <code>propDef</code>.
*
* @param propDef the JCR property definition.