jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r590014 [7/11] - in /jackrabbit/trunk: jackrabbit-core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jou...
Date Tue, 30 Oct 2007 10:02:57 GMT
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java Tue Oct 30 03:02:41 2007
@@ -20,10 +20,8 @@
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.security.AccessManager;
-import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.NoPrefixDeclaredException;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameFormat;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 import org.apache.lucene.search.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +30,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
+import javax.jcr.NamespaceException;
 import javax.jcr.query.QueryResult;
 import javax.jcr.query.RowIterator;
 import java.io.IOException;
@@ -60,9 +59,9 @@
     private final ItemManager itemMgr;
 
     /**
-     * The namespace resolver of the session executing the query
+     * The name and path resolver of the session executing the query
      */
-    protected final NamespaceResolver resolver;
+    protected final NamePathResolver resolver;
 
     /**
      * The access manager of the session that executes the query.
@@ -87,12 +86,12 @@
     /**
      * The select properties
      */
-    protected final QName[] selectProps;
+    protected final Name[] selectProps;
 
     /**
      * The names of properties to use for ordering the result set.
      */
-    protected final QName[] orderProps;
+    protected final Name[] orderProps;
 
     /**
      * The order specifier for each of the order properties.
@@ -165,13 +164,13 @@
      */
     public QueryResultImpl(SearchIndex index,
                            ItemManager itemMgr,
-                           NamespaceResolver resolver,
+                           NamePathResolver resolver,
                            AccessManager accessMgr,
                            AbstractQueryImpl queryImpl,
                            Query query,
                            SpellSuggestion spellSuggestion,
-                           QName[] selectProps,
-                           QName[] orderProps,
+                           Name[] selectProps,
+                           Name[] orderProps,
                            boolean[] orderSpecs,
                            boolean documentOrder,
                            long offset,
@@ -200,14 +199,13 @@
         try {
             String[] propNames = new String[selectProps.length];
             for (int i = 0; i < selectProps.length; i++) {
-                propNames[i] = NameFormat.format(selectProps[i], resolver);
+                propNames[i] = resolver.getJCRName(selectProps[i]);
             }
             return propNames;
-        } catch (NoPrefixDeclaredException npde) {
+        } catch (NamespaceException npde) {
             String msg = "encountered invalid property name";
             log.debug(msg);
             throw new RepositoryException(msg, npde);
-
         }
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java Tue Oct 30 03:02:41 2007
@@ -19,11 +19,11 @@
 import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.PropertyImpl;
 import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.name.NameException;
-import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameFormat;
-import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.conversion.NameException;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.name.NameConstants;
+import org.apache.jackrabbit.name.NameFactoryImpl;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 import org.apache.jackrabbit.value.ValueFactoryImpl;
 import org.apache.jackrabbit.util.ISO9075;
 import org.slf4j.LoggerFactory;
@@ -35,6 +35,7 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 import javax.jcr.PathNotFoundException;
+import javax.jcr.NamespaceException;
 import javax.jcr.ValueFactory;
 import javax.jcr.query.Row;
 import javax.jcr.query.RowIterator;
@@ -72,10 +73,10 @@
     private static final String SPELLCHECK_FUNC_LPAR = "spellcheck(";
 
     /**
-     * The start QName for the rep:excerpt function: rep:excerpt(
+     * The start Name for the rep:excerpt function: rep:excerpt(
      */
-    private static final QName REP_EXCERPT_LPAR = new QName(
-            QName.NS_REP_URI, EXCERPT_FUNC_LPAR);
+    private static final Name REP_EXCERPT_LPAR = NameFactoryImpl.getInstance().create(
+            Name.NS_REP_URI, EXCERPT_FUNC_LPAR);
 
     /**
      * Iterator over nodes, that constitute the result set.
@@ -85,12 +86,12 @@
     /**
      * Array of select property names
      */
-    private final QName[] properties;
+    private final Name[] properties;
 
     /**
-     * The <code>NamespaceResolver</code> of the user <code>Session</code>.
+     * The <code>NamePathResolver</code> of the user <code>Session</code>.
      */
-    private final NamespaceResolver resolver;
+    private final NamePathResolver resolver;
 
     /**
      * The excerpt provider or <code>null</code> if none is available.
@@ -108,11 +109,10 @@
      *
      * @param nodes      a <code>ScoreNodeIterator</code> that contains the nodes of
      *                   the query result.
-     * @param properties <code>QName</code> of the select properties.
+     * @param properties <code>Name</code> of the select properties.
      * @param resolver   <code>NamespaceResolver</code> of the user
-     *                   <code>Session</code>.
      */
-    RowIteratorImpl(ScoreNodeIterator nodes, QName[] properties, NamespaceResolver resolver) {
+    RowIteratorImpl(ScoreNodeIterator nodes, Name[] properties, NamePathResolver resolver) {
         this(nodes, properties, resolver, null, null);
     }
 
@@ -122,7 +122,7 @@
      *
      * @param nodes           a <code>ScoreNodeIterator</code> that contains the
      *                        nodes of the query result.
-     * @param properties      <code>QName</code> of the select properties.
+     * @param properties      <code>Name</code> of the select properties.
      * @param resolver        <code>NamespaceResolver</code> of the user
      *                        <code>Session</code>.
      * @param exProvider      the excerpt provider associated with the query
@@ -131,8 +131,8 @@
      *                        result or <code>null</code> if none is available.
      */
     RowIteratorImpl(ScoreNodeIterator nodes,
-                    QName[] properties,
-                    NamespaceResolver resolver,
+                    Name[] properties,
+                    NamePathResolver resolver,
                     ExcerptProvider exProvider,
                     SpellSuggestion spellSuggestion) {
         this.nodes = nodes;
@@ -239,7 +239,7 @@
         private Value[] values;
 
         /**
-         * Set of select property <code>QName</code>s.
+         * Set of select property <code>Name</code>s.
          */
         private Set propertySet;
 
@@ -282,9 +282,9 @@
                     } else {
                         // property not set or one of the following:
                         // jcr:path / jcr:score / rep:excerpt / rep:spellcheck
-                        if (QName.JCR_PATH.equals(properties[i])) {
+                        if (NameConstants.JCR_PATH.equals(properties[i])) {
                             tmp[i] = VALUE_FACTORY.createValue(node.getPath(), PropertyType.PATH);
-                        } else if (QName.JCR_SCORE.equals(properties[i])) {
+                        } else if (NameConstants.JCR_SCORE.equals(properties[i])) {
                             tmp[i] = VALUE_FACTORY.createValue(Math.round(score * 1000f));
                         } else if (isExcerptFunction(properties[i])) {
                             tmp[i] = getExcerpt();
@@ -323,7 +323,7 @@
                 propertySet = tmp;
             }
             try {
-                QName prop = NameFormat.parse(propertyName, resolver);
+                Name prop = resolver.getQName(propertyName);
                 if (!propertySet.contains(prop)) {
                     if (isExcerptFunction(propertyName)) {
                         // excerpt function with parameter
@@ -342,9 +342,9 @@
                 } else {
                     // either jcr:score, jcr:path, rep:excerpt,
                     // rep:spellcheck or not set
-                    if (QName.JCR_PATH.equals(prop)) {
+                    if (NameConstants.JCR_PATH.equals(prop)) {
                         return VALUE_FACTORY.createValue(node.getPath(), PropertyType.PATH);
-                    } else if (QName.JCR_SCORE.equals(prop)) {
+                    } else if (NameConstants.JCR_SCORE.equals(prop)) {
                         return VALUE_FACTORY.createValue(Math.round(score * 1000f));
                     } else if (isExcerptFunction(prop)) {
                         return getExcerpt();
@@ -365,12 +365,12 @@
         }
 
         /**
-         * @param name a QName.
+         * @param name a Name.
          * @return <code>true</code> if <code>name</code> is the rep:excerpt
          *         function, <code>false</code> otherwise.
          */
-        private boolean isExcerptFunction(QName name) {
-            return name.getNamespaceURI().equals(QName.NS_REP_URI) &&
+        private boolean isExcerptFunction(Name name) {
+            return name.getNamespaceURI().equals(Name.NS_REP_URI) &&
                     name.getLocalName().startsWith(EXCERPT_FUNC_LPAR);
         }
 
@@ -382,8 +382,8 @@
         private boolean isExcerptFunction(String name) {
             try {
                 return name.startsWith(
-                        NameFormat.format(REP_EXCERPT_LPAR, resolver));
-            } catch (NoPrefixDeclaredException e) {
+                        resolver.getJCRName(REP_EXCERPT_LPAR));
+            } catch (NamespaceException e) {
                 // will never happen
                 return false;
             }
@@ -482,12 +482,12 @@
         }
 
         /**
-         * @param name a QName.
+         * @param name a Name.
          * @return <code>true</code> if <code>name</code> is the rep:spellcheck
          *         function, <code>false</code> otherwise.
          */
-        private boolean isSpellCheckFunction(QName name) {
-            return name.getNamespaceURI().equals(QName.NS_REP_URI) &&
+        private boolean isSpellCheckFunction(Name name) {
+            return name.getNamespaceURI().equals(Name.NS_REP_URI) &&
                     name.getLocalName().startsWith(SPELLCHECK_FUNC_LPAR);
         }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Tue Oct 30 03:02:41 2007
@@ -32,9 +32,9 @@
 import org.apache.jackrabbit.core.state.ItemStateManager;
 import org.apache.jackrabbit.extractor.DefaultTextExtractor;
 import org.apache.jackrabbit.extractor.TextExtractor;
-import org.apache.jackrabbit.name.NoPrefixDeclaredException;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameFormat;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.name.NameConstants;
 import org.apache.jackrabbit.uuid.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,6 +55,7 @@
 import org.w3c.dom.Element;
 
 import javax.jcr.RepositoryException;
+import javax.jcr.NamespaceException;
 import javax.jcr.query.InvalidQueryException;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.DocumentBuilder;
@@ -78,21 +79,21 @@
 public class SearchIndex extends AbstractQueryHandler {
 
     public static final List VALID_SYSTEM_INDEX_NODE_TYPE_NAMES
-        = Collections.unmodifiableList(Arrays.asList(new QName[]{
-            QName.NT_CHILDNODEDEFINITION,
-            QName.NT_FROZENNODE,
-            QName.NT_NODETYPE,
-            QName.NT_PROPERTYDEFINITION,
-            QName.NT_VERSION,
-            QName.NT_VERSIONEDCHILD,
-            QName.NT_VERSIONHISTORY,
-            QName.NT_VERSIONLABELS,
-            QName.REP_NODETYPES,
-            QName.REP_SYSTEM,
-            QName.REP_VERSIONSTORAGE,
+        = Collections.unmodifiableList(Arrays.asList(new Name[]{
+            NameConstants.NT_CHILDNODEDEFINITION,
+            NameConstants.NT_FROZENNODE,
+            NameConstants.NT_NODETYPE,
+            NameConstants.NT_PROPERTYDEFINITION,
+            NameConstants.NT_VERSION,
+            NameConstants.NT_VERSIONEDCHILD,
+            NameConstants.NT_VERSIONHISTORY,
+            NameConstants.NT_VERSIONLABELS,
+            NameConstants.REP_NODETYPES,
+            NameConstants.REP_SYSTEM,
+            NameConstants.REP_VERSIONSTORAGE,
             // Supertypes
-            QName.NT_BASE,
-            QName.MIX_REFERENCEABLE
+            NameConstants.NT_BASE,
+            NameConstants.MIX_REFERENCEABLE
         }));
 
     private static final DefaultQueryNodeFactory DEFAULT_QUERY_NODE_FACTORY = new DefaultQueryNodeFactory(
@@ -172,6 +173,11 @@
     private NamespaceMappings nsMappings;
 
     /**
+     * The name and path resolver used internally.
+     */
+    private NamePathResolver npResolver;
+
+    /**
      * The location of the search index.
      * <p/>
      * Note: This is a <b>mandatory</b> parameter!
@@ -394,7 +400,8 @@
                         context.getNamespaceRegistry());
             }
         }
-        
+        npResolver = NamePathResolverImpl.create(nsMappings);
+
         indexingConfig = createIndexingConfiguration(nsMappings);
         analyzer.setIndexingConfig(indexingConfig);
         
@@ -617,7 +624,7 @@
      */
     public QueryHits executeQuery(AbstractQueryImpl queryImpl,
                                   Query query,
-                                  QName[] orderProps,
+                                  Name[] orderProps,
                                   boolean[] orderSpecs) throws IOException {
         checkOpen();
         SortField[] sortFields = createSortFields(orderProps, orderSpecs);
@@ -785,12 +792,12 @@
      * @param orderSpecs the order specs for the properties.
      * @return an array of sort fields
      */
-    protected SortField[] createSortFields(QName[] orderProps,
+    protected SortField[] createSortFields(Name[] orderProps,
                                            boolean[] orderSpecs) {
         List sortFields = new ArrayList();
         for (int i = 0; i < orderProps.length; i++) {
             String prop = null;
-            if (QName.JCR_SCORE.equals(orderProps[i])) {
+            if (NameConstants.JCR_SCORE.equals(orderProps[i])) {
                 // order on jcr:score does not use the natural order as
                 // implemented in lucene. score ascending in lucene means that
                 // higher scores are first. JCR specs that lower score values
@@ -798,8 +805,8 @@
                 sortFields.add(new SortField(null, SortField.SCORE, orderSpecs[i]));
             } else {
                 try {
-                    prop = NameFormat.format(orderProps[i], getNamespaceMappings());
-                } catch (NoPrefixDeclaredException e) {
+                    prop = npResolver.getJCRName(orderProps[i]);
+                } catch (NamespaceException e) {
                     // will never happen
                 }
                 sortFields.add(new SortField(prop, SharedFieldSortComparator.PROPERTIES, !orderSpecs[i]));

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SimpleExcerptProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SimpleExcerptProvider.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SimpleExcerptProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SimpleExcerptProvider.java Tue Oct 30 03:02:41 2007
@@ -24,7 +24,7 @@
 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.name.QName;
+import org.apache.jackrabbit.spi.Name;
 
 import javax.jcr.PropertyType;
 import java.io.IOException;
@@ -62,7 +62,7 @@
             String separator = "";
             for (Iterator it = nodeState.getPropertyNames().iterator();
                  it.hasNext() && text.length() < maxFragmentSize; ) {
-                PropertyId propId = new PropertyId(id, (QName) it.next());
+                PropertyId propId = new PropertyId(id, (Name) it.next());
                 PropertyState propState = (PropertyState) ism.getItemState(propId);
                 if (propState.getType() == PropertyType.STRING) {
                     text.append(separator);

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java Tue Oct 30 03:02:41 2007
@@ -18,10 +18,8 @@
 
 import org.apache.commons.collections.iterators.IteratorChain;
 import org.apache.jackrabbit.core.NodeImpl;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.NoPrefixDeclaredException;
-import org.apache.jackrabbit.name.NameFormat;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import javax.jcr.query.QueryResult;
 import javax.jcr.query.RowIterator;
@@ -29,6 +27,7 @@
 import javax.jcr.NodeIterator;
 import javax.jcr.Session;
 import javax.jcr.Node;
+import javax.jcr.NamespaceException;
 import java.util.Iterator;
 import java.util.Arrays;
 import java.util.ArrayList;
@@ -49,12 +48,12 @@
     /**
      * The select properties.
      */
-    private final QName[] properties;
+    private final Name[] properties;
 
     /**
      * The namespace resolver of the session.
      */
-    private final NamespaceResolver resolver;
+    private final NamePathResolver resolver;
 
     /**
      * Creates a new <code>WorkspaceTraversalResult</code>.
@@ -64,8 +63,8 @@
      * @param resolver   the namespace resolver of the session.
      */
     public WorkspaceTraversalResult(Session session,
-                             QName[] properties,
-                             NamespaceResolver resolver) {
+                             Name[] properties,
+                             NamePathResolver resolver) {
         this.session = session;
         this.properties = properties;
         this.resolver = resolver;
@@ -78,12 +77,12 @@
         try {
             String[] propNames = new String[properties.length];
             for (int i = 0; i < properties.length; i++) {
-                propNames[i] = NameFormat.format(properties[i], resolver);
+                propNames[i] = resolver.getJCRName(properties[i]);
             }
             return propNames;
-        } catch (NoPrefixDeclaredException npde) {
+        } catch (NamespaceException e) {
             String msg = "encountered invalid property name";
-            throw new RepositoryException(msg, npde);
+            throw new RepositoryException(msg, e);
 
         }
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java Tue Oct 30 03:02:41 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
 
 import javax.jcr.NamespaceException;
 
@@ -52,7 +52,7 @@
      * @return the prefixed JCR name or <code>name.toString()</code> if an
      *         unknown namespace URI is encountered.
      */
-    protected String getJCRName(QName name) {
+    protected String getJCRName(Name name) {
         if (name == null) {
             return null;
         }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.And;
 import org.apache.jackrabbit.core.query.jsr283.qom.Constraint;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.BindVariableValue;
 
@@ -31,9 +31,9 @@
     /**
      * The name of the bind variable.
      */
-    private final QName variableName;
+    private final Name variableName;
 
-    BindVariableValueImpl(NamePathResolver resolver, QName variableName) {
+    BindVariableValueImpl(NamePathResolver resolver, Name variableName) {
         super(resolver);
         this.variableName = variableName;
     }
@@ -43,7 +43,7 @@
      *
      * @return the bind variable name; non-null
      */
-    public QName getBindVariableQName() {
+    public Name getBindVariableQName() {
         return variableName;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java Tue Oct 30 03:02:41 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.Path;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.ChildNode;
 
@@ -30,14 +30,14 @@
     /**
      * The name of a selector.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * An absolute path.
      */
     private final Path path;
 
-    ChildNodeImpl(NamePathResolver resolver, QName selectorName, Path path) {
+    ChildNodeImpl(NamePathResolver resolver, Name selectorName, Path path) {
         super(resolver);
         this.selectorName = selectorName;
         this.path = path;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.ChildNodeJoinCondition;
 
@@ -31,16 +31,16 @@
     /**
      * The name of the child selector.
      */
-    private final QName childSelectorName;
+    private final Name childSelectorName;
 
     /**
      * The name of the parent selector.
      */
-    private final QName parentSelectorName;
+    private final Name parentSelectorName;
 
     ChildNodeJoinConditionImpl(NamePathResolver resolver,
-                               QName childSelectorName,
-                               QName parentSelectorName) {
+                               Name childSelectorName,
+                               Name parentSelectorName) {
         super(resolver);
         this.childSelectorName = childSelectorName;
         this.parentSelectorName = parentSelectorName;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Column;
 
@@ -34,22 +34,22 @@
     /**
      * The name of the selector.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * The name of the property.
      */
-    private final QName propertyName;
+    private final Name propertyName;
 
     /**
      * The name of the column.
      */
-    private final QName columnName;
+    private final Name columnName;
 
     ColumnImpl(NamePathResolver resolver,
-               QName selectorName,
-               QName propertyName,
-               QName columnName) {
+               Name selectorName,
+               Name propertyName,
+               Name columnName) {
         super(resolver);
         this.selectorName = selectorName;
         this.propertyName = propertyName;
@@ -61,7 +61,7 @@
      *
      * @return the selector name; non-null
      */
-    public QName getSelectorQName() {
+    public Name getSelectorQName() {
         return selectorName;
     }
 
@@ -71,7 +71,7 @@
      * @return the property name, or null to include a column for each
      *         single-value non-residual property of the selector's node type
      */
-    public QName getPropertyQName() {
+    public Name getPropertyQName() {
         return propertyName;
     }
 
@@ -82,7 +82,7 @@
      * @return the column name; must be null if <code>getPropertyName</code> is
      *         null and non-null otherwise
      */
-    public QName getColumnQName() {
+    public Name getColumnQName() {
         return columnName;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Comparison;
 import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Constraint;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java Tue Oct 30 03:02:41 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.DescendantNode;
 
@@ -32,7 +32,7 @@
     /**
      * A selector name.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * An absolute path.
@@ -40,7 +40,7 @@
     private final Path path;
 
     DescendantNodeImpl(NamePathResolver resolver,
-                       QName selectorName,
+                       Name selectorName,
                        Path path) {
         super(resolver);
         this.selectorName = selectorName;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.DescendantNodeJoinCondition;
 
@@ -31,16 +31,16 @@
     /**
      * Name of the descendant selector.
      */
-    private final QName descendantSelectorName;
+    private final Name descendantSelectorName;
 
     /**
      * Name of the ancestor selector.
      */
-    private final QName ancestorSelectorName;
+    private final Name ancestorSelectorName;
 
     DescendantNodeJoinConditionImpl(NamePathResolver resolver,
-                                    QName descendantSelectorName,
-                                    QName ancestorSelectorName) {
+                                    Name descendantSelectorName,
+                                    Name ancestorSelectorName) {
         super(resolver);
         this.descendantSelectorName = descendantSelectorName;
         this.ancestorSelectorName = ancestorSelectorName;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.EquiJoinCondition;
 
@@ -31,28 +31,28 @@
     /**
      * Name of the first selector.
      */
-    private final QName selector1Name;
+    private final Name selector1Name;
 
     /**
      * Property name in the first selector.
      */
-    private final QName property1Name;
+    private final Name property1Name;
 
     /**
      * Name of the second selector.
      */
-    private final QName selector2Name;
+    private final Name selector2Name;
 
     /**
      * Property name in the second selector.
      */
-    private final QName property2Name;
+    private final Name property2Name;
 
     EquiJoinConditionImpl(NamePathResolver resolver,
-                          QName selector1Name,
-                          QName property1Name,
-                          QName selector2Name,
-                          QName property2Name) {
+                          Name selector1Name,
+                          Name property1Name,
+                          Name selector2Name,
+                          Name property2Name) {
         super(resolver);
         this.selector1Name = selector1Name;
         this.property1Name = property1Name;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.FullTextSearch;
 
@@ -31,12 +31,12 @@
     /**
      * Name of the selector against which to apply this constraint
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * Name of the property.
      */
-    private final QName propertyName;
+    private final Name propertyName;
 
     /**
      * Full text search expression.
@@ -44,8 +44,8 @@
     private final String fullTextSearchExpression;
 
     FullTextSearchImpl(NamePathResolver resolver,
-                       QName selectorName,
-                       QName propertyName,
+                       Name selectorName,
+                       Name propertyName,
                        String fullTextSearchExpression) {
         super(resolver);
         this.selectorName = selectorName;
@@ -58,7 +58,7 @@
      *
      * @return the selector name; non-null
      */
-    public QName getSelectorQName() {
+    public Name getSelectorQName() {
         return selectorName;
     }
 
@@ -69,7 +69,7 @@
      *         otherwise null if the full-text search scope is the node (or node
      *         subtree, in some implementations).
      */
-    public QName getPropertyQName() {
+    public Name getPropertyQName() {
         return propertyName;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.FullTextSearchScore;
 
@@ -31,9 +31,9 @@
     /**
      * Name of the selector against which to evaluate this operand.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
-    FullTextSearchScoreImpl(NamePathResolver resolver, QName selectorName) {
+    FullTextSearchScoreImpl(NamePathResolver resolver, Name selectorName) {
         super(resolver);
         this.selectorName = selectorName;
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.JoinCondition;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Join;
 import org.apache.jackrabbit.core.query.jsr283.qom.Source;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Length;
 import org.apache.jackrabbit.core.query.jsr283.qom.PropertyValue;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java Tue Oct 30 03:02:41 2007
@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.core.query.qom;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Literal;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import javax.jcr.Value;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.LowerCase;
 import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.NodeLocalName;
 
@@ -31,9 +31,9 @@
     /**
      * The name of the selector against which to evaluate this operand.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
-    NodeLocalNameImpl(NamePathResolver resolver, QName selectorName) {
+    NodeLocalNameImpl(NamePathResolver resolver, Name selectorName) {
         super(resolver);
         this.selectorName = selectorName;
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.NodeName;
 
@@ -29,9 +29,9 @@
     /**
      * The name of the selector against which to evaluate this operand.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
-    NodeNameImpl(NamePathResolver resolver, QName selectorName) {
+    NodeNameImpl(NamePathResolver resolver, Name selectorName) {
         super(resolver);
         this.selectorName = selectorName;
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Not;
 import org.apache.jackrabbit.core.query.jsr283.qom.Constraint;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Or;
 import org.apache.jackrabbit.core.query.jsr283.qom.Constraint;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Ordering;
 import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.PropertyExistence;
 
@@ -31,16 +31,16 @@
     /**
      * The name of the selector against which to apply this constraint.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * The name of the property.
      */
-    private final QName propertyName;
+    private final Name propertyName;
 
     PropertyExistenceImpl(NamePathResolver resolver,
-                          QName selectorName,
-                          QName propertyName) {
+                          Name selectorName,
+                          Name propertyName) {
         super(resolver);
         this.selectorName = selectorName;
         this.propertyName = propertyName;
@@ -51,7 +51,7 @@
      *
      * @return the selector name; non-null
      */
-    public QName getSelectorQName() {
+    public Name getSelectorQName() {
         return selectorName;
     }
 
@@ -60,7 +60,7 @@
      *
      * @return the property name; non-null
      */
-    public QName getPropertyQName() {
+    public Name getPropertyQName() {
         return propertyName;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.PropertyValue;
 
@@ -31,16 +31,16 @@
     /**
      * The name of the selector against which to apply this constraint.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * The name of the property.
      */
-    private final QName propertyName;
+    private final Name propertyName;
 
     PropertyValueImpl(NamePathResolver resolver,
-                      QName selectorName,
-                      QName propertyName) {
+                      Name selectorName,
+                      Name propertyName) {
         super(resolver);
         this.selectorName = selectorName;
         this.propertyName = propertyName;
@@ -51,7 +51,7 @@
      *
      * @return the selector name; non-null
      */
-    public QName getSelectorQName() {
+    public Name getSelectorQName() {
         return selectorName;
     }
 
@@ -60,7 +60,7 @@
      *
      * @return the property name; non-null
      */
-    public QName getPropertyQName() {
+    public Name getPropertyQName() {
         return propertyName;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java Tue Oct 30 03:02:41 2007
@@ -16,10 +16,10 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameException;
-import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NameException;
+import org.apache.jackrabbit.spi.Path;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModelFactory;
 import org.apache.jackrabbit.core.query.jsr283.qom.QueryObjectModel;
@@ -213,7 +213,7 @@
      */
     public Selector selector(String nodeTypeName)                                 // CM
             throws InvalidQueryException, RepositoryException {
-        QName ntName = checkNodeTypeName(nodeTypeName);
+        Name ntName = checkNodeTypeName(nodeTypeName);
         return new SelectorImpl(resolver, ntName, ntName);
     }
 
@@ -533,7 +533,7 @@
                                          String fullTextSearchExpression)
             throws InvalidQueryException, RepositoryException                          // CM
     {
-        QName propName = null;
+        Name propName = null;
         if (propertyName != null) {
             propName = checkPropertyName(propertyName);
         }
@@ -559,7 +559,7 @@
                                          String propertyName,
                                          String fullTextSearchExpression)
             throws InvalidQueryException, RepositoryException {
-        QName propName = null;
+        Name propName = null;
         if (propertyName != null) {
             propName = checkPropertyName(propertyName);
         }
@@ -941,7 +941,7 @@
      */
     public Column column(String propertyName)                                     // CM
             throws InvalidQueryException, RepositoryException {
-        QName propName = null;
+        Name propName = null;
         if (propertyName != null) {
             try {
                 propName = resolver.getQName(propertyName);
@@ -974,7 +974,7 @@
             throw new RepositoryException(
                     "columnName must be null if propertyName is null");
         }
-        QName propName = null;
+        Name propName = null;
         if (propertyName != null) {
             try {
                 propName = resolver.getQName(propertyName);
@@ -982,7 +982,7 @@
                 throw new InvalidQueryException(e.getMessage());
             }
         }
-        QName colName = null;
+        Name colName = null;
         if (columnName != null) {
             try {
                 colName = resolver.getQName(columnName);
@@ -1016,7 +1016,7 @@
             throw new RepositoryException(
                     "columnName must be null if propertyName is null");
         }
-        QName propName = null;
+        Name propName = null;
         if (propertyName != null) {
             try {
                 propName = resolver.getQName(propertyName);
@@ -1024,7 +1024,7 @@
                 throw new InvalidQueryException(e.getMessage());
             }
         }
-        QName colName = null;
+        Name colName = null;
         if (columnName != null) {
             try {
                 colName = resolver.getQName(columnName);
@@ -1038,7 +1038,7 @@
 
     //------------------------------< internal >--------------------------------
 
-    private QName checkSelectorName(String selectorName)
+    private Name checkSelectorName(String selectorName)
             throws RepositoryException {
         if (selectorName == null) {
             // TODO: correct exception?
@@ -1051,7 +1051,7 @@
         }
     }
 
-    private QName checkNodeTypeName(String nodeTypeName)
+    private Name checkNodeTypeName(String nodeTypeName)
             throws RepositoryException {
         if (nodeTypeName == null) {
             // TODO: correct exception?
@@ -1076,7 +1076,7 @@
         }
     }
 
-    private QName checkPropertyName(String propertyName)
+    private Name checkPropertyName(String propertyName)
             throws RepositoryException {
         if (propertyName == null) {
             // TODO: correct exception?

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import javax.jcr.query.InvalidQueryException;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java Tue Oct 30 03:02:41 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.Path;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.SameNode;
 
@@ -30,7 +30,7 @@
     /**
      * The name of a selector.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     /**
      * An absolute path.
@@ -38,7 +38,7 @@
     private final Path path;
 
     SameNodeImpl(NamePathResolver resolver,
-                 QName selectorName,
+                 Name selectorName,
                  Path path) {
         super(resolver);
         this.selectorName = selectorName;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java Tue Oct 30 03:02:41 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.SameNodeJoinCondition;
 
@@ -32,12 +32,12 @@
     /**
      * The name of the first selector.
      */
-    private final QName selector1Name;
+    private final Name selector1Name;
 
     /**
      * The name of the second selector.
      */
-    private final QName selector2Name;
+    private final Name selector2Name;
 
     /**
      * The path relative to the second selector.
@@ -45,8 +45,8 @@
     private final Path selector2Path;
 
     SameNodeJoinConditionImpl(NamePathResolver resolver,
-                              QName selector1Name,
-                              QName selector2Name,
+                              Name selector1Name,
+                              Name selector2Name,
                               Path selector2Path) {
         super(resolver);
         this.selector1Name = selector1Name;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java Tue Oct 30 03:02:41 2007
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.Name;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Selector;
 
@@ -29,16 +29,16 @@
     /**
      * The name of the required node type.
      */
-    private final QName nodeTypeName;
+    private final Name nodeTypeName;
 
     /**
      * The selector name.
      */
-    private final QName selectorName;
+    private final Name selectorName;
 
     SelectorImpl(NamePathResolver resolver,
-                 QName nodeTypeName,
-                 QName selectorName) {
+                 Name nodeTypeName,
+                 Name selectorName) {
         super(resolver);
         this.nodeTypeName = nodeTypeName;
         this.selectorName = selectorName;
@@ -49,7 +49,7 @@
      *
      * @return the node type name; non-null
      */
-    public QName getNodeTypeQName() {
+    public Name getNodeTypeQName() {
         return nodeTypeName;
     }
 
@@ -61,7 +61,7 @@
      *
      * @return the selector name; non-null
      */
-    public QName getSelectorQName() {
+    public Name getSelectorQName() {
         return selectorName;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.Source;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.StaticOperand;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.qom;
 
-import org.apache.jackrabbit.name.NamePathResolver;
+import org.apache.jackrabbit.conversion.NamePathResolver;
 
 import org.apache.jackrabbit.core.query.jsr283.qom.UpperCase;
 import org.apache.jackrabbit.core.query.jsr283.qom.DynamicOperand;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java Tue Oct 30 03:02:41 2007
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.query.sql;
 
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.spi.Name;
 
 public class ASTContainsExpression extends SimpleNode {
 
     private String query;
 
-    private QName property;
+    private Name property;
 
     public ASTContainsExpression(int id) {
         super(id);
@@ -40,11 +40,11 @@
         this.query = query;
     }
 
-    public QName getPropertyName() {
+    public Name getPropertyName() {
         return property;
     }
 
-    public void setPropertyName(QName property) {
+    public void setPropertyName(Name property) {
         this.property = property;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java Tue Oct 30 03:02:41 2007
@@ -16,11 +16,11 @@
  */
 package org.apache.jackrabbit.core.query.sql;
 
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.spi.Name;
 
 public class ASTIdentifier extends SimpleNode {
 
-    private QName name;
+    private Name name;
 
     public ASTIdentifier(int id) {
     super(id);
@@ -30,11 +30,11 @@
     super(p, id);
   }
 
-    public void setName(QName name) {
+    public void setName(Name name) {
         this.name = name;
     }
 
-    public QName getName() {
+    public Name getName() {
         return name;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java Tue Oct 30 03:02:41 2007
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.query.sql;
 
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.spi.Name;
 
 public class ASTPredicate extends SimpleNode {
 
@@ -24,7 +24,7 @@
 
     private boolean negate = false;
 
-    private QName identifier;
+    private Name identifier;
 
     private String identifierOperand;
 
@@ -54,11 +54,11 @@
         return this.negate;
     }
 
-    public void setIdentifier(QName identifier) {
+    public void setIdentifier(Name identifier) {
         this.identifier = identifier;
     }
 
-    public QName getIdentifier() {
+    public Name getIdentifier() {
         return identifier;
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java Tue Oct 30 03:02:41 2007
@@ -31,18 +31,21 @@
 import org.apache.jackrabbit.core.query.TextsearchQueryNode;
 import org.apache.jackrabbit.core.query.PropertyFunctionQueryNode;
 import org.apache.jackrabbit.core.query.QueryNodeFactory;
-import org.apache.jackrabbit.name.NameException;
-import org.apache.jackrabbit.name.NamespaceResolver;
-import org.apache.jackrabbit.name.QName;
-import org.apache.jackrabbit.name.NameFormat;
-import org.apache.jackrabbit.name.Path;
-import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.conversion.NameException;
+import org.apache.jackrabbit.name.NameConstants;
+import org.apache.jackrabbit.name.NameFactoryImpl;
+import org.apache.jackrabbit.name.PathBuilder;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.conversion.MalformedPathException;
+import org.apache.jackrabbit.conversion.NameResolver;
 import org.apache.jackrabbit.util.ISO8601;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.commons.collections.map.ReferenceMap;
 
 import javax.jcr.query.InvalidQueryException;
+import javax.jcr.NamespaceException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -88,7 +91,7 @@
     /**
      * To resolve QNames
      */
-    private NamespaceResolver resolver;
+    private NameResolver resolver;
 
     /**
      * Query node to gather the constraints defined in the WHERE clause
@@ -96,9 +99,9 @@
     private final AndQueryNode constraintNode;
 
     /**
-     * The QName of the node type in the from clause.
+     * The Name of the node type in the from clause.
      */
-    private QName nodeTypeName;
+    private Name nodeTypeName;
 
     /**
      * List of PathQueryNode constraints that need to be merged
@@ -119,7 +122,7 @@
      * @param factory   the query node factory.
      */
     private JCRSQLQueryBuilder(ASTQuery statement,
-                               NamespaceResolver resolver,
+                               NameResolver resolver,
                                QueryNodeFactory factory) {
         this.stmt = statement;
         this.resolver = resolver;
@@ -137,7 +140,7 @@
      * @throws InvalidQueryException if <code>statement</code> is malformed.
      */
     public static QueryRootNode createQuery(String statement,
-                                            NamespaceResolver resolver,
+                                            NameResolver resolver,
                                             QueryNodeFactory factory)
             throws InvalidQueryException {
         try {
@@ -147,7 +150,7 @@
                 parser = (JCRSQLParser) parsers.get(resolver);
                 if (parser == null) {
                     parser = new JCRSQLParser(new StringReader(statement));
-                    parser.setNamespaceResolver(resolver);
+                    parser.setNameResolver(resolver);
                     parsers.put(resolver, parser);
                 }
             }
@@ -178,7 +181,7 @@
      * @throws InvalidQueryException if the query node tree cannot be converted
      *                               into a String representation due to restrictions in SQL.
      */
-    public static String toString(QueryRootNode root, NamespaceResolver resolver)
+    public static String toString(QueryRootNode root, NameResolver resolver)
             throws InvalidQueryException {
         return QueryFormat.toString(root, resolver);
     }
@@ -286,7 +289,7 @@
             }
 
             public Object visit(ASTExcerptFunction node, Object data) {
-                root.addSelectProperty(new QName(QName.NS_REP_URI, "excerpt(.)"));
+                root.addSelectProperty(NameFactoryImpl.getInstance().create(Name.NS_REP_URI, "excerpt(.)"));
                 return data;
             }
         }, root);
@@ -299,7 +302,7 @@
 
         return node.childrenAccept(new DefaultParserVisitor() {
             public Object visit(ASTIdentifier node, Object data) {
-                if (!node.getName().equals(QName.NT_BASE)) {
+                if (!node.getName().equals(NameConstants.NT_BASE)) {
                     // node is either primary or mixin node type
                     nodeTypeName = node.getName();
                 }
@@ -319,7 +322,7 @@
         QueryNode predicateNode;
 
         try {
-            final QName[] tmp = new QName[2];
+            final Name[] tmp = new Name[2];
             final ASTLiteral[] value = new ASTLiteral[1];
             node.childrenAccept(new DefaultParserVisitor() {
                 public Object visit(ASTIdentifier node, Object data) {
@@ -360,9 +363,9 @@
                     }
                 }
             }, data);
-            QName identifier = tmp[0];
+            Name identifier = tmp[0];
 
-            if (identifier != null && identifier.equals(QName.JCR_PATH)) {
+            if (identifier != null && identifier.equals(NameConstants.JCR_PATH)) {
                 if (tmp[1] != null) {
                     // simply ignore, this is a join of a mixin node type
                 } else {
@@ -437,7 +440,7 @@
                 predicateNode = createRelationQueryNode(parent, identifier, type, literal);
             } else if (type == QueryConstants.OPERATION_SPELLCHECK) {
                 predicateNode = createRelationQueryNode(parent,
-                        QName.JCR_PRIMARYTYPE, type,
+                        NameConstants.JCR_PRIMARYTYPE, type,
                         (ASTLiteral) node.children[0]);
             } else {
                 throw new IllegalArgumentException("Unknown operation type: " + type);
@@ -514,7 +517,7 @@
     public Object visit(ASTOrderSpec node, Object data) {
         OrderQueryNode order = (OrderQueryNode) data;
 
-        final QName[] identifier = new QName[1];
+        final Name[] identifier = new Name[1];
 
         // collect identifier
         node.childrenAccept(new DefaultParserVisitor() {
@@ -548,7 +551,7 @@
         try {
             Path relPath = null;
             if (node.getPropertyName() != null) {
-                Path.PathBuilder builder = new Path.PathBuilder();
+                PathBuilder builder = new PathBuilder();
                 builder.addLast(node.getPropertyName());
                 relPath = builder.getPath();
             }
@@ -601,7 +604,7 @@
      *                                  to its type. E.g. a malformed String representation of a date.
      */
     private RelationQueryNode createRelationQueryNode(QueryNode parent,
-                                                      QName propertyName,
+                                                      Name propertyName,
                                                       int operationType,
                                                       ASTLiteral literal)
             throws IllegalArgumentException {
@@ -612,7 +615,7 @@
         try {
             Path relPath = null;
             if (propertyName != null) {
-                Path.PathBuilder builder = new Path.PathBuilder();
+                PathBuilder builder = new PathBuilder();
                 builder.addLast(propertyName);
                 relPath = builder.getPath();
             }
@@ -721,10 +724,12 @@
                         index = 1;
                     }
                 }
-                QName qName = null;
+                Name qName = null;
                 if (name != null) {
                     try {
-                        qName = NameFormat.parse(name, resolver);
+                        qName = resolver.getQName(name);
+                    } catch (NamespaceException e) {
+                        throw new IllegalArgumentException("Illegal name: " + name);
                     } catch (NameException e) {
                         throw new IllegalArgumentException("Illegal name: " + name);
                     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java Tue Oct 30 03:02:41 2007
@@ -19,7 +19,7 @@
 import org.apache.jackrabbit.core.query.QueryTreeBuilder;
 import org.apache.jackrabbit.core.query.QueryRootNode;
 import org.apache.jackrabbit.core.query.QueryNodeFactory;
-import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.conversion.NameResolver;
 
 import javax.jcr.query.InvalidQueryException;
 import javax.jcr.query.Query;
@@ -33,7 +33,7 @@
      * @inheritDoc
      */
     public QueryRootNode createQueryTree(String statement,
-                                         NamespaceResolver resolver,
+                                         NameResolver resolver,
                                          QueryNodeFactory factory)
             throws InvalidQueryException {
         return JCRSQLQueryBuilder.createQuery(statement, resolver, factory);
@@ -57,7 +57,7 @@
     /**
      * @inheritDoc
      */
-    public String toString(QueryRootNode root, NamespaceResolver resolver)
+    public String toString(QueryRootNode root, NameResolver resolver)
             throws InvalidQueryException {
         return JCRSQLQueryBuilder.toString(root, resolver);
     }



Mime
View raw message