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:38:35 UTC
svn commit: r785629 - in /jackrabbit/trunk/jackrabbit-spi/src:
main/java/org/apache/jackrabbit/spi/ test/java/org/apache/jackrabbit/spi/
Author: angela
Date: Wed Jun 17 14:38:34 2009
New Revision: 785629
URL: http://svn.apache.org/viewvc?rev=785629&view=rev
Log:
JCR-2156: Usage of "qualified name" in JavaDoc and Comments
Modified:
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package.html
jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueFactoryTest.java
jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueTest.java
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Batch.java Wed Jun 17 14:38:34 2009
@@ -108,7 +108,7 @@
*
* @param parentId NodeId identifying the parent node.
* @param propertyName Name of the property to be created.
- * @param value The qualified value of the property to be created.
+ * @param value The value of the property to be created.
* @throws ValueFormatException
* @throws VersionException
* @throws LockException
@@ -139,7 +139,7 @@
*
* @param parentId NodeId identifying the parent node.
* @param propertyName Name of the property to be created.
- * @param values The qualified values of the property to be created.
+ * @param values The values of the property to be created.
* @throws javax.jcr.ValueFormatException
* @throws javax.jcr.version.VersionException
* @throws javax.jcr.lock.LockException
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/IdFactory.java Wed Jun 17 14:38:34 2009
@@ -30,7 +30,7 @@
/**
* Creates a new <code>PropertyId</code> from the given parent id and
- * qualified property name.
+ * property name.
*
* @param parentId
* @param propertyName
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/Path.java Wed Jun 17 14:38:34 2009
@@ -22,7 +22,7 @@
import javax.jcr.RepositoryException;
/**
- * The <code>Path</code> interface defines the qualified representation of
+ * The <code>Path</code> interface defines the SPI level representation of
* a JCR path. It consists of an ordered list of {@link Path.Element} objects
* and is immutable.<p/>
*
@@ -401,9 +401,9 @@
public interface Element extends Serializable {
/**
- * Returns the qualified name of this path element.
+ * Returns the name of this path element.
*
- * @return qualified name
+ * @return The name of this path element.
*/
public Name getName();
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PathFactory.java Wed Jun 17 14:38:34 2009
@@ -119,7 +119,7 @@
public Path create(String pathString) throws IllegalArgumentException;
/**
- * Creates a path element with the given qualified name.
+ * Creates a path element from the given <code>name</code>.
* The created path element does not contain an explicit index.
* <p/>
* If the specified name denotes a <i>special</i> path element (either
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/PropertyInfo.java Wed Jun 17 14:38:34 2009
@@ -47,7 +47,7 @@
public boolean isMultiValued();
/**
- * @return Qualified values present on this <code>PropertyInfo</code>.
+ * @return The values present on this <code>PropertyInfo</code>.
*/
public QValue[] getValues();
}
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QItemDefinition.java Wed Jun 17 14:38:34 2009
@@ -19,7 +19,7 @@
import javax.jcr.nodetype.ItemDefinition;
/**
- * <code>QItemDefinition</code> is the qualified SPI representation of
+ * <code>QItemDefinition</code> is the SPI representation of
* an {@link ItemDefinition item definition}. It refers to <code>Name</code>s
* only and is thus isolated from session-specific namespace mappings.
*
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeDefinition.java Wed Jun 17 14:38:34 2009
@@ -19,7 +19,7 @@
import javax.jcr.nodetype.NodeDefinition;
/**
- * <code>QNodeDefinition</code> is the qualified SPI representation of
+ * <code>QNodeDefinition</code> is the SPI representation of
* a {@link NodeDefinition node definition}. It refers to <code>Name</code>s only
* and is thus isolated from session-specific namespace mappings.
*
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QNodeTypeDefinition.java Wed Jun 17 14:38:34 2009
@@ -19,8 +19,8 @@
import java.util.Collection;
/**
- * <code>QNodeTypeDefinition</code> is the qualified SPI representation of a
- * {@link javax.jcr.nodetype.NodeType node type}. It refers to qualified names
+ * <code>QNodeTypeDefinition</code> is the SPI representation of a
+ * {@link javax.jcr.nodetype.NodeType node type}. It refers to <code>Name</code>s
* only and is therefore independant of session-specific namespace mappings.
*
* @see javax.jcr.nodetype.NodeType
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QPropertyDefinition.java Wed Jun 17 14:38:34 2009
@@ -19,9 +19,9 @@
import javax.jcr.nodetype.PropertyDefinition;
/**
- * <code>QPropertyDefinition</code> is the qualified SPI representation of
- * a {@link PropertyDefinition property definition}. It refers to
- * qualified default values and value constraints only and is thus isolated
+ * <code>QPropertyDefinition</code> is the SPI representation of
+ * a {@link PropertyDefinition property definition}. It refers to <code>Name</code>s,
+ * SPI default values and value constraints only and is thus isolated
* from session-specific namespace mappings.
*
* @see javax.jcr.nodetype.PropertyDefinition
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QValue.java Wed Jun 17 14:38:34 2009
@@ -27,7 +27,7 @@
import javax.jcr.Binary;
/**
- * <code>QValue</code> is the qualified SPI representation of a
+ * <code>QValue</code> is the SPI representation of a
* {@link javax.jcr.Value jcr value}. It therefore refers to <code>Name</code>s
* and <code>Path</code>s only and is thus isolated from session-specific
* namespace mappings.
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/QueryResultRow.java Wed Jun 17 14:38:34 2009
@@ -19,7 +19,7 @@
/**
* <code>QueryResultRow</code> represents the SPI equivalent of a query result
* row. It provides access to the id of the Node this row represents as well
- * as to the score and to the qualified values represent in this result row.
+ * as to the score and to the values represented in this result row.
*/
public interface QueryResultRow {
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/RepositoryService.java Wed Jun 17 14:38:34 2009
@@ -68,9 +68,9 @@
* If <code>srcWorkspaceName</code> differs from the workspace name present with
* the SessionInfo, the copy is corresponds to a copy across workspaces.
* The source and destination of the copy operation are specified by
- * {@link NodeId}s. The <code>Name</code> holds the new name in fully qualified
- * form. Taken together, this information is sufficient to completely specify
- * and authorize the copy operations.<p/>
+ * {@link NodeId}s. The <code>Name</code> holds the new name. Taken together,
+ * this information is sufficient to completely specify and authorize the copy
+ * operations.<p/>
*
* The RepositoryService in addition allows to create and submit {@link Batch}
* objects, that cover lists of operations that have to be applied to the
Modified: jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package.html
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package.html?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package.html (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/main/java/org/apache/jackrabbit/spi/package.html Wed Jun 17 14:38:34 2009
@@ -21,7 +21,7 @@
<ul>
<li>Above the SPI an implementation that whishes to expose the JCR API again
needs to implement the transient item space, the session local namespace mapping
-and various conversions from the fully qualified values present in the SPI to
+and various conversions from the value representation in the SPI to
the resolved values in the JCR API.</li>
<li>An implementation of the SPI interfaces has to deal with the persistent
view of a JCR repository. This includes almost all aspects of the JSR 170
Modified: jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueFactoryTest.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueFactoryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueFactoryTest.java Wed Jun 17 14:38:34 2009
@@ -203,13 +203,13 @@
public void testDateValueEquality() throws RepositoryException {
QValue v = factory.create(calendar);
QValue otherV = factory.create(calendar);
- assertEquals("Equality of qualified date value must be calculated based on their String representation.", v, otherV);
+ assertEquals("Equality of date value must be calculated based on their String representation.", v, otherV);
}
public void testDateValueEquality2() throws RepositoryException {
QValue v = factory.create(calendar);
QValue otherV = factory.create(v.getString(), PropertyType.DATE);
- assertEquals("Equality of qualified date value must be calculated based on their String representation.", v, otherV);
+ assertEquals("Equality of date value must be calculated based on their String representation.", v, otherV);
}
//----------------------------------------------------------< REFERENCE >---
@@ -238,7 +238,7 @@
if (reference != null) {
QValue v = factory.create(reference, PropertyType.REFERENCE);
QValue otherV = factory.create(reference, PropertyType.REFERENCE);
- assertEquals("Qualified ref values created from the same string must be equal.", v, otherV);
+ assertEquals("Reference values created from the same string must be equal.", v, otherV);
} else {
log.warn("Configuration entry 'QValueFactoryTest.reference' is missing -> skip test 'testReferenceValueEquality'.");
}
Modified: jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueTest.java?rev=785629&r1=785628&r2=785629&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueTest.java (original)
+++ jackrabbit/trunk/jackrabbit-spi/src/test/java/org/apache/jackrabbit/spi/QValueTest.java Wed Jun 17 14:38:34 2009
@@ -194,13 +194,13 @@
public void testDateValueEquality() throws RepositoryException {
QValue v = factory.create(CALENDAR);
QValue otherV = factory.create(CALENDAR);
- assertEquals("Equality of qualified date value must be calculated based on their String representation.", v, otherV);
+ assertEquals("Equality of date value must be calculated based on their String representation.", v, otherV);
}
public void testDateValueEquality2() throws RepositoryException {
QValue v = factory.create(CALENDAR);
QValue otherV = factory.create(v.getString(), PropertyType.DATE);
- assertEquals("Equality of qualified date value must be calculated based on their String representation.", v, otherV);
+ assertEquals("Equality of date value must be calculated based on their String representation.", v, otherV);
}
//----------------------------------------------------------< REFERENCE >---
@@ -227,7 +227,7 @@
if (reference != null) {
QValue v = factory.create(reference, PropertyType.REFERENCE);
QValue otherV = factory.create(reference, PropertyType.REFERENCE);
- assertEquals("Qualified ref values created from the same string must be equal.", v, otherV);
+ assertEquals("Reference values created from the same string must be equal.", v, otherV);
} else {
log.warn("Configuration entry 'QValueFactoryTest.reference' is missing -> skip test 'testReferenceValueEquality'.");
}