You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2005/02/12 14:40:23 UTC
svn commit: r153503 [2/3] - in incubator/jackrabbit/trunk/src:
java/org/apache/jackrabbit/core/ java/org/apache/jackrabbit/core/config/
java/org/apache/jackrabbit/core/nodetype/
java/org/apache/jackrabbit/core/search/
java/org/apache/jackrabbit/core/search/lucene/
java/org/apache/jackrabbit/core/search/sql/
java/org/apache/jackrabbit/core/search/xpath/
java/org/apache/jackrabbit/core/state/
java/org/apache/jackrabbit/core/util/uuid/
java/org/apache/jackrabbit/core/version/
java/org/apache/jackrabbit/core/version/persistence/
java/org/apache/jackrabbit/core/virtual/
java/org/apache/jackrabbit/core/xml/ test/org/apache/jackrabbit/core/
test/org/apache/jackrabbit/test/api/
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/JCRSQLQueryBuilder.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/JCRSQLQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/JCRSQLQueryBuilder.java Sat Feb 12 05:40:13 2005
@@ -24,7 +24,7 @@
import org.apache.jackrabbit.core.search.NotQueryNode;
import org.apache.jackrabbit.core.search.OrderQueryNode;
import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.Constants;
+import org.apache.jackrabbit.core.search.QueryConstants;
import org.apache.jackrabbit.core.search.QueryNode;
import org.apache.jackrabbit.core.search.TextsearchQueryNode;
import org.apache.jackrabbit.core.search.PathQueryNode;
@@ -52,7 +52,7 @@
/**
* DateFormat pattern for type
- * {@link org.apache.jackrabbit.core.search.Constants.TYPE_DATE}.
+ * {@link org.apache.jackrabbit.core.search.QueryConstants.TYPE_DATE}.
*/
private static final String DATE_PATTERN = "yyyy-MM-dd";
@@ -202,7 +202,7 @@
}, data);
QName identifier = tmp[0];
- if (identifier.equals(Constants.JCR_PATH)) {
+ if (identifier.equals(QueryConstants.JCR_PATH)) {
if (node.children[1] instanceof ASTIdentifier) {
// simply ignore, this is a join of a mixin node type
} else {
@@ -212,34 +212,34 @@
return data;
}
- if (type == Constants.OPERATION_BETWEEN) {
+ if (type == QueryConstants.OPERATION_BETWEEN) {
AndQueryNode between = new AndQueryNode(parent);
RelationQueryNode rel = createRelationQueryNode(between,
- identifier, Constants.OPERATION_GE_VALUE, (ASTLiteral) node.children[1]);
+ identifier, QueryConstants.OPERATION_GE_VALUE, (ASTLiteral) node.children[1]);
between.addOperand(rel);
rel = createRelationQueryNode(between,
- identifier, Constants.OPERATION_LE_VALUE, (ASTLiteral) node.children[2]);
+ identifier, QueryConstants.OPERATION_LE_VALUE, (ASTLiteral) node.children[2]);
between.addOperand(rel);
predicateNode = between;
- } else if (type == Constants.OPERATION_EQ_VALUE) {
+ } else if (type == QueryConstants.OPERATION_EQ_VALUE) {
if (node.children[1] instanceof ASTIdentifier) {
// simply ignore, this is a join of a mixin node type
} else {
predicateNode = createRelationQueryNode(parent,
identifier, type, (ASTLiteral) node.children[1]);
}
- } else if (type == Constants.OPERATION_GE_VALUE
- || type == Constants.OPERATION_GT_VALUE
- || type == Constants.OPERATION_LE_VALUE
- || type == Constants.OPERATION_LT_VALUE
- || type == Constants.OPERATION_NE_VALUE) {
+ } else if (type == QueryConstants.OPERATION_GE_VALUE
+ || type == QueryConstants.OPERATION_GT_VALUE
+ || type == QueryConstants.OPERATION_LE_VALUE
+ || type == QueryConstants.OPERATION_LT_VALUE
+ || type == QueryConstants.OPERATION_NE_VALUE) {
predicateNode = createRelationQueryNode(parent,
identifier, type, (ASTLiteral) node.children[1]);
- } else if (type == Constants.OPERATION_EQ_GENERAL
- || type == Constants.OPERATION_NE_GENERAL) {
+ } else if (type == QueryConstants.OPERATION_EQ_GENERAL
+ || type == QueryConstants.OPERATION_NE_GENERAL) {
predicateNode = createRelationQueryNode(parent,
identifier, type, (ASTLiteral) node.children[0]);
- } else if (type == Constants.OPERATION_LIKE) {
+ } else if (type == QueryConstants.OPERATION_LIKE) {
ASTLiteral pattern = (ASTLiteral) node.children[1];
if (node.getEscapeString() != null) {
if (node.getEscapeString().length() == 1) {
@@ -256,19 +256,19 @@
}
predicateNode = createRelationQueryNode(parent,
identifier, type, pattern);
- } else if (type == Constants.OPERATION_IN) {
+ } else if (type == QueryConstants.OPERATION_IN) {
OrQueryNode in = new OrQueryNode(parent);
for (int i = 1; i < node.children.length; i++) {
RelationQueryNode rel = createRelationQueryNode(in,
- identifier, Constants.OPERATION_EQ_VALUE, (ASTLiteral) node.children[i]);
+ identifier, QueryConstants.OPERATION_EQ_VALUE, (ASTLiteral) node.children[i]);
in.addOperand(rel);
}
predicateNode = in;
- } else if (type == Constants.OPERATION_NULL
- || type == Constants.OPERATION_NOT_NULL) {
+ } else if (type == QueryConstants.OPERATION_NULL
+ || type == QueryConstants.OPERATION_NOT_NULL) {
// create a dummy literal
ASTLiteral star = new ASTLiteral(JCRSQLParserTreeConstants.JJTLITERAL);
- star.setType(Constants.TYPE_STRING);
+ star.setType(QueryConstants.TYPE_STRING);
star.setValue("%");
predicateNode = createRelationQueryNode(parent,
identifier, type, star);
@@ -402,19 +402,19 @@
RelationQueryNode node = null;
try {
- if (literal.getType() == Constants.TYPE_DATE) {
+ if (literal.getType() == QueryConstants.TYPE_DATE) {
SimpleDateFormat format = new SimpleDateFormat(DATE_PATTERN);
Date date = format.parse(stringValue);
node = new RelationQueryNode(parent, propertyName, date, operationType);
- } else if (literal.getType() == Constants.TYPE_DOUBLE) {
+ } else if (literal.getType() == QueryConstants.TYPE_DOUBLE) {
double d = Double.parseDouble(stringValue);
node = new RelationQueryNode(parent, propertyName, d, operationType);
- } else if (literal.getType() == Constants.TYPE_LONG) {
+ } else if (literal.getType() == QueryConstants.TYPE_LONG) {
long l = Long.parseLong(stringValue);
node = new RelationQueryNode(parent, propertyName, l, operationType);
- } else if (literal.getType() == Constants.TYPE_STRING) {
+ } else if (literal.getType() == QueryConstants.TYPE_STRING) {
node = new RelationQueryNode(parent, propertyName, stringValue, operationType);
- } else if (literal.getType() == Constants.TYPE_TIMESTAMP) {
+ } else if (literal.getType() == QueryConstants.TYPE_TIMESTAMP) {
Calendar c = ISO8601.parse(stringValue);
node = new RelationQueryNode(parent, propertyName, c.getTime(), operationType);
}
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/QueryFormat.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/QueryFormat.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/QueryFormat.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/sql/QueryFormat.java Sat Feb 12 05:40:13 2005
@@ -30,7 +30,7 @@
import org.apache.jackrabbit.core.search.RelationQueryNode;
import org.apache.jackrabbit.core.search.OrderQueryNode;
import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.Constants;
+import org.apache.jackrabbit.core.search.QueryConstants;
import org.apache.jackrabbit.core.NamespaceResolver;
import org.apache.jackrabbit.core.NoPrefixDeclaredException;
import org.apache.jackrabbit.core.QName;
@@ -47,7 +47,7 @@
/**
* Implements the query node tree serialization into a String.
*/
-class QueryFormat implements QueryNodeVisitor, Constants {
+class QueryFormat implements QueryNodeVisitor, QueryConstants {
/** Will be used to resolve QNames */
private final NamespaceResolver resolver;
@@ -265,7 +265,7 @@
public Object visit(PathQueryNode node, Object data) {
StringBuffer sb = (StringBuffer) data;
try {
- sb.append(Constants.JCR_PATH.toJCRName(resolver));
+ sb.append(QueryConstants.JCR_PATH.toJCRName(resolver));
sb.append(" LIKE '");
LocationStepQueryNode[] steps = node.getPathSteps();
for (int i = 0; i < steps.length; i++) {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/QueryFormat.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/QueryFormat.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/QueryFormat.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/QueryFormat.java Sat Feb 12 05:40:13 2005
@@ -16,46 +16,38 @@
*/
package org.apache.jackrabbit.core.search.xpath;
-import org.apache.jackrabbit.core.search.QueryNodeVisitor;
-import org.apache.jackrabbit.core.search.QueryRootNode;
-import org.apache.jackrabbit.core.search.OrQueryNode;
-import org.apache.jackrabbit.core.search.AndQueryNode;
-import org.apache.jackrabbit.core.search.NotQueryNode;
-import org.apache.jackrabbit.core.search.ExactQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.RangeQueryNode;
-import org.apache.jackrabbit.core.search.TextsearchQueryNode;
-import org.apache.jackrabbit.core.search.PathQueryNode;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
-import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.Constants;
+import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.NamespaceResolver;
import org.apache.jackrabbit.core.NoPrefixDeclaredException;
import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.core.search.*;
import org.apache.jackrabbit.core.util.ISO9075;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import javax.jcr.query.InvalidQueryException;
import javax.jcr.util.ISO8601;
-import java.util.Calendar;
-import java.util.TimeZone;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.List;
+import java.util.TimeZone;
/**
* Implements the query node tree serialization into a String.
*/
-class QueryFormat implements QueryNodeVisitor, Constants {
+class QueryFormat implements QueryNodeVisitor, QueryConstants {
- /** Will be used to resolve QNames */
+ /**
+ * Will be used to resolve QNames
+ */
private final NamespaceResolver resolver;
- /** The String representation of the query node tree */
+ /**
+ * The String representation of the query node tree
+ */
private String statement;
- /** List of exception objects created while creating the XPath string */
+ /**
+ * List of exception objects created while creating the XPath string
+ */
private List exceptions = new ArrayList();
private QueryFormat(QueryRootNode root, NamespaceResolver resolver)
@@ -71,11 +63,12 @@
/**
* Creates a XPath <code>String</code> representation of the QueryNode tree
* argument <code>root</code>.
- * @param root the query node tree.
+ *
+ * @param root the query node tree.
* @param resolver to resolve QNames.
* @return the XPath string representation of the QueryNode tree.
* @throws InvalidQueryException the query node tree cannot be represented
- * as a XPath <code>String</code>.
+ * as a XPath <code>String</code>.
*/
public static String toString(QueryRootNode root, NamespaceResolver resolver)
throws InvalidQueryException {
@@ -84,6 +77,7 @@
/**
* Returns the string representation.
+ *
* @return the string representation.
*/
public String toString() {
@@ -190,7 +184,7 @@
StringBuffer sb = (StringBuffer) data;
try {
sb.append("@");
- sb.append(NodeTypeRegistry.JCR_PRIMARY_TYPE.toJCRName(resolver));
+ sb.append(Constants.JCR_PRIMARYTYPE.toJCRName(resolver));
sb.append("='").append(node.getValue().toJCRName(resolver));
sb.append("'");
} catch (NoPrefixDeclaredException e) {
@@ -336,10 +330,11 @@
/**
* Appends the value of a relation node to the <code>StringBuffer</code>
* <code>sb</code>.
+ *
* @param node the relation node.
- * @param b where to append the value.
+ * @param b where to append the value.
* @throws NoPrefixDeclaredException if a prefix declaration is missing for
- * a namespace URI.
+ * a namespace URI.
*/
private void appendValue(RelationQueryNode node, StringBuffer b)
throws NoPrefixDeclaredException {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/XPathQueryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/XPathQueryBuilder.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/XPathQueryBuilder.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/search/xpath/XPathQueryBuilder.java Sat Feb 12 05:40:13 2005
@@ -16,107 +16,132 @@
*/
package org.apache.jackrabbit.core.search.xpath;
-import org.apache.jackrabbit.core.search.QueryRootNode;
-import org.apache.jackrabbit.core.search.PathQueryNode;
-import org.apache.jackrabbit.core.search.LocationStepQueryNode;
-import org.apache.jackrabbit.core.search.QueryNode;
-import org.apache.jackrabbit.core.search.AndQueryNode;
-import org.apache.jackrabbit.core.search.NAryQueryNode;
-import org.apache.jackrabbit.core.search.OrQueryNode;
-import org.apache.jackrabbit.core.search.RelationQueryNode;
-import org.apache.jackrabbit.core.search.NotQueryNode;
-import org.apache.jackrabbit.core.search.TextsearchQueryNode;
-import org.apache.jackrabbit.core.search.NodeTypeQueryNode;
-import org.apache.jackrabbit.core.search.OrderQueryNode;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.SearchManager;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.UnknownPrefixException;
+import org.apache.jackrabbit.core.*;
+import org.apache.jackrabbit.core.search.*;
import org.apache.jackrabbit.core.util.ISO9075;
-import org.apache.jackrabbit.core.NamespaceRegistryImpl;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import javax.jcr.query.InvalidQueryException;
import javax.jcr.util.ISO8601;
import java.io.StringReader;
import java.util.ArrayList;
-import java.util.List;
import java.util.Calendar;
+import java.util.List;
/**
* Query builder that translates a XPath statement into a query tree structure.
*/
public class XPathQueryBuilder implements XPathVisitor, XPathTreeConstants {
- /** QName for 'fn:not' */
+ /**
+ * QName for 'fn:not'
+ */
static final QName FN_NOT = new QName(SearchManager.NS_FN_URI, "not");
- /** QName for 'not' as defined in XPath 1.0 (no prefix) */
+ /**
+ * QName for 'not' as defined in XPath 1.0 (no prefix)
+ */
static final QName FN_NOT_10 = new QName("", "not");
- /** QName for xs:dateTime */
+ /**
+ * QName for xs:dateTime
+ */
static final QName XS_DATETIME = new QName(SearchManager.NS_XS_URI, "dateTime");
- /** QName for jcrfn:like */
+ /**
+ * QName for jcrfn:like
+ */
static final QName JCRFN_LIKE = new QName(SearchManager.NS_JCRFN_URI, "like");
- /** QName for jcrfn:contains */
+ /**
+ * QName for jcrfn:contains
+ */
static final QName JCRFN_CONTAINS = new QName(SearchManager.NS_JCRFN_URI, "contains");
- /** QName for jcr:root */
+ /**
+ * QName for jcr:root
+ */
static final QName JCR_ROOT = new QName(NamespaceRegistryImpl.NS_JCR_URI, "root");
- /** String constant for operator 'eq' */
+ /**
+ * String constant for operator 'eq'
+ */
private static final String OP_EQ = "eq";
- /** String constant for operator 'ne' */
+ /**
+ * String constant for operator 'ne'
+ */
private static final String OP_NE = "ne";
- /** String constant for operator 'gt' */
+ /**
+ * String constant for operator 'gt'
+ */
private static final String OP_GT = "gt";
- /** String constant for operator 'ge' */
+ /**
+ * String constant for operator 'ge'
+ */
private static final String OP_GE = "ge";
- /** String constant for operator 'lt' */
+ /**
+ * String constant for operator 'lt'
+ */
private static final String OP_LT = "lt";
- /** String constant for operator 'le' */
+ /**
+ * String constant for operator 'le'
+ */
private static final String OP_LE = "le";
- /** String constant for operator '=' */
+ /**
+ * String constant for operator '='
+ */
private static final String OP_SIGN_EQ = "=";
- /** String constant for operator '!=' */
+ /**
+ * String constant for operator '!='
+ */
private static final String OP_SIGN_NE = "!=";
- /** String constant for operator '>' */
+ /**
+ * String constant for operator '>'
+ */
private static final String OP_SIGN_GT = ">";
- /** String constant for operator '>=' */
+ /**
+ * String constant for operator '>='
+ */
private static final String OP_SIGN_GE = ">=";
- /** String constant for operator '<' */
+ /**
+ * String constant for operator '<'
+ */
private static final String OP_SIGN_LT = "<";
- /** String constant for operator '<=' */
+ /**
+ * String constant for operator '<='
+ */
private static final String OP_SIGN_LE = "<=";
- /** The root <code>QueryNode</code> */
+ /**
+ * The root <code>QueryNode</code>
+ */
private final QueryRootNode root = new QueryRootNode();
- /** The {@link org.apache.jackrabbit.core.NamespaceResolver} in use */
+ /**
+ * The {@link org.apache.jackrabbit.core.NamespaceResolver} in use
+ */
private final NamespaceResolver resolver;
- /** List of exceptions that are created while building the query tree */
+ /**
+ * List of exceptions that are created while building the query tree
+ */
private final List exceptions = new ArrayList();
/**
* Creates a new <code>XPathQueryBuilder</code> instance.
+ *
* @param statement the XPath statement.
- * @param resolver the namespace resolver to use.
+ * @param resolver the namespace resolver to use.
* @throws InvalidQueryException if the XPath statement is malformed.
*/
private XPathQueryBuilder(String statement, NamespaceResolver resolver)
@@ -149,8 +174,9 @@
/**
* Creates a <code>QueryNode</code> tree from a XPath statement.
+ *
* @param statement the XPath statement.
- * @param resolver the namespace resolver to use.
+ * @param resolver the namespace resolver to use.
* @return the <code>QueryNode</code> tree for the XPath statement.
* @throws InvalidQueryException if the XPath statement is malformed.
*/
@@ -163,11 +189,12 @@
/**
* Creates a String representation of the query node tree in XPath syntax.
- * @param root the root of the query node tree.
+ *
+ * @param root the root of the query node tree.
* @param resolver to resolve QNames.
* @return a String representation of the query node tree.
* @throws InvalidQueryException if the query node tree cannot be converted
- * into a String representation due to restrictions in XPath.
+ * into a String representation due to restrictions in XPath.
*/
public static String toString(QueryRootNode root, NamespaceResolver resolver)
throws InvalidQueryException {
@@ -176,6 +203,7 @@
/**
* Returns the root node of the <code>QueryNode</code> tree.
+ *
* @return the root node of the <code>QueryNode</code> tree.
*/
QueryRootNode getRootNode() {
@@ -186,11 +214,12 @@
/**
* Implements the generic visit method for this <code>XPathVisitor</code>.
+ *
* @param node the current node as created by the XPath parser.
* @param data the current <code>QueryNode</code> created by this
- * <code>XPathVisitor</code>.
+ * <code>XPathVisitor</code>.
* @return the current <code>QueryNode</code>. Can be different from
- * <code>data</code>.
+ * <code>data</code>.
*/
public Object visit(SimpleNode node, Object data) {
switch (node.getId()) {
@@ -283,7 +312,7 @@
break;
case JJTORDERMODIFIER:
if (node.jjtGetNumChildren() > 0
- && ((SimpleNode) node.jjtGetChild(0)) .getId() == JJTDESCENDING) {
+ && ((SimpleNode) node.jjtGetChild(0)).getId() == JJTDESCENDING) {
OrderQueryNode.OrderSpec[] specs = ((OrderQueryNode) data).getOrderSpecs();
specs[specs.length - 1].setAscending(false);
}
@@ -300,7 +329,8 @@
/**
* Creates a <code>LocationStepQueryNode</code> at the current position
* in parent.
- * @param node the current node in the xpath syntax tree.
+ *
+ * @param node the current node in the xpath syntax tree.
* @param parent the parent <code>PathQueryNode</code>.
* @return the created <code>LocationStepQueryNode</code>.
*/
@@ -327,9 +357,10 @@
/**
* Creates a name test either for a <code>LocationStepQueryNode</code> or
* for a <code>RelationQueryNode</code>.
- * @param node the current node in the xpath syntax tree.
+ *
+ * @param node the current node in the xpath syntax tree.
* @param queryNode either a <code>LocationStepQueryNode</code> or a
- * <code>RelationQueryNode</code>.
+ * <code>RelationQueryNode</code>.
*/
private void createNameTest(SimpleNode node, QueryNode queryNode) {
if (node.jjtGetNumChildren() > 0) {
@@ -370,7 +401,8 @@
/**
* Creates a new {@link org.apache.jackrabbit.core.search.RelationQueryNode}
* with <code>queryNode</code> as its parent node.
- * @param node a comparison expression node.
+ *
+ * @param node a comparison expression node.
* @param queryNode the current <code>QueryNode</code>.
*/
private void createExpression(SimpleNode node, NAryQueryNode queryNode) {
@@ -407,7 +439,7 @@
node.childrenAccept(this, rqn);
// if property name is jcr:primaryType treat special
- if (rqn.getProperty().equals(NodeTypeRegistry.JCR_PRIMARY_TYPE)) {
+ if (rqn.getProperty().equals(Constants.JCR_PRIMARYTYPE)) {
if (rqn.getType() == RelationQueryNode.TYPE_STRING) {
try {
QName ntName = QName.fromJCRName(rqn.getStringValue(), resolver);
@@ -430,6 +462,7 @@
/**
* Creates the primary path query node.
+ *
* @param node xpath node representing the root of the parsed tree.
* @return
*/
@@ -441,8 +474,9 @@
/**
* Assigns a value to the <code>queryNode</code>.
- * @param node must be of type string, decimal, double or integer; otherwise
- * an InvalidQueryException is added to {@link #exceptions}.
+ *
+ * @param node must be of type string, decimal, double or integer; otherwise
+ * an InvalidQueryException is added to {@link #exceptions}.
* @param queryNode current node in the query tree.
*/
private void assignValue(SimpleNode node, RelationQueryNode queryNode) {
@@ -467,7 +501,8 @@
/**
* Creates a function based on <code>node</code>.
- * @param node the function node from the xpath tree.
+ *
+ * @param node the function node from the xpath tree.
* @param queryNode the current query node.
* @return
*/
@@ -597,6 +632,7 @@
/**
* Returns true if <code>node</code> has a child node which is the attribute
* axis.
+ *
* @param node a node with type {@link org.apache.jackrabbit.core.search.xpath.XPathTreeConstants.JJTSTEPEXPR}.
* @return <code>true</code> if this step expression uses the attribute axis.
*/
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java Sat Feb 12 05:40:13 2005
@@ -343,7 +343,7 @@
return descendants.values().iterator();
}
- Path[] parentPaths = null;
+ Path[] parentPaths;
try {
parentPaths = hierMgr.getAllPaths(parentId);
} catch (ItemNotFoundException infe) {
@@ -361,7 +361,7 @@
while (iter.hasNext()) {
ItemState state = (ItemState) iter.next();
ItemId id = state.getId();
- Path[] paths = null;
+ Path[] paths;
try {
paths = hierMgr.getAllPaths(id);
} catch (ItemNotFoundException infe) {
@@ -417,7 +417,7 @@
* specified parentId's paths.
*/
String uuid = (String) iterUUIDs.next();
- Path[] pa = null;
+ Path[] pa;
try {
pa = hierMgr.getAllPaths(new NodeId(uuid));
} catch (ItemNotFoundException infe) {
@@ -449,7 +449,7 @@
* avoid potential conflicts
*/
Path dummy = Path.create(p0,
- Path.create(new QName(NamespaceRegistryImpl.NS_DEFAULT_URI, Integer.toString(new Random().nextInt())), 0),
+ Path.create(new QName(Constants.NS_DEFAULT_URI, Integer.toString(new Random().nextInt())), 0),
true);
descendants.put(dummy, state);
isDescendant = true;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java Sat Feb 12 05:40:13 2005
@@ -84,7 +84,7 @@
NodeTypeRegistry ntReg)
throws ItemStateException {
- NodeState rootState = createInstance(rootNodeUUID, NodeTypeRegistry.REP_ROOT, null);
+ NodeState rootState = createInstance(rootNodeUUID, Constants.REP_ROOT, null);
// @todo FIXME need to manually setup root node by creating mandatory jcr:primaryType property
NodeDefId nodeDefId = null;
@@ -94,7 +94,7 @@
nodeDefId = new NodeDefId(ntReg.getRootNodeDef());
// FIXME relies on definition of nt:base:
// first property definition in nt:base is jcr:primaryType
- propDefId = new PropDefId(ntReg.getNodeTypeDef(NodeTypeRegistry.NT_BASE).getPropertyDefs()[0]);
+ propDefId = new PropDefId(ntReg.getNodeTypeDef(Constants.NT_BASE).getPropertyDefs()[0]);
} catch (NoSuchNodeTypeException nsnte) {
String msg = "failed to create root node";
log.debug(msg);
@@ -102,11 +102,11 @@
}
rootState.setDefinitionId(nodeDefId);
- QName propName = NodeTypeRegistry.JCR_PRIMARY_TYPE;
+ QName propName = Constants.JCR_PRIMARYTYPE;
rootState.addPropertyEntry(propName);
PropertyState prop = createInstance(propName, rootNodeUUID);
- prop.setValues(new InternalValue[]{InternalValue.create(NodeTypeRegistry.REP_ROOT)});
+ prop.setValues(new InternalValue[]{InternalValue.create(Constants.REP_ROOT)});
prop.setType(PropertyType.NAME);
prop.setMultiValued(false);
prop.setDefinitionId(propDefId);
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/Constants.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/Constants.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/Constants.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/Constants.java Sat Feb 12 05:40:13 2005
@@ -84,7 +84,7 @@
String URN_PREFIX = "urn:uuid:";
- //** UUID Variant Constants
+ //** UUID Variant QueryConstants
/**
* UUID variant bits described in the IETF Draft MSB order,
* this is the "Reserved, NCS backward compatibility field" 0 x x with unknown bits as 0
@@ -110,7 +110,7 @@
int VARIANT_FUTURE = 7;
- //** UUID Version Constants
+ //** UUID Version QueryConstants
/**
* Version one constant for UUID version one of four
*/
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/VersionFourGenerator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/VersionFourGenerator.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/VersionFourGenerator.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uuid/VersionFourGenerator.java Sat Feb 12 05:40:13 2005
@@ -47,7 +47,7 @@
/**
* XXX begin modification by stefan@apache.org
*/
-//public final class VersionFourGenerator implements IdentifierGenerator, Constants {
+//public final class VersionFourGenerator implements IdentifierGenerator, QueryConstants {
public final class VersionFourGenerator implements Constants {
/** XXX end modification by stefan@apache.org */
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/HistoryRootNodeState.java Sat Feb 12 05:40:13 2005
@@ -16,9 +16,10 @@
*/
package org.apache.jackrabbit.core.version;
+import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.NamespaceRegistryImpl;
import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.virtual.VirtualNodeState;
import javax.jcr.RepositoryException;
@@ -59,26 +60,26 @@
VersionManager vm,
String parentUUID,
String uuid) throws RepositoryException {
- super(stateMgr, parentUUID, uuid, NodeTypeRegistry.REP_VERSION_STORAGE, new QName[0]);
+ super(stateMgr, parentUUID, uuid, Constants.REP_VERSIONSTORAGE, new QName[0]);
this.vm = vm;
}
/**
- * @see org.apache.jackrabbit.core.state.NodeState#hasChildNodeEntry(org.apache.jackrabbit.core.QName)
+ * @see NodeState#hasChildNodeEntry(QName)
*/
public synchronized boolean hasChildNodeEntry(QName name) {
return vm.hasVersionHistory(name.getLocalName());
}
/**
- * @see org.apache.jackrabbit.core.state.NodeState#hasChildNodeEntry(org.apache.jackrabbit.core.QName, int)
+ * @see NodeState#hasChildNodeEntry(QName, int)
*/
public synchronized boolean hasChildNodeEntry(QName name, int index) {
return index <= 1 ? vm.hasVersionHistory(name.getLocalName()) : false;
}
/**
- * @see org.apache.jackrabbit.core.state.NodeState#getChildNodeEntry(org.apache.jackrabbit.core.QName, int)
+ * @see NodeState#getChildNodeEntry(QName, int)
*/
public synchronized ChildNodeEntry getChildNodeEntry(QName nodeName, int index) {
try {
@@ -93,7 +94,7 @@
}
/**
- * @see org.apache.jackrabbit.core.state.NodeState#getChildNodeEntries()
+ * @see NodeState#getChildNodeEntries()
*/
public synchronized List getChildNodeEntries() {
if (LIST_ALL_HISTORIES) {
@@ -102,7 +103,7 @@
Iterator iter = vm.getVersionHistoryIds();
while (iter.hasNext()) {
String id = (String) iter.next();
- QName name = new QName(NamespaceRegistryImpl.NS_DEFAULT_URI, id);
+ QName name = new QName(NS_DEFAULT_URI, id);
list.add(createChildNodeEntry(name, id, 1));
}
return list;
@@ -114,12 +115,12 @@
}
/**
- * @see org.apache.jackrabbit.core.state.NodeState#getChildNodeEntries(String)
+ * @see NodeState#getChildNodeEntries(String)
*/
public synchronized List getChildNodeEntries(String uuid) {
// todo: do nicer
try {
- ChildNodeEntry entry = getChildNodeEntry(new QName(NamespaceRegistryImpl.NS_DEFAULT_URI, uuid), 1);
+ ChildNodeEntry entry = getChildNodeEntry(new QName(NS_DEFAULT_URI, uuid), 1);
if (entry != null) {
ArrayList list = new ArrayList(1);
list.add(entry);
@@ -132,7 +133,7 @@
}
/**
- * @see org.apache.jackrabbit.core.state.NodeState#getChildNodeEntries(org.apache.jackrabbit.core.QName)
+ * @see NodeState#getChildNodeEntries(QName)
*/
public synchronized List getChildNodeEntries(QName nodeName) {
// todo: do nicer
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionHistoryNodeState.java Sat Feb 12 05:40:13 2005
@@ -16,21 +16,20 @@
*/
package org.apache.jackrabbit.core.version;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.ItemImpl;
+import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.InternalValue;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.virtual.VirtualNodeState;
import javax.jcr.RepositoryException;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
/**
* This Class implements the virtual node state for a version history.
*/
-public class VersionHistoryNodeState extends VirtualNodeState {
+public class VersionHistoryNodeState extends VirtualNodeState implements Constants {
/**
* the rerpesenting version history
@@ -49,10 +48,10 @@
InternalVersionHistory vh,
String parentUUID)
throws RepositoryException {
- super(vm, parentUUID, vh.getId(), NodeTypeRegistry.NT_VERSION_HISTORY, new QName[0]);
+ super(vm, parentUUID, vh.getId(), NT_VERSIONHISTORY, new QName[0]);
// version history is referenceable
- setPropertyValue(ItemImpl.PROPNAME_UUID, InternalValue.create(vh.getId()));
+ setPropertyValue(JCR_UUID, InternalValue.create(vh.getId()));
this.vh = vh;
}
@@ -69,7 +68,7 @@
*/
public synchronized boolean hasChildNodeEntry(QName name, int index) {
// no same name siblings
- return index <= 1 ? (vh.hasVersion(name) ? true : super.hasChildNodeEntry(name, index)) : false;
+ return index <= 1 ? (vh.hasVersion(name) ? true : super.hasChildNodeEntry(name, index)) : false;
}
/**
@@ -82,7 +81,7 @@
try {
if (index <= 1) {
InternalVersion v = vh.getVersion(nodeName);
- if (v!=null) {
+ if (v != null) {
return createChildNodeEntry(nodeName, v.getId(), 1);
}
}
@@ -111,7 +110,7 @@
public synchronized List getChildNodeEntries(String uuid) {
List list = new ArrayList(super.getChildNodeEntries(uuid));
InternalVersion v = vh.getVersion(uuid);
- if (v!=null) {
+ if (v != null) {
list.add(createChildNodeEntry(v.getName(), uuid, 1));
}
return list;
@@ -124,7 +123,7 @@
List list = new ArrayList(super.getChildNodeEntries(nodeName));
try {
InternalVersion v = vh.getVersion(nodeName);
- if (v!=null) {
+ if (v != null) {
list.add(createChildNodeEntry(nodeName, v.getId(), 1));
}
} catch (RepositoryException e) {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java Sat Feb 12 05:40:13 2005
@@ -35,7 +35,7 @@
* This Class implements a virtual item state provider, in order to expose the
* versions to the version storage.
*/
-public class VersionItemStateProvider implements VirtualItemStateProvider {
+public class VersionItemStateProvider implements VirtualItemStateProvider, Constants {
/**
* the default logger
*/
@@ -85,10 +85,10 @@
public VersionItemStateProvider(VersionManager vMgr, NodeTypeManagerImpl ntMgr, String rootId, String parentId) throws RepositoryException {
this.vMgr = vMgr;
this.ntMgr = ntMgr;
- NDEF_VERSION = new NodeDefId(getNodeTypeManager().getNodeType(NodeTypeRegistry.NT_VERSION_HISTORY).getApplicableChildNodeDef(VersionManager.NODENAME_ROOTVERSION, NodeTypeRegistry.NT_VERSION).unwrap());
- NDEF_VERSION_HISTORY = new NodeDefId(getNodeTypeManager().getNodeType(NodeTypeRegistry.NT_UNSTRUCTURED).getApplicableChildNodeDef(VersionManager.NODENAME_ROOTVERSION, NodeTypeRegistry.NT_VERSION_HISTORY).unwrap());
- NDEF_VERSION_HISTORY_ROOT = new NodeDefId(getNodeTypeManager().getNodeType(NodeTypeRegistry.REP_SYSTEM).getApplicableChildNodeDef(VersionManager.NODENAME_HISTORY_ROOT, NodeTypeRegistry.REP_VERSION_STORAGE).unwrap());
- NDEF_VERSION_LABELS = new NodeDefId(getNodeTypeManager().getNodeType(NodeTypeRegistry.NT_VERSION_HISTORY).getApplicableChildNodeDef(VersionManager.NODENAME_VERSION_LABELS, NodeTypeRegistry.NT_VERSION_LABELS).unwrap());
+ NDEF_VERSION = new NodeDefId(getNodeTypeManager().getNodeType(NT_VERSIONHISTORY).getApplicableChildNodeDef(JCR_ROOTVERSION, NT_VERSION).unwrap());
+ NDEF_VERSION_HISTORY = new NodeDefId(getNodeTypeManager().getNodeType(NT_UNSTRUCTURED).getApplicableChildNodeDef(JCR_ROOTVERSION, NT_VERSIONHISTORY).unwrap());
+ NDEF_VERSION_HISTORY_ROOT = new NodeDefId(getNodeTypeManager().getNodeType(REP_SYSTEM).getApplicableChildNodeDef(JCR_VERSIONSTORAGE, REP_VERSIONSTORAGE).unwrap());
+ NDEF_VERSION_LABELS = new NodeDefId(getNodeTypeManager().getNodeType(NT_VERSIONHISTORY).getApplicableChildNodeDef(JCR_VERSIONLABELS, NT_VERSIONLABELS).unwrap());
this.root = new HistoryRootNodeState(this, vMgr, parentId, rootId);
this.root.setDefinitionId(NDEF_VERSION_HISTORY_ROOT);
@@ -180,31 +180,31 @@
String uuid = UUID.randomUUID().toString();
VersionLabelsNodeState vlns = new VersionLabelsNodeState(this, (InternalVersionHistory) vi, state.getUUID(), uuid);
vlns.setDefinitionId(NDEF_VERSION_LABELS);
- state.addChildNodeEntry(VersionManager.NODENAME_VERSION_LABELS, uuid);
+ state.addChildNodeEntry(JCR_VERSIONLABELS, uuid);
nodes.put(new NodeId(uuid), vlns);
} else if (vi instanceof InternalVersion) {
InternalVersion v = (InternalVersion) vi;
state = new VersionNodeState(this, v, vi.getParent().getId());
state.setDefinitionId(NDEF_VERSION);
- state.setPropertyValue(VersionManager.PROPNAME_CREATED, InternalValue.create(v.getCreated()));
+ state.setPropertyValue(JCR_CREATED, InternalValue.create(v.getCreated()));
// todo: do not read frozen stuff from frozen node instance here, rather put to version
- //state.setPropertyValue(VersionManager.PROPNAME_FROZEN_UUID, InternalValue.create(v.getFrozenNode().getFrozenUUID()));
- //state.setPropertyValue(VersionManager.PROPNAME_FROZEN_PRIMARY_TYPE, InternalValue.create(v.getFrozenNode().getFrozenPrimaryType()));
- //state.setPropertyValues(VersionManager.PROPNAME_FROZEN_MIXIN_TYPES, PropertyType.NAME, InternalValue.create(v.getFrozenNode().getFrozenMixinTypes()));
- //state.setPropertyValues(VersionManager.PROPNAME_VERSION_LABELS, PropertyType.STRING, InternalValue.create(v.getLabels()));
- state.setPropertyValues(VersionManager.PROPNAME_PREDECESSORS, PropertyType.REFERENCE, new InternalValue[0]);
- state.setPropertyValues(VersionManager.PROPNAME_SUCCESSORS, PropertyType.REFERENCE, new InternalValue[0]);
+ //state.setPropertyValue(JCR_FROZENUUID, InternalValue.create(v.getFrozenNode().getFrozenUUID()));
+ //state.setPropertyValue(JCR_FROZENPRIMARYTYPE, InternalValue.create(v.getFrozenNode().getFrozenPrimaryType()));
+ //state.setPropertyValues(JCR_FROZENMIXINTYPES, PropertyType.NAME, InternalValue.create(v.getFrozenNode().getFrozenMixinTypes()));
+ //state.setPropertyValues(JCR_VERSIONLABELS, PropertyType.STRING, InternalValue.create(v.getLabels()));
+ state.setPropertyValues(JCR_PREDECESSORS, PropertyType.REFERENCE, new InternalValue[0]);
+ state.setPropertyValues(JCR_SUCCESSORS, PropertyType.REFERENCE, new InternalValue[0]);
} else if (vi instanceof InternalFrozenNode) {
InternalFrozenNode fn = (InternalFrozenNode) vi;
VirtualNodeState parent = getNodeState(new NodeId(fn.getParent().getId()));
boolean mimicFrozen = !(parent instanceof VersionNodeState);
state = createNodeState(parent,
- VersionManager.NODENAME_FROZEN,
+ JCR_FROZENNODE,
id.getUUID(),
mimicFrozen ? fn.getFrozenPrimaryType() :
- NodeTypeRegistry.NT_FROZEN_NODE);
+ NT_FROZENNODE);
mapFrozenNode(state, fn, mimicFrozen);
} else if (vi instanceof InternalFrozenVersionHistory) {
@@ -213,10 +213,10 @@
state = createNodeState(parent,
fn.getName(),
id.getUUID(),
- NodeTypeRegistry.NT_VERSIONED_CHILD);
+ NT_VERSIONEDCHILD);
// IMO, this should be exposed aswell
- // state.setPropertyValue(VersionManager.PROPNAME_BASE_VERSION, InternalValue.create(UUID.fromString(fn.getBaseVersionId())));
- state.setPropertyValue(VersionManager.PROPNAME_CHILD, InternalValue.create(UUID.fromString(fn.getVersionHistoryId())));
+ // state.setPropertyValue(JCR_BASE_VERSION, InternalValue.create(UUID.fromString(fn.getBaseVersionId())));
+ state.setPropertyValue(JCR_CHILD, InternalValue.create(UUID.fromString(fn.getVersionHistoryId())));
} else {
// not found, throw
throw new NoSuchItemStateException(id.toString());
@@ -297,7 +297,7 @@
} catch (RepositoryException re) {
// hack, use nt:unstructured as parent
NodeTypeRegistry ntReg = getNodeTypeManager().getNodeTypeRegistry();
- EffectiveNodeType ent = ntReg.getEffectiveNodeType(NodeTypeRegistry.NT_UNSTRUCTURED);
+ EffectiveNodeType ent = ntReg.getEffectiveNodeType(NT_UNSTRUCTURED);
ChildNodeDef cnd = ent.getApplicableChildNodeDef(name, nodeTypeName);
def = getNodeTypeManager().getNodeDef(new NodeDefId(cnd));
}
@@ -344,16 +344,16 @@
if (mimicFrozen) {
if (node.getFrozenUUID() != null) {
- state.setPropertyValue(ItemImpl.PROPNAME_UUID, InternalValue.create(node.getFrozenUUID()));
+ state.setPropertyValue(JCR_UUID, InternalValue.create(node.getFrozenUUID()));
}
- state.setPropertyValues(ItemImpl.PROPNAME_MIXINTYPES, PropertyType.NAME, InternalValue.create(node.getFrozenMixinTypes()));
+ state.setPropertyValues(JCR_MIXINTYPES, PropertyType.NAME, InternalValue.create(node.getFrozenMixinTypes()));
} else {
- state.setPropertyValue(ItemImpl.PROPNAME_UUID, InternalValue.create(node.getId()));
+ state.setPropertyValue(JCR_UUID, InternalValue.create(node.getId()));
if (node.getFrozenUUID() != null) {
- state.setPropertyValue(VersionManager.PROPNAME_FROZEN_UUID, InternalValue.create(node.getFrozenUUID()));
+ state.setPropertyValue(JCR_FROZENUUID, InternalValue.create(node.getFrozenUUID()));
}
- state.setPropertyValue(VersionManager.PROPNAME_FROZEN_PRIMARY_TYPE, InternalValue.create(node.getFrozenPrimaryType()));
- state.setPropertyValues(VersionManager.PROPNAME_FROZEN_MIXIN_TYPES, PropertyType.NAME, InternalValue.create(node.getFrozenMixinTypes()));
+ state.setPropertyValue(JCR_FROZENPRIMARYTYPE, InternalValue.create(node.getFrozenPrimaryType()));
+ state.setPropertyValues(JCR_FROZENMIXINTYPES, PropertyType.NAME, InternalValue.create(node.getFrozenMixinTypes()));
}
// map properties
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionLabelsNodeState.java Sat Feb 12 05:40:13 2005
@@ -16,26 +16,26 @@
*/
package org.apache.jackrabbit.core.version;
+import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.InternalValue;
import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.util.uuid.UUID;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.core.state.NoSuchItemStateException;
+import org.apache.jackrabbit.core.util.uuid.UUID;
import org.apache.jackrabbit.core.virtual.VirtualNodeState;
import org.apache.jackrabbit.core.virtual.VirtualPropertyState;
-import javax.jcr.RepositoryException;
import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
import javax.jcr.version.VersionException;
-import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
/**
* This Class implements a virtual node state that represents a nt:versionLabels.
* node state.
*/
-public class VersionLabelsNodeState extends VirtualNodeState {
+public class VersionLabelsNodeState extends VirtualNodeState implements Constants {
/**
* the internal version
@@ -56,9 +56,9 @@
* @throws javax.jcr.RepositoryException
*/
protected VersionLabelsNodeState(VersionItemStateProvider vm, InternalVersionHistory vh,
- String parentUUID, String uuid)
+ String parentUUID, String uuid)
throws RepositoryException {
- super(vm, parentUUID, uuid, NodeTypeRegistry.NT_VERSION_LABELS, new QName[0]);
+ super(vm, parentUUID, uuid, NT_VERSIONLABELS, new QName[0]);
this.vh = vh;
}
@@ -82,7 +82,7 @@
public synchronized List getPropertyEntries() {
ArrayList list = new ArrayList(super.getPropertyEntries());
QName[] labels = vh.getVersionLabels();
- for (int i=0; i<labels.length; i++) {
+ for (int i = 0; i < labels.length; i++) {
list.add(createPropertyEntry(labels[i]));
}
return list;
@@ -91,7 +91,7 @@
public VirtualPropertyState[] getProperties() {
List list = getPropertyEntries();
VirtualPropertyState[] states = new VirtualPropertyState[list.size()];
- for (int i=0; i< states.length; i++) {
+ for (int i = 0; i < states.length; i++) {
try {
states[i] = getProperty(((PropertyEntry) list.get(i)).getName());
} catch (NoSuchItemStateException e) {
@@ -117,7 +117,7 @@
if (v != null) {
try {
VirtualPropertyState state = (VirtualPropertyState) labelStates.get(name);
- if (state==null) {
+ if (state == null) {
state = stateMgr.createPropertyState(this, name, PropertyType.REFERENCE, false);
labelStates.put(name, state);
}
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionManager.java Sat Feb 12 05:40:13 2005
@@ -16,9 +16,7 @@
*/
package org.apache.jackrabbit.core.version;
-import org.apache.jackrabbit.core.NamespaceRegistryImpl;
import org.apache.jackrabbit.core.NodeImpl;
-import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.state.ItemStateManager;
import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
@@ -34,67 +32,6 @@
*/
public interface VersionManager {
/**
- * root path for version storage
- */
- public static final QName NODENAME_HISTORY_ROOT = new QName(NamespaceRegistryImpl.NS_JCR_URI, "versionStorage");
- /**
- * the name of the frozen node
- */
- public static final QName NODENAME_FROZEN = new QName(NamespaceRegistryImpl.NS_JCR_URI, "frozenNode");
- /**
- * the name of the version labels node
- */
- public static final QName NODENAME_VERSION_LABELS = new QName(NamespaceRegistryImpl.NS_JCR_URI, "versionLabels");
- /**
- * name of the 'jcr:frozenUuid' property
- */
- public static final QName PROPNAME_FROZEN_UUID = new QName(NamespaceRegistryImpl.NS_JCR_URI, "frozenUuid");
- /**
- * name of the 'jcr:frozenPrimaryType' property
- */
- public static final QName PROPNAME_FROZEN_PRIMARY_TYPE = new QName(NamespaceRegistryImpl.NS_JCR_URI, "frozenPrimaryType");
- /**
- * name of the 'jcr:frozenMixinTypes' property
- */
- public static final QName PROPNAME_FROZEN_MIXIN_TYPES = new QName(NamespaceRegistryImpl.NS_JCR_URI, "frozenMixinTypes");
- /**
- * name of the 'jcr:predecessors' property
- */
- public static final QName PROPNAME_PREDECESSORS = new QName(NamespaceRegistryImpl.NS_JCR_URI, "predecessors");
- /**
- * name of the 'jcr:versionLabels' property
- */
- public static final QName PROPNAME_VERSION_LABELS = new QName(NamespaceRegistryImpl.NS_JCR_URI, "versionLabels");
- /**
- * name of the 'jcr:successors' property
- */
- public static final QName PROPNAME_SUCCESSORS = new QName(NamespaceRegistryImpl.NS_JCR_URI, "successors");
- /**
- * name of the 'jcr:isCheckedOut' property
- */
- public static final QName PROPNAME_IS_CHECKED_OUT = new QName(NamespaceRegistryImpl.NS_JCR_URI, "isCheckedOut");
- /**
- * name of the 'jcr:versionHistory' property
- */
- public static final QName PROPNAME_VERSION_HISTORY = new QName(NamespaceRegistryImpl.NS_JCR_URI, "versionHistory");
- /**
- * name of the 'jcr:baseVersion' property
- */
- public static final QName PROPNAME_BASE_VERSION = new QName(NamespaceRegistryImpl.NS_JCR_URI, "baseVersion");
- /**
- * name of the 'jcr:child' property
- */
- public static final QName PROPNAME_CHILD = new QName(NamespaceRegistryImpl.NS_JCR_URI, "child");
- /**
- * name of the 'jcr:created' property
- */
- public static final QName PROPNAME_CREATED = new QName(NamespaceRegistryImpl.NS_JCR_URI, "created");
- /**
- * the name of the 'jcr:rootVersion' node
- */
- public static final QName NODENAME_ROOTVERSION = new QName(NamespaceRegistryImpl.NS_JCR_URI, "rootVersion");
-
- /**
* returns the virtual item state provider that exposes the internal versions
* as items.
*
@@ -198,6 +135,7 @@
* Close this version manager. After having closed a persistence
* manager, further operations on this object are treated as illegal
* and throw
+ *
* @throws Exception if an error occurs
*/
public void close() throws Exception;
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionNodeState.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionNodeState.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionNodeState.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionNodeState.java Sat Feb 12 05:40:13 2005
@@ -18,8 +18,6 @@
import org.apache.jackrabbit.core.InternalValue;
import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.ItemImpl;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.core.state.NoSuchItemStateException;
import org.apache.jackrabbit.core.util.uuid.UUID;
import org.apache.jackrabbit.core.virtual.VirtualNodeState;
@@ -50,35 +48,35 @@
protected VersionNodeState(VersionItemStateProvider vm, InternalVersion v,
String parentUUID)
throws RepositoryException {
- super(vm, parentUUID, v.getId(), NodeTypeRegistry.NT_VERSION, new QName[0]);
+ super(vm, parentUUID, v.getId(), NT_VERSION, new QName[0]);
this.v = v;
// version is referenceable
- setPropertyValue(ItemImpl.PROPNAME_UUID, InternalValue.create(v.getId()));
+ setPropertyValue(JCR_UUID, InternalValue.create(v.getId()));
// add the frozen node id if not root version
if (!v.isRootVersion()) {
- addChildNodeEntry(VersionManager.NODENAME_FROZEN, v.getFrozenNode().getId());
+ addChildNodeEntry(JCR_FROZENNODE, v.getFrozenNode().getId());
}
}
/**
- * @see VirtualNodeState#getProperty(org.apache.jackrabbit.core.QName)
+ * @see VirtualNodeState#getProperty(QName)
*/
public VirtualPropertyState getProperty(QName name)
throws NoSuchItemStateException {
VirtualPropertyState state = super.getProperty(name);
if (state != null) {
- if (name.equals(VersionManager.PROPNAME_VERSION_LABELS)) {
+ if (name.equals(JCR_VERSIONLABELS)) {
state.setValues(InternalValue.create(v.getLabels()));
- } else if (name.equals(VersionManager.PROPNAME_PREDECESSORS)) {
+ } else if (name.equals(JCR_PREDECESSORS)) {
InternalVersion[] preds = v.getPredecessors();
InternalValue[] predV = new InternalValue[preds.length];
for (int i = 0; i < preds.length; i++) {
predV[i] = InternalValue.create(new UUID(preds[i].getId()));
}
state.setValues(predV);
- } else if (name.equals(VersionManager.PROPNAME_SUCCESSORS)) {
+ } else if (name.equals(JCR_SUCCESSORS)) {
InternalVersion[] succs = v.getSuccessors();
InternalValue[] succV = new InternalValue[succs.length];
for (int i = 0; i < succs.length; i++) {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenNodeImpl.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenNodeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenNodeImpl.java Sat Feb 12 05:40:13 2005
@@ -16,29 +16,32 @@
*/
package org.apache.jackrabbit.core.version.persistence;
-import org.apache.jackrabbit.core.version.*;
import org.apache.jackrabbit.core.*;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
+import org.apache.jackrabbit.core.state.ItemStateException;
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.state.ItemStateException;
+import org.apache.jackrabbit.core.version.InternalFreeze;
+import org.apache.jackrabbit.core.version.InternalFrozenNode;
+import org.apache.jackrabbit.core.version.InternalVersionItem;
+import org.apache.jackrabbit.core.version.PersistentVersionManager;
-import javax.jcr.RepositoryException;
-import javax.jcr.PropertyType;
-import javax.jcr.PropertyIterator;
import javax.jcr.NodeIterator;
+import javax.jcr.PropertyIterator;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.NodeType;
import javax.jcr.version.OnParentVersionAction;
import javax.jcr.version.VersionException;
-import javax.jcr.nodetype.NodeType;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
/**
*
*/
-class InternalFrozenNodeImpl extends InternalFreezeImpl implements InternalFrozenNode {
+class InternalFrozenNodeImpl extends InternalFreezeImpl
+ implements InternalFrozenNode, Constants {
/**
* the underlaying persistance node
@@ -77,9 +80,9 @@
* @throws javax.jcr.RepositoryException
*/
protected InternalFrozenNodeImpl(PersistentVersionManager vMgr,
- PersistentNode node,
- String id,
- InternalVersionItem parent) throws RepositoryException {
+ PersistentNode node,
+ String id,
+ InternalVersionItem parent) throws RepositoryException {
super(vMgr, parent);
this.node = node;
this.id = id;
@@ -95,15 +98,15 @@
for (int i = 0; i < props.length; i++) {
PropertyState prop = props[i];
- if (prop.getName().equals(VersionManager.PROPNAME_FROZEN_UUID)) {
+ if (prop.getName().equals(JCR_FROZENUUID)) {
// special property
- frozenUUID = node.getPropertyValue(VersionManager.PROPNAME_FROZEN_UUID).internalValue().toString();
- } else if (prop.getName().equals(VersionManager.PROPNAME_FROZEN_PRIMARY_TYPE)) {
+ frozenUUID = node.getPropertyValue(JCR_FROZENUUID).internalValue().toString();
+ } else if (prop.getName().equals(JCR_FROZENPRIMARYTYPE)) {
// special property
- frozenPrimaryType = (QName) node.getPropertyValue(VersionManager.PROPNAME_FROZEN_PRIMARY_TYPE).internalValue();
- } else if (prop.getName().equals(VersionManager.PROPNAME_FROZEN_MIXIN_TYPES)) {
+ frozenPrimaryType = (QName) node.getPropertyValue(JCR_FROZENPRIMARYTYPE).internalValue();
+ } else if (prop.getName().equals(JCR_FROZENMIXINTYPES)) {
// special property
- InternalValue[] values = node.getPropertyValues(VersionManager.PROPNAME_FROZEN_MIXIN_TYPES);
+ InternalValue[] values = node.getPropertyValues(JCR_FROZENMIXINTYPES);
if (values == null) {
frozenMixinTypes = new QName[0];
} else {
@@ -112,9 +115,9 @@
frozenMixinTypes[j] = (QName) values[j].internalValue();
}
}
- } else if (prop.getName().equals(ItemImpl.PROPNAME_PRIMARYTYPE)) {
+ } else if (prop.getName().equals(JCR_PRIMARYTYPE)) {
// ignore
- } else if (prop.getName().equals(ItemImpl.PROPNAME_UUID)) {
+ } else if (prop.getName().equals(JCR_UUID)) {
// ignore
} else {
propList.add(prop);
@@ -134,9 +137,9 @@
PersistentNode[] childNodes = node.getChildNodes();
frozenChildNodes = new InternalFreeze[childNodes.length];
for (int i = 0; i < childNodes.length; i++) {
- if (childNodes[i].hasProperty(VersionManager.PROPNAME_FROZEN_PRIMARY_TYPE)) {
+ if (childNodes[i].hasProperty(JCR_FROZEN_PRIMARY_TYPE)) {
frozenChildNodes[i] = new InternalFrozenNode(this, childNodes[i]);
- } else if (childNodes[i].hasProperty(VersionManager.PROPNAME_VERSION_HISTORY)) {
+ } else if (childNodes[i].hasProperty(JCR_VERSION_HISTORY)) {
frozenChildNodes[i] = new InternalFrozenVersionHistory(this, childNodes[i]);
} else {
// unkown ?
@@ -173,7 +176,7 @@
List entries = node.getState().getChildNodeEntries();
InternalFreeze[] freezes = new InternalFreeze[entries.size()];
Iterator iter = entries.iterator();
- int i=0;
+ int i = 0;
while (iter.hasNext()) {
NodeState.ChildNodeEntry entry = (NodeState.ChildNodeEntry) iter.next();
freezes[i++] = (InternalFreeze) getVersionManager().getItemByInternal(entry.getUUID());
@@ -244,20 +247,20 @@
node = parent.addNode(name, NativePVM.NT_REP_FROZEN);
// initialize the internal properties
- if (src.isNodeType(NodeTypeRegistry.MIX_REFERENCEABLE)) {
- node.setPropertyValue(VersionManager.PROPNAME_FROZEN_UUID, InternalValue.create(src.getUUID()));
+ if (src.isNodeType(MIX_REFERENCEABLE)) {
+ node.setPropertyValue(JCR_FROZENUUID, InternalValue.create(src.getUUID()));
}
- node.setPropertyValue(VersionManager.PROPNAME_FROZEN_PRIMARY_TYPE,
+ node.setPropertyValue(JCR_FROZENPRIMARYTYPE,
InternalValue.create(((NodeTypeImpl) src.getPrimaryNodeType()).getQName()));
- if (src.hasProperty(NodeImpl.PROPNAME_MIXINTYPES)) {
+ if (src.hasProperty(NodeImpl.JCR_MIXINTYPES)) {
NodeType[] mixins = src.getMixinNodeTypes();
InternalValue[] ivalues = new InternalValue[mixins.length];
for (int i = 0; i < mixins.length; i++) {
ivalues[i] = InternalValue.create(((NodeTypeImpl) mixins[i]).getQName());
}
- node.setPropertyValues(VersionManager.PROPNAME_FROZEN_MIXIN_TYPES, PropertyType.NAME, ivalues);
+ node.setPropertyValues(JCR_FROZENMIXINTYPES, PropertyType.NAME, ivalues);
}
if (!initOnly) {
@@ -295,12 +298,12 @@
case OnParentVersionAction.INITIALIZE:
break;
case OnParentVersionAction.VERSION:
- if (child.isNodeType(NodeTypeRegistry.MIX_VERSIONABLE)) {
+ if (child.isNodeType(MIX_VERSIONABLE)) {
// create frozen versionable child
PersistentNode newChild = node.addNode(child.getQName(), NativePVM.NT_REP_FROZEN_HISTORY);
- newChild.setPropertyValue(VersionManager.PROPNAME_VERSION_HISTORY,
+ newChild.setPropertyValue(JCR_VERSIONHISTORY,
InternalValue.create(child.getVersionHistory().getUUID()));
- newChild.setPropertyValue(VersionManager.PROPNAME_BASE_VERSION,
+ newChild.setPropertyValue(JCR_BASEVERSION,
InternalValue.create(child.getBaseVersion().getUUID()));
break;
}
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenVHImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenVHImpl.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenVHImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalFrozenVHImpl.java Sat Feb 12 05:40:13 2005
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.core.version.persistence;
+import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.version.*;
@@ -63,14 +64,14 @@
}
/**
- * @see org.apache.jackrabbit.core.version.InternalFrozenVersionHistory#getVersionHistoryId()
+ * @see InternalFrozenVersionHistory#getVersionHistoryId()
*/
public String getVersionHistoryId() {
- return (String) node.getPropertyValue(VersionManager.PROPNAME_VERSION_HISTORY).internalValue();
+ return (String) node.getPropertyValue(Constants.JCR_VERSIONHISTORY).internalValue();
}
/**
- * @see org.apache.jackrabbit.core.version.InternalFrozenVersionHistory#getVersionHistory()
+ * @see InternalFrozenVersionHistory#getVersionHistory()
*/
public InternalVersionHistory getVersionHistory()
throws VersionException {
@@ -82,14 +83,14 @@
}
/**
- * @see org.apache.jackrabbit.core.version.InternalFrozenVersionHistory#getBaseVersionId()
+ * @see InternalFrozenVersionHistory#getBaseVersionId()
*/
public String getBaseVersionId() {
- return (String) node.getPropertyValue(VersionManager.PROPNAME_BASE_VERSION).internalValue();
+ return (String) node.getPropertyValue(Constants.JCR_BASEVERSION).internalValue();
}
/**
- * @see org.apache.jackrabbit.core.version.InternalFrozenVersionHistory#getBaseVesion()
+ * @see InternalFrozenVersionHistory#getBaseVesion()
*/
public InternalVersion getBaseVesion()
throws VersionException {
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionHistoryImpl.java Sat Feb 12 05:40:13 2005
@@ -16,15 +16,14 @@
*/
package org.apache.jackrabbit.core.version.persistence;
-import org.apache.jackrabbit.core.InternalValue;
-import org.apache.jackrabbit.core.NamespaceRegistryImpl;
-import org.apache.jackrabbit.core.NodeImpl;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.state.UpdatableItemStateManager;
+import org.apache.jackrabbit.core.*;
import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.state.UpdatableItemStateManager;
import org.apache.jackrabbit.core.util.uuid.UUID;
-import org.apache.jackrabbit.core.version.*;
+import org.apache.jackrabbit.core.version.InternalVersion;
+import org.apache.jackrabbit.core.version.InternalVersionHistory;
+import org.apache.jackrabbit.core.version.InternalVersionItem;
+import org.apache.jackrabbit.core.version.PersistentVersionManager;
import org.apache.log4j.Logger;
import javax.jcr.PropertyType;
@@ -38,7 +37,8 @@
/**
*
*/
-class InternalVersionHistoryImpl extends InternalVersionItemImpl implements InternalVersionHistory {
+class InternalVersionHistoryImpl extends InternalVersionItemImpl
+ implements InternalVersionHistory, Constants {
/**
* default logger
*/
@@ -302,7 +302,7 @@
try {
UpdatableItemStateManager stateMgr = getVersionManager().getItemStateMgr();
stateMgr.edit();
- PersistentNode lNode = labelNode.addNode(label, NodeTypeRegistry.NT_UNSTRUCTURED);
+ PersistentNode lNode = labelNode.addNode(label, NT_UNSTRUCTURED);
lNode.setPropertyValue(NativePVM.PROPNAME_NAME, InternalValue.create(label));
lNode.setPropertyValue(NativePVM.PROPNAME_VERSION, InternalValue.create(version.getId()));
labelNode.store();
@@ -355,7 +355,7 @@
throws RepositoryException {
// copy predecessors from src node
- Value[] preds = src.getProperty(VersionManager.PROPNAME_PREDECESSORS).getValues();
+ Value[] preds = src.getProperty(JCR_PREDECESSORS).getValues();
InternalValue[] predecessors = new InternalValue[preds.length];
for (int i = 0; i < preds.length; i++) {
String predId = preds[i].getString();
@@ -367,17 +367,17 @@
}
String versionId = UUID.randomUUID().toString();
- QName nodeName = new QName(NamespaceRegistryImpl.NS_DEFAULT_URI, versionId);
+ QName nodeName = new QName(NS_DEFAULT_URI, versionId);
PersistentNode vNode = node.addNode(nodeName, NativePVM.NT_REP_VERSION);
vNode.setPropertyValue(NativePVM.PROPNAME_VERSION_ID, InternalValue.create(versionId));
vNode.setPropertyValue(NativePVM.PROPNAME_VERSION_NAME, InternalValue.create(name));
// initialize 'created' and 'predecessors'
- vNode.setPropertyValue(VersionManager.PROPNAME_CREATED, InternalValue.create(Calendar.getInstance()));
- vNode.setPropertyValues(VersionManager.PROPNAME_PREDECESSORS, PropertyType.STRING, predecessors);
+ vNode.setPropertyValue(JCR_CREATED, InternalValue.create(Calendar.getInstance()));
+ vNode.setPropertyValues(JCR_PREDECESSORS, PropertyType.STRING, predecessors);
// checkin source node
- InternalFrozenNodeImpl.checkin(vNode, VersionManager.NODENAME_FROZEN, src, false, false);
+ InternalFrozenNodeImpl.checkin(vNode, JCR_FROZENNODE, src, false, false);
// and store
node.store();
@@ -452,22 +452,22 @@
pNode.setPropertyValue(NativePVM.PROPNAME_VERSIONABLE_ID, InternalValue.create(src.internalGetUUID()));
// create label node
- pNode.addNode(NativePVM.NODENAME_VERSION_LABELS, NodeTypeRegistry.NT_UNSTRUCTURED);
+ pNode.addNode(NativePVM.NODENAME_VERSION_LABELS, NT_UNSTRUCTURED);
// create root version
String versionId = UUID.randomUUID().toString();
- QName nodeName = new QName(NamespaceRegistryImpl.NS_DEFAULT_URI, versionId);
+ QName nodeName = new QName(NS_DEFAULT_URI, versionId);
PersistentNode vNode = pNode.addNode(nodeName, NativePVM.NT_REP_VERSION);
vNode.setPropertyValue(NativePVM.PROPNAME_VERSION_ID, InternalValue.create(versionId));
- vNode.setPropertyValue(NativePVM.PROPNAME_VERSION_NAME, InternalValue.create(VersionManager.NODENAME_ROOTVERSION));
+ vNode.setPropertyValue(NativePVM.PROPNAME_VERSION_NAME, InternalValue.create(JCR_ROOTVERSION));
// initialize 'created' and 'predecessors'
- vNode.setPropertyValue(VersionManager.PROPNAME_CREATED, InternalValue.create(Calendar.getInstance()));
- vNode.setPropertyValues(VersionManager.PROPNAME_PREDECESSORS, PropertyType.REFERENCE, new InternalValue[0]);
+ vNode.setPropertyValue(JCR_CREATED, InternalValue.create(Calendar.getInstance()));
+ vNode.setPropertyValues(JCR_PREDECESSORS, PropertyType.REFERENCE, new InternalValue[0]);
// add also an empty frozen node to the root version
- InternalFrozenNodeImpl.checkin(vNode, VersionManager.NODENAME_FROZEN, src, true, false);
+ InternalFrozenNodeImpl.checkin(vNode, JCR_FROZENNODE, src, true, false);
parent.store();
return new InternalVersionHistoryImpl(vMgr, pNode);
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionImpl.java?view=diff&r1=153502&r2=153503
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/InternalVersionImpl.java Sat Feb 12 05:40:13 2005
@@ -16,11 +16,15 @@
*/
package org.apache.jackrabbit.core.version.persistence;
+import org.apache.jackrabbit.core.Constants;
import org.apache.jackrabbit.core.InternalValue;
import org.apache.jackrabbit.core.QName;
import org.apache.jackrabbit.core.state.NodeState;
import org.apache.jackrabbit.core.util.uuid.UUID;
-import org.apache.jackrabbit.core.version.*;
+import org.apache.jackrabbit.core.version.InternalFrozenNode;
+import org.apache.jackrabbit.core.version.InternalVersion;
+import org.apache.jackrabbit.core.version.InternalVersionHistory;
+import org.apache.jackrabbit.core.version.InternalVersionItem;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -32,7 +36,8 @@
/**
*
*/
-class InternalVersionImpl extends InternalVersionItemImpl implements InternalVersion {
+class InternalVersionImpl extends InternalVersionItemImpl
+ implements InternalVersion, Constants {
/**
* the list/cache of predecessors (values == InternalVersion)
@@ -95,7 +100,7 @@
versionId = (String) node.getPropertyValue(NativePVM.PROPNAME_VERSION_ID).internalValue();
// init internal values
- InternalValue[] values = node.getPropertyValues(VersionManager.PROPNAME_CREATED);
+ InternalValue[] values = node.getPropertyValues(JCR_CREATED);
if (values != null) {
created = (Calendar) values[0].internalValue();
}
@@ -105,7 +110,7 @@
} else {
name = null; // ????
}
- isRoot = name.equals(VersionManager.NODENAME_ROOTVERSION);
+ isRoot = name.equals(JCR_ROOTVERSION);
}
public String getId() {
@@ -141,7 +146,7 @@
public InternalFrozenNode getFrozenNode() {
// get frozen node
try {
- NodeState.ChildNodeEntry entry = node.getState().getChildNodeEntry(VersionManager.NODENAME_FROZEN, 1);
+ NodeState.ChildNodeEntry entry = node.getState().getChildNodeEntry(JCR_FROZENNODE, 1);
if (entry == null) {
throw new InternalError("version has no frozen node: " + getId());
}
@@ -165,7 +170,7 @@
* successor list.
*/
void resolvePredecessors() {
- InternalValue[] values = node.getPropertyValues(VersionManager.PROPNAME_PREDECESSORS);
+ InternalValue[] values = node.getPropertyValues(JCR_PREDECESSORS);
if (values != null) {
for (int i = 0; i < values.length; i++) {
InternalVersionImpl v = (InternalVersionImpl) versionHistory.getVersion(values[i].internalValue().toString());
@@ -206,7 +211,7 @@
for (int i = 0; i < values.length; i++) {
values[i] = InternalValue.create(new UUID(((InternalVersion) predecessors.get(i)).getId()));
}
- node.setPropertyValues(VersionManager.PROPNAME_PREDECESSORS, PropertyType.STRING, values);
+ node.setPropertyValues(JCR_PREDECESSORS, PropertyType.STRING, values);
}
/**
@@ -221,11 +226,11 @@
succ[i].internalDetachPredecessor(this);
}
- // detach cached successors from preds
- InternalVersionImpl[] preds = (InternalVersionImpl[]) getPredecessors();
- for (int i=0; i<preds.length; i++) {
- preds[i].internalDetachSuccessor(this);
- }
+ // detach cached successors from preds
+ InternalVersionImpl[] preds = (InternalVersionImpl[]) getPredecessors();
+ for (int i = 0; i < preds.length; i++) {
+ preds[i].internalDetachSuccessor(this);
+ }
// clear properties
successors.clear();
@@ -252,7 +257,7 @@
// attach v's predecessors
predecessors.addAll(Arrays.asList(v.getPredecessors()));
storePredecessors();
- node.store();
+ node.store();
}
/**