jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r209089 [5/7] - in /incubator/jackrabbit/trunk: commons/ commons/src/java/org/apache/jackrabbit/ commons/src/java/org/apache/jackrabbit/core/ commons/src/java/org/apache/jackrabbit/name/ commons/src/java/org/apache/jackrabbit/util/ commons/...
Date Mon, 04 Jul 2005 14:52:27 GMT
Added: incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/PathTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/PathTest.java?rev=209089&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/PathTest.java (added)
+++ incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/PathTest.java Mon Jul  4 07:52:19 2005
@@ -0,0 +1,335 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.name;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+
+import org.apache.jackrabbit.util.Text;
+
+/**
+ * This Class implements a test case for the 'Path' class.
+ *
+ * Actually, this should be below the {@link org.apache.jackrabbit.test} package,
+ * but it needs package protected methods of that class.
+ */
+public class PathTest extends TestCase {
+
+    private final NamespaceResolver resolver;
+
+    private Test[] tests;
+
+    private static final int ABS = 1;
+    private static final int NOR = 2;
+    private static final int VAL = 4;
+
+    private static int NUM_TESTS = 1;
+
+    public PathTest() {
+
+        // create dummy namespace resolver
+        resolver = new NamespaceResolver(){
+            public String getURI(String prefix) {
+                return prefix;
+            }
+
+            public String getPrefix(String uri) {
+                return uri;
+            }
+        };
+
+        // create tests
+        ArrayList list = new ArrayList();
+        // absolute paths
+        list.add(new Test("/", NOR|VAL));
+        list.add(new Test("/", NOR|VAL));
+        list.add(new Test("/", NOR|VAL));
+        list.add(new Test("/a/b/c", NOR|VAL));
+        list.add(new Test("/prefix:name/prefix:name", NOR|VAL));
+        list.add(new Test("/name[2]/name[2]", NOR|VAL));
+        list.add(new Test("/prefix:name[2]/prefix:name[2]", NOR|VAL));
+
+        // relative paths
+        list.add(new Test("a/b/c", NOR|VAL));
+        list.add(new Test("prefix:name/prefix:name", NOR|VAL));
+        list.add(new Test("name[2]/name[2]", NOR|VAL));
+        list.add(new Test("prefix:name[2]/prefix:name[2]", NOR|VAL));
+
+        // invalid paths
+        list.add(new Test(""));
+        list.add(new Test("/a/b/c/"));
+        list.add(new Test(" /a/b/c/"));
+        list.add(new Test("/a/b/c/ "));
+        list.add(new Test("/:name/prefix:name"));
+        list.add(new Test("/prefix:name "));
+        list.add(new Test("/prefix: name"));
+        list.add(new Test("/ prefix:name"));
+        list.add(new Test("/prefix : name"));
+        list.add(new Test("/name[0]/name[2]"));
+        list.add(new Test("/prefix:name[2]foo/prefix:name[2]"));
+        list.add(new Test("a/b/c/"));
+        list.add(new Test(":name/prefix:name"));
+        list.add(new Test("name[0]/name[2]"));
+        list.add(new Test("prefix:name[2]foo/prefix:name[2]"));
+
+        // not normalized paths
+        list.add(new Test("/a/../b", "/b", VAL));
+        list.add(new Test("/a/./b", "/a/b", VAL));
+        list.add(new Test("/a/b/../..", "/", VAL));
+        list.add(new Test("/a/b/c/../d/..././f", "/a/b/d/.../f", VAL));
+        list.add(new Test("../a/b/../../../../f", "../../../f", VAL));
+        list.add(new Test("a/../..", "..", VAL));
+        list.add(new Test("../../a/.", "../../a", VAL));
+
+        // invalid normalized paths
+        list.add(new Test("/..", "/..", 0));
+        list.add(new Test("/a/b/../../..", "/a/b/../../..", 0));
+
+        tests = (Test[]) list.toArray(new Test[list.size()]);
+    }
+
+    public void testCreate() throws Exception {
+        for (int i=0; i<tests.length; i++) {
+            Test t = tests[i];
+            long t1 = System.currentTimeMillis();
+            for (int j=0; j<NUM_TESTS; j++) {
+                try {
+                    if (t.normalizedPath==null) {
+                        // check just creation
+                        Path p = Path.create(t.path, resolver, false);
+                        if (!t.isValid()) {
+                            fail("Should throw MalformedPathException: " + t.path);
+                        }
+                        assertEquals("\"" + t.path + "\".create(false)", t.path,  p.toJCRPath(resolver));
+                        assertEquals("\"" + t.path + "\".isNormalized()", t.isNormalized(), p.isNormalized());
+                        assertEquals("\"" + t.path + "\".isAbsolute()", t.isAbsolute(), p.isAbsolute());
+                    } else {
+                        // check with normalization
+                        Path p = Path.create(t.path, resolver, true);
+                        if (!t.isValid()) {
+                            fail("Should throw MalformedPathException: " + t.path);
+                        }
+                        assertEquals("\"" + t.path + "\".create(true)", t.normalizedPath, p.toJCRPath(resolver));
+                        assertEquals("\"" + t.path + "\".isAbsolute()", t.isAbsolute(), p.isAbsolute());
+                    }
+                } catch (MalformedPathException e) {
+                    if (t.isValid()) {
+                        throw e;
+                    }
+                }
+            }
+            long t2 = System.currentTimeMillis();
+            if (NUM_TESTS>1) {
+                System.out.println("testCreate():\t" + t + "\t" + (t2-t1) + "\tms");
+            }
+        }
+    }
+
+    public void testCheckFormat() throws Exception {
+        for (int i=0; i<tests.length; i++) {
+            Test t = tests[i];
+            long t1 = System.currentTimeMillis();
+            for (int j=0; j<NUM_TESTS; j++) {
+                if (t.normalizedPath==null) {
+                    // check just creation
+                    boolean isValid = true;
+                    try {
+                        Path.checkFormat(t.path);
+                    } catch (MalformedPathException e) {
+                        isValid = false;
+                    }
+                    assertEquals("\"" + t.path + "\".checkFormat()", t.isValid(),  isValid);
+                }
+            }
+            long t2 = System.currentTimeMillis();
+            if (NUM_TESTS>1) {
+                System.out.println("testCheckFormat():\t" + t + "\t" + (t2-t1) + "\tms");
+            }
+        }
+    }
+
+    public void testBuilder() throws Exception {
+        for (int i=0; i<tests.length; i++) {
+            Test t = tests[i];
+            if (t.isValid()) {
+                if (t.normalizedPath==null) {
+                    // check just creation
+                    Path p = build(t.path, resolver, false);
+                    assertEquals("\"" + t.path + "\".create(false)", t.path,  p.toJCRPath(resolver));
+                    assertEquals("\"" + t.path + "\".isNormalized()", t.isNormalized(), p.isNormalized());
+                    assertEquals("\"" + t.path + "\".isAbsolute()", t.isAbsolute(), p.isAbsolute());
+                } else {
+                    // check with normalization
+                    Path p = build(t.path, resolver, true);
+                    assertEquals("\"" + t.path + "\".create(true)", t.normalizedPath, p.toJCRPath(resolver));
+                    assertEquals("\"" + t.path + "\".isAbsolute()", t.isAbsolute(), p.isAbsolute());
+                }
+            }
+        }
+    }
+
+    public void testBuilderReverse() throws Exception {
+        for (int i=0; i<tests.length; i++) {
+            Test t = tests[i];
+            if (t.isValid()) {
+                if (t.normalizedPath==null) {
+                    // check just creation
+                    Path p = buildReverse(t.path, resolver, false);
+                    assertEquals("\"" + t.path + "\".create(false)", t.path,  p.toJCRPath(resolver));
+                    assertEquals("\"" + t.path + "\".isNormalized()", t.isNormalized(), p.isNormalized());
+                    assertEquals("\"" + t.path + "\".isAbsolute()", t.isAbsolute(), p.isAbsolute());
+                } else {
+                    // check with normalization
+                    Path p = buildReverse(t.path, resolver, true);
+                    assertEquals("\"" + t.path + "\".create(true)", t.normalizedPath, p.toJCRPath(resolver));
+                    assertEquals("\"" + t.path + "\".isAbsolute()", t.isAbsolute(), p.isAbsolute());
+                }
+            }
+        }
+    }
+
+    private Path build(String path, NamespaceResolver resolver, boolean normalize)
+            throws Exception {
+        Path.PathBuilder builder = new Path.PathBuilder();
+        String[] elems = Text.explode(path, '/', false);
+        if (path.startsWith("/")) {
+            builder.addRoot();
+        }
+        for (int i=0; i<elems.length; i++) {
+            int pos = elems[i].indexOf('[');
+            String elem;
+            QName name;
+            int index;
+            if (pos<0) {
+                elem = elems[i];
+                index = -1;
+            } else {
+                index = Integer.parseInt(elems[i].substring(pos+1, elems[i].length()-1));
+                elem = elems[i].substring(0, pos);
+            }
+            if (".".equals(elem)) {
+                name = new QName("", ".");
+            } else if ("..".equals(elems[i])) {
+                name = new QName("", "..");
+            } else {
+                name = QName.fromJCRName(elem, resolver);
+            }
+            if (index < 0) {
+                builder.addLast(name);
+            } else {
+                builder.addLast(name, index);
+            }
+        }
+        return normalize ? builder.getPath().getNormalizedPath() : builder.getPath();
+    }
+
+    private Path buildReverse(String path, NamespaceResolver resolver, boolean normalize)
+            throws Exception {
+        Path.PathBuilder builder = new Path.PathBuilder();
+        String[] elems = Text.explode(path, '/', false);
+        for (int i=elems.length-1; i>=0; i--) {
+            int pos = elems[i].indexOf('[');
+            String elem;
+            QName name;
+            int index;
+            if (pos<0) {
+                elem = elems[i];
+                index = -1;
+            } else {
+                index = Integer.parseInt(elems[i].substring(pos+1, elems[i].length()-1));
+                elem = elems[i].substring(0, pos);
+            }
+            if (".".equals(elem)) {
+                name = new QName("", ".");
+            } else if ("..".equals(elems[i])) {
+                name = new QName("", "..");
+            } else {
+                name = QName.fromJCRName(elem, resolver);
+            }
+            if (index < 0) {
+                builder.addFirst(name);
+            } else {
+                builder.addFirst(name, index);
+            }
+        }
+        if (path.startsWith("/")) {
+            builder.addRoot();
+        }
+        return normalize ? builder.getPath().getNormalizedPath() : builder.getPath();
+    }
+
+    private static class Test {
+
+        private final String path;
+
+        private final String normalizedPath;
+
+        private final int flags;
+
+        /**
+         * creates an invalid path test
+         * @param path
+         */
+        public Test(String path) {
+            this(path, null, 0);
+        }
+
+        /**
+         * @param path
+         * @param flags
+         */
+        public Test(String path, int flags) {
+            this(path, null, flags);
+        }
+
+        public Test(String path, String normalizedPath, int flags) {
+            this.path = path;
+            this.normalizedPath = normalizedPath;
+            this.flags = flags | ((path.length()>0 && path.charAt(0)=='/') ? ABS : 0);
+        }
+
+        public boolean isAbsolute() {
+            return (flags&ABS) > 0;
+        }
+
+        public boolean isNormalized() {
+            return (flags&NOR) > 0;
+        }
+
+        public boolean isValid() {
+            return (flags&VAL) > 0;
+        }
+
+        public String toString() {
+            StringBuffer b = new StringBuffer(path);
+            if (normalizedPath!=null) {
+                b.append(" -> " + normalizedPath);
+            }
+            if (isAbsolute()) {
+                b.append(",ABS");
+            }
+            if (isNormalized()) {
+                b.append(",NOR");
+            }
+            if (isValid()) {
+                b.append(",VAL");
+            }
+            return b.toString();
+        }
+    }
+}

Propchange: incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/PathTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/QNameTest.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/QNameTest.java?rev=209089&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/QNameTest.java (added)
+++ incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/QNameTest.java Mon Jul  4 07:52:19 2005
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.name;
+
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+
+/**
+ * This Class implements a test case for the 'Path' class.
+ *
+ * Actually, this should be below the {@link org.apache.jackrabbit.test} package,
+ * but it needs package protected methods of that class.
+ */
+public class QNameTest extends TestCase {
+
+    private final NamespaceResolver resolver;
+
+    private Test[] tests;
+
+    private static int NUM_TESTS = 1;
+
+    public QNameTest() {
+
+        // create dummy namespace resolver
+        resolver = new NamespaceResolver(){
+            public String getURI(String prefix) {
+                return prefix;
+            }
+
+            public String getPrefix(String uri) {
+                return uri;
+            }
+        };
+
+        // create tests
+        ArrayList list = new ArrayList();
+
+        // valid names
+        list.add(new Test("name", "", "name"));
+        list.add(new Test("prefix:name", "prefix", "name"));
+        list.add(new Test("prefix:na me", "prefix", "na me"));
+
+        // invalid names
+        list.add(new Test(":name"));
+        list.add(new Test("."));
+        list.add(new Test(".."));
+        list.add(new Test("pre:"));
+        list.add(new Test(""));
+        list.add(new Test(" name"));
+        list.add(new Test(" prefix: name"));
+        list.add(new Test("prefix: name"));
+        list.add(new Test("prefix:name "));
+        list.add(new Test("pre fix:name"));
+        list.add(new Test("prefix :name"));
+        list.add(new Test("name/name"));
+        list.add(new Test("name[name"));
+        list.add(new Test("name]name"));
+        list.add(new Test("name*name"));
+        list.add(new Test("prefix:name:name"));
+
+        tests = (Test[]) list.toArray(new Test[list.size()]);
+    }
+
+    public void testCreate() throws Exception {
+        for (int i=0; i<tests.length; i++) {
+            Test t = tests[i];
+            long t1 = System.currentTimeMillis();
+            for (int j=0; j<NUM_TESTS; j++) {
+                try {
+                    QName n = QName.fromJCRName(t.jcrName, resolver);
+                    if (!t.isValid()) {
+                        fail("Should throw IllegalNameException: " + t.jcrName);
+                    }
+                    assertEquals("\"" + t.jcrName + "\".uri", t.prefix, n.namespaceURI);
+                    assertEquals("\"" + t.jcrName + "\".localName", t.name, n.localName);
+                } catch (IllegalNameException e) {
+                    if (t.isValid()) {
+                        throw e;
+                    }
+                }
+            }
+            long t2 = System.currentTimeMillis();
+            if (NUM_TESTS>1) {
+                System.out.println("testCreate():\t" + t + "\t" + (t2-t1) + "\tms");
+            }
+        }
+    }
+
+    public void testCheckFormat() throws Exception {
+        for (int i=0; i<tests.length; i++) {
+            Test t = tests[i];
+            long t1 = System.currentTimeMillis();
+            for (int j=0; j<NUM_TESTS; j++) {
+                // check just creation
+                boolean isValid = true;
+                try {
+                    QName.checkFormat(t.jcrName);
+                } catch (IllegalNameException e) {
+                    isValid = false;
+                }
+                assertEquals("\"" + t.jcrName + "\".checkFormat()", t.isValid(),  isValid);
+            }
+            long t2 = System.currentTimeMillis();
+            if (NUM_TESTS>1) {
+                System.out.println("testCheckFormat():\t" + t + "\t" + (t2-t1) + "\tms");
+            }
+        }
+    }
+
+    private static class Test {
+
+        private final String jcrName;
+
+        private final String prefix;
+
+        private final String name;
+
+        public Test(String jcrName) {
+            this(jcrName, null, null);
+        }
+
+        public Test(String jcrName, String prefix, String name) {
+            this.jcrName = jcrName;
+            this.prefix = prefix;
+            this.name = name;
+        }
+
+        public boolean isValid() {
+            return name!=null;
+        }
+
+        public String toString() {
+            StringBuffer b = new StringBuffer(jcrName);
+            if (isValid()) {
+                b.append(",VAL");
+            }
+            return b.toString();
+        }
+    }
+}

Propchange: incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/QNameTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/TestAll.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/TestAll.java?rev=209089&view=auto
==============================================================================
--- incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/TestAll.java (added)
+++ incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/TestAll.java Mon Jul  4 07:52:19 2005
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.name;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Test suite that includes all testcases for the Core module.
+ */
+public class TestAll extends TestCase {
+
+    /**
+     * Returns a <code>Test</code> suite that executes all tests inside this
+     * package.
+     *
+     * @return a <code>Test</code> suite that executes all tests inside this
+     *         package.
+     */
+    public static Test suite() {
+        TestSuite suite = new TestSuite("name tests");
+
+        suite.addTestSuite(PathTest.class);
+        suite.addTestSuite(QNameTest.class);
+
+        return suite;
+    }
+}

Propchange: incubator/jackrabbit/trunk/commons/src/test/org/apache/jackrabbit/name/TestAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/jackrabbit/trunk/core/src/grammar/sql/JCRSQL.jjt
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/grammar/sql/JCRSQL.jjt?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/grammar/sql/JCRSQL.jjt (original)
+++ incubator/jackrabbit/trunk/core/src/grammar/sql/JCRSQL.jjt Mon Jul  4 07:52:19 2005
@@ -41,10 +41,10 @@
  */
 package org.apache.jackrabbit.core.query.sql;
 
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
 import org.apache.jackrabbit.core.query.QueryConstants;
 
 public class JCRSQLParser {

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/BatchedItemOperations.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/BatchedItemOperations.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/BatchedItemOperations.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/BatchedItemOperations.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.lock.LockManager;
 import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
 import org.apache.jackrabbit.core.nodetype.NodeDef;
@@ -33,8 +34,12 @@
 import org.apache.jackrabbit.core.state.PropertyState;
 import org.apache.jackrabbit.core.state.UpdatableItemStateManager;
 import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
-import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.uuid.UUID;
 import org.apache.log4j.Logger;
 
 import javax.jcr.AccessDeniedException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/CachingHierarchyManager.java Mon Jul  4 07:52:19 2005
@@ -22,6 +22,10 @@
 import org.apache.jackrabbit.core.state.ItemStateManager;
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.NodeStateListener;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.ItemNotFoundException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManager.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,9 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java Mon Jul  4 07:52:19 2005
@@ -16,12 +16,18 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.core.state.ItemStateException;
 import org.apache.jackrabbit.core.state.ItemStateManager;
 import org.apache.jackrabbit.core.state.NoSuchItemStateException;
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.PropertyState;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.ItemNotFoundException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemImpl.java Mon Jul  4 07:52:19 2005
@@ -16,8 +16,9 @@
  */
 package org.apache.jackrabbit.core;
 
-import org.apache.commons.collections.map.ReferenceMap;
 import org.apache.commons.collections.iterators.IteratorChain;
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
 import org.apache.jackrabbit.core.nodetype.NodeDef;
 import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
@@ -32,8 +33,12 @@
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.PropertyState;
 import org.apache.jackrabbit.core.state.SessionItemStateManager;
-import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.uuid.UUID;
 import org.apache.log4j.Logger;
 
 import javax.jcr.AccessDeniedException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemManager.java Mon Jul  4 07:52:19 2005
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.core;
 
 import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.nodetype.NodeDefinitionImpl;
 import org.apache.jackrabbit.core.nodetype.PropDefId;
@@ -32,6 +33,9 @@
 import org.apache.jackrabbit.core.version.InternalVersionHistory;
 import org.apache.jackrabbit.core.version.VersionHistoryImpl;
 import org.apache.jackrabbit.core.version.VersionImpl;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.AccessDeniedException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemValidator.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemValidator.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemValidator.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ItemValidator.java Mon Jul  4 07:52:19 2005
@@ -24,6 +24,10 @@
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.PropertyState;
 import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.PropertyType;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.name.NamespaceResolver;
 import org.apache.xerces.util.XMLChar;
 
 import javax.jcr.NamespaceException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java Mon Jul  4 07:52:19 2005
@@ -16,16 +16,18 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.fs.FileSystem;
 import org.apache.jackrabbit.core.fs.FileSystemResource;
+import org.apache.jackrabbit.name.NamespaceResolver;
 import org.apache.log4j.Logger;
 import org.apache.xerces.util.XMLChar;
 
+import javax.jcr.AccessDeniedException;
 import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.RepositoryException;
 import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.AccessDeniedException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.HashMap;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NodeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NodeImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NodeImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/NodeImpl.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.BaseException;
 import org.apache.jackrabbit.core.lock.LockManager;
 import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
 import org.apache.jackrabbit.core.nodetype.NodeDef;
@@ -33,11 +34,7 @@
 import org.apache.jackrabbit.core.state.NodeReferencesId;
 import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.util.ChildrenCollectorFilter;
-import org.apache.jackrabbit.core.util.IteratorHelper;
-import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.jackrabbit.core.value.ValueHelper;
 import org.apache.jackrabbit.core.version.GenericVersionSelector;
 import org.apache.jackrabbit.core.version.InternalFreeze;
 import org.apache.jackrabbit.core.version.InternalFrozenNode;
@@ -46,6 +43,16 @@
 import org.apache.jackrabbit.core.version.VersionHistoryImpl;
 import org.apache.jackrabbit.core.version.VersionImpl;
 import org.apache.jackrabbit.core.version.VersionSelector;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.util.ChildrenCollectorFilter;
+import org.apache.jackrabbit.util.IteratorHelper;
+import org.apache.jackrabbit.uuid.UUID;
+import org.apache.jackrabbit.value.ValueHelper;
 import org.apache.log4j.Logger;
 
 import javax.jcr.AccessDeniedException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PathMap.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PathMap.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PathMap.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PathMap.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,10 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyId.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyId.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyId.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyId.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,8 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.name.QName;
+
 /**
  * Property identifier. An instance of this class identifies a single
  * property using the UUID of the parent node and the qualified name of

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/PropertyImpl.java Mon Jul  4 07:52:19 2005
@@ -19,13 +19,16 @@
 import org.apache.jackrabbit.core.state.ItemState;
 import org.apache.jackrabbit.core.state.ItemStateException;
 import org.apache.jackrabbit.core.state.PropertyState;
-import org.apache.jackrabbit.core.util.uuid.UUID;
-import org.apache.jackrabbit.core.value.BooleanValue;
-import org.apache.jackrabbit.core.value.DateValue;
-import org.apache.jackrabbit.core.value.DoubleValue;
-import org.apache.jackrabbit.core.value.LongValue;
-import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.core.value.BLOBFileValue;
+import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.uuid.UUID;
+import org.apache.jackrabbit.value.BooleanValue;
+import org.apache.jackrabbit.value.DateValue;
+import org.apache.jackrabbit.value.DoubleValue;
+import org.apache.jackrabbit.value.LongValue;
 import org.apache.log4j.Logger;
 
 import javax.jcr.AccessDeniedException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/RepositoryImpl.java Mon Jul  4 07:52:19 2005
@@ -16,33 +16,8 @@
  */
 package org.apache.jackrabbit.core;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-
-import javax.jcr.AccessDeniedException;
-import javax.jcr.Credentials;
-import javax.jcr.LoginException;
-import javax.jcr.NamespaceRegistry;
-import javax.jcr.NoSuchWorkspaceException;
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.observation.Event;
-import javax.jcr.observation.EventIterator;
-import javax.jcr.observation.EventListener;
-import javax.security.auth.Subject;
-
 import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.config.LoginModuleConfig;
 import org.apache.jackrabbit.core.config.PersistenceManagerConfig;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
@@ -64,10 +39,35 @@
 import org.apache.jackrabbit.core.state.PMContext;
 import org.apache.jackrabbit.core.state.PersistenceManager;
 import org.apache.jackrabbit.core.state.SharedItemStateManager;
-import org.apache.jackrabbit.core.util.uuid.UUID;
 import org.apache.jackrabbit.core.version.VersionManager;
 import org.apache.jackrabbit.core.version.VersionManagerImpl;
+import org.apache.jackrabbit.uuid.UUID;
 import org.apache.log4j.Logger;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.Credentials;
+import javax.jcr.LoginException;
+import javax.jcr.NamespaceRegistry;
+import javax.jcr.NoSuchWorkspaceException;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.observation.Event;
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import javax.security.auth.Subject;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
 
 /**
  * A <code>RepositoryImpl</code> ...

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SearchManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SearchManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SearchManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SearchManager.java Mon Jul  4 07:52:19 2005
@@ -20,31 +20,32 @@
 import org.apache.jackrabbit.core.config.SearchConfig;
 import org.apache.jackrabbit.core.fs.FileSystem;
 import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.observation.EventImpl;
 import org.apache.jackrabbit.core.observation.SynchronousEventListener;
 import org.apache.jackrabbit.core.query.QueryHandler;
-import org.apache.jackrabbit.core.query.QueryImpl;
 import org.apache.jackrabbit.core.query.QueryHandlerContext;
+import org.apache.jackrabbit.core.query.QueryImpl;
 import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.state.NodeState;
 import org.apache.jackrabbit.core.state.ItemStateManager;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.state.NodeState;
+import org.apache.jackrabbit.name.Path;
 import org.apache.log4j.Logger;
 
 import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
-import javax.jcr.RepositoryException;
 import javax.jcr.Node;
+import javax.jcr.RepositoryException;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
 import javax.jcr.query.InvalidQueryException;
 import javax.jcr.query.Query;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Set;
 
 /**
  * Acts as a global entry point to execute queries and index nodes.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SessionImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/SessionImpl.java Mon Jul  4 07:52:19 2005
@@ -17,6 +17,7 @@
 package org.apache.jackrabbit.core;
 
 import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.config.AccessManagerConfig;
 import org.apache.jackrabbit.core.config.WorkspaceConfig;
 import org.apache.jackrabbit.core.nodetype.NodeDefinitionImpl;
@@ -35,6 +36,9 @@
 import org.apache.jackrabbit.core.xml.ImportHandler;
 import org.apache.jackrabbit.core.xml.SessionImporter;
 import org.apache.jackrabbit.core.xml.SysViewSAXEventGenerator;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.Path;
 import org.apache.log4j.Logger;
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java Mon Jul  4 07:52:19 2005
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.core;
 
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.config.WorkspaceConfig;
 import org.apache.jackrabbit.core.lock.LockManager;
 import org.apache.jackrabbit.core.observation.ObservationManagerFactory;
@@ -30,6 +31,8 @@
 import org.apache.jackrabbit.core.xml.ImportHandler;
 import org.apache.jackrabbit.core.xml.Importer;
 import org.apache.jackrabbit.core.xml.WorkspaceImporter;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.Path;
 import org.apache.log4j.Logger;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/XASessionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/XASessionImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/XASessionImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/XASessionImpl.java Mon Jul  4 07:52:19 2005
@@ -16,16 +16,6 @@
  */
 package org.apache.jackrabbit.core;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.jcr.AccessDeniedException;
-import javax.jcr.RepositoryException;
-import javax.security.auth.Subject;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
 import org.apache.jackrabbit.core.config.WorkspaceConfig;
 import org.apache.jackrabbit.core.observation.EventStateCollection;
 import org.apache.jackrabbit.core.security.AuthContext;
@@ -33,6 +23,15 @@
 import org.apache.jackrabbit.core.state.TransactionException;
 import org.apache.jackrabbit.core.state.TransactionListener;
 import org.apache.log4j.Logger;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
+import javax.security.auth.Subject;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Session extension that provides XA support.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java Mon Jul  4 07:52:19 2005
@@ -21,6 +21,8 @@
 import org.apache.jackrabbit.core.state.ItemStateManager;
 import org.apache.jackrabbit.core.state.NoSuchItemStateException;
 import org.apache.jackrabbit.core.state.NodeState;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import java.util.Iterator;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/BeanConfig.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/BeanConfig.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/BeanConfig.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/BeanConfig.java Mon Jul  4 07:52:19 2005
@@ -16,10 +16,10 @@
  */
 package org.apache.jackrabbit.core.config;
 
+import org.apache.commons.collections.BeanMap;
+
 import java.util.Iterator;
 import java.util.Properties;
-
-import org.apache.commons.collections.BeanMap;
 
 /**
  * Bean configuration class. BeanConfig instances contain the class name

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationEntityResolver.java Mon Jul  4 07:52:19 2005
@@ -16,12 +16,12 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * Entity resolver for Jackrabbit configuration files.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationParser.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationParser.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationParser.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/ConfigurationParser.java Mon Jul  4 07:52:19 2005
@@ -16,14 +16,6 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -31,6 +23,13 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
 
 /**
  * Configuration parser. This class is used to parse the repository and

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/RepositoryConfig.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/RepositoryConfig.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/RepositoryConfig.java Mon Jul  4 07:52:19 2005
@@ -16,13 +16,9 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import org.apache.jackrabbit.core.fs.FileSystem;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
@@ -31,10 +27,13 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.apache.jackrabbit.core.fs.FileSystem;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * Repository configuration. This configuration class is used to

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/SearchConfig.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/SearchConfig.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/SearchConfig.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/SearchConfig.java Mon Jul  4 07:52:19 2005
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import java.util.Properties;
-
 import org.apache.jackrabbit.core.fs.FileSystem;
+
+import java.util.Properties;
 
 /**
  * Search index configuration. This bean configuration class

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/VersioningConfig.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/VersioningConfig.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/VersioningConfig.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/config/VersioningConfig.java Mon Jul  4 07:52:19 2005
@@ -16,9 +16,9 @@
  */
 package org.apache.jackrabbit.core.config;
 
-import java.io.File;
-
 import org.apache.jackrabbit.core.fs.FileSystem;
+
+import java.io.File;
 
 /**
  * Versioning configuration. This configuration class is used to

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/FileSystemException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/FileSystemException.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/FileSystemException.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/FileSystemException.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.fs;
 
-import org.apache.jackrabbit.core.BaseException;
+import org.apache.jackrabbit.BaseException;
 
 /**
  * The <code>FileSystemException</code> ...

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/HandleMonitor.java Mon Jul  4 07:52:19 2005
@@ -16,16 +16,16 @@
  */
 package org.apache.jackrabbit.core.fs.local;
 
+import org.apache.jackrabbit.util.LazyFileInputStream;
 import org.apache.log4j.Logger;
-import org.apache.jackrabbit.core.util.LazyFileInputStream;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.io.InputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileDescriptor;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 
 /**
  * This Class implements a very simple open handle monitor for the local

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/fs/local/LocalFileSystem.java Mon Jul  4 07:52:19 2005
@@ -19,7 +19,7 @@
 import org.apache.jackrabbit.core.fs.FileSystem;
 import org.apache.jackrabbit.core.fs.FileSystemException;
 import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
-import org.apache.jackrabbit.core.util.LazyFileInputStream;
+import org.apache.jackrabbit.util.LazyFileInputStream;
 import org.apache.log4j.Logger;
 
 import java.io.File;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManager.java Mon Jul  4 07:52:19 2005
@@ -16,14 +16,14 @@
  */
 package org.apache.jackrabbit.core.lock;
 
-import org.apache.jackrabbit.core.Path;
 import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.SessionImpl;
+import org.apache.jackrabbit.name.Path;
 
-import javax.jcr.lock.LockException;
-import javax.jcr.lock.Lock;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.lock.Lock;
+import javax.jcr.lock.LockException;
 
 /**
  * Defines the functionality needed for locking and unlocking nodes.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Mon Jul  4 07:52:19 2005
@@ -16,36 +16,36 @@
  */
 package org.apache.jackrabbit.core.lock;
 
-import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NodeImpl;
-import org.apache.jackrabbit.core.Path;
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.commons.collections.map.LinkedMap;
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.MalformedPathException;
+import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.PathMap;
-import org.apache.jackrabbit.core.observation.SynchronousEventListener;
+import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.observation.EventImpl;
+import org.apache.jackrabbit.core.observation.SynchronousEventListener;
+import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.Path;
 import org.apache.log4j.Logger;
-import org.apache.commons.collections.map.LinkedMap;
 
-import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Node;
+import javax.jcr.lock.Lock;
+import javax.jcr.lock.LockException;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.io.File;
-import java.io.IOException;
 import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 
 /**

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java Mon Jul  4 07:52:19 2005
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.PropertyType;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidConstraintException.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.BaseException;
+import org.apache.jackrabbit.BaseException;
 
 /**
  * The <code>InvalidConstraintException</code> ...

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/InvalidNodeTypeDefException.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.BaseException;
+import org.apache.jackrabbit.BaseException;
 
 /**
  * The <code>NodeTypeConflictException</code> ...

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDef.java Mon Jul  4 07:52:19 2005
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.name.QName;
 
 /**
  * <code>ItemDef</code> is the internal representation of

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 
 import javax.jcr.version.OnParentVersionAction;
 

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java Mon Jul  4 07:52:19 2005
@@ -16,14 +16,14 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
+import javax.jcr.nodetype.ItemDefinition;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.ItemDefinition;
 
 /**
  * This class implements the <code>ItemDefinition</code> interface.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDef.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDef.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDef.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 
 /**
  * <code>NodeDef</code> is the internal representation of

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefId.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefId.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefId.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefId.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 
 import java.io.Serializable;
 import java.util.TreeSet;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java Mon Jul  4 07:52:19 2005
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.name.QName;
 
 import java.util.Arrays;
 

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java Mon Jul  4 07:52:19 2005
@@ -16,14 +16,14 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.Constants;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
 
 /**
  * This class implements the <code>NodeDefinition</code> interface.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeConflictException.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.BaseException;
+import org.apache.jackrabbit.BaseException;
 
 /**
  * The <code>NodeTypeConflictException</code> ...

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java Mon Jul  4 07:52:19 2005
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 
 import javax.jcr.PropertyType;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Arrays;
 
 /**
  * A <code>NodeTypeDef</code> holds the definition of a node type.

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java Mon Jul  4 07:52:19 2005
@@ -16,19 +16,18 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
+import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader;
+import org.apache.jackrabbit.core.nodetype.xml.NodeTypeWriter;
+import org.apache.jackrabbit.name.QName;
+
+import javax.jcr.NamespaceRegistry;
+import javax.jcr.RepositoryException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-
-import javax.jcr.NamespaceRegistry;
-import javax.jcr.RepositoryException;
-
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.nodetype.xml.NodeTypeReader;
-import org.apache.jackrabbit.core.nodetype.xml.NodeTypeWriter;
 
 /**
  * <code>NodeTypeDefStore</code> ...

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java Mon Jul  4 07:52:19 2005
@@ -16,13 +16,13 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.BaseException;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
+import org.apache.jackrabbit.BaseException;
 import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
 import org.apache.log4j.Logger;
 
 import javax.jcr.PropertyType;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Mon Jul  4 07:52:19 2005
@@ -17,11 +17,11 @@
 package org.apache.jackrabbit.core.nodetype;
 
 import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.util.IteratorHelper;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.util.IteratorHelper;
 import org.apache.log4j.Logger;
 
 import javax.jcr.RepositoryException;
@@ -32,8 +32,8 @@
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * A <code>NodeTypeManagerImpl</code> implements a session dependant

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java Mon Jul  4 07:52:19 2005
@@ -17,12 +17,12 @@
 package org.apache.jackrabbit.core.nodetype;
 
 import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.jackrabbit.core.Constants;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.Constants;
 import org.apache.jackrabbit.core.fs.FileSystem;
 import org.apache.jackrabbit.core.fs.FileSystemException;
 import org.apache.jackrabbit.core.fs.FileSystemResource;
+import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
 import javax.jcr.NamespaceRegistry;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistryListener.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistryListener.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistryListener.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistryListener.java Mon Jul  4 07:52:19 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.name.QName;
 
 /**
  * The <code>NodeTypeRegistryListener</code> interface allows an implementing

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropDefImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropDefImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropDefImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropDefImpl.java Mon Jul  4 07:52:19 2005
@@ -16,8 +16,8 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.QName;
 
 import javax.jcr.PropertyType;
 import java.util.Arrays;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java Mon Jul  4 07:52:19 2005
@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.core.nodetype;
 
 import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.jackrabbit.core.NamespaceResolver;
+import org.apache.jackrabbit.name.NamespaceResolver;
 import org.apache.log4j.Logger;
 
 import javax.jcr.RepositoryException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java Mon Jul  4 07:52:19 2005
@@ -16,16 +16,16 @@
  */
 package org.apache.jackrabbit.core.nodetype;
 
-import org.apache.jackrabbit.core.IllegalNameException;
-import org.apache.jackrabbit.core.MalformedPathException;
-import org.apache.jackrabbit.core.NamespaceResolver;
-import org.apache.jackrabbit.core.NoPrefixDeclaredException;
-import org.apache.jackrabbit.core.Path;
-import org.apache.jackrabbit.core.QName;
-import org.apache.jackrabbit.core.UnknownPrefixException;
-import org.apache.jackrabbit.core.value.DateValue;
-import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.core.value.BLOBFileValue;
+import org.apache.jackrabbit.core.value.InternalValue;
+import org.apache.jackrabbit.name.IllegalNameException;
+import org.apache.jackrabbit.name.MalformedPathException;
+import org.apache.jackrabbit.name.NamespaceResolver;
+import org.apache.jackrabbit.name.NoPrefixDeclaredException;
+import org.apache.jackrabbit.name.Path;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.name.UnknownPrefixException;
+import org.apache.jackrabbit.value.DateValue;
 import org.apache.log4j.Logger;
 
 import javax.jcr.PropertyType;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateManager.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateManager.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateManager.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateManager.java Mon Jul  4 07:52:19 2005
@@ -16,24 +16,24 @@
  */
 package org.apache.jackrabbit.core.nodetype.virtual;
 
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistryListener;
-import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
-import org.apache.jackrabbit.core.QName;
+import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.PropertyImpl;
 import org.apache.jackrabbit.core.SessionImpl;
-import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
+import org.apache.jackrabbit.core.nodetype.NodeTypeImpl;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistryListener;
 import org.apache.jackrabbit.core.observation.DelegatingObservationDispatcher;
 import org.apache.jackrabbit.core.observation.EventState;
+import org.apache.jackrabbit.core.virtual.VirtualItemStateProvider;
+import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
 
-import javax.jcr.RepositoryException;
-import javax.jcr.PropertyIterator;
 import javax.jcr.NodeIterator;
-import java.util.List;
+import javax.jcr.PropertyIterator;
+import javax.jcr.RepositoryException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * This Class implements a workaround helper for populating observation

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java Mon Jul  4 07:52:19 2005
@@ -16,21 +16,21 @@
  */
 package org.apache.jackrabbit.core.nodetype.virtual;
 
-import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.nodetype.ItemDef;
 import org.apache.jackrabbit.core.nodetype.NodeDef;
+import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
 import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.nodetype.PropDef;
 import org.apache.jackrabbit.core.nodetype.ValueConstraint;
-import org.apache.jackrabbit.core.nodetype.NodeDefId;
 import org.apache.jackrabbit.core.state.ItemStateException;
 import org.apache.jackrabbit.core.state.NoSuchItemStateException;
-import org.apache.jackrabbit.core.util.uuid.UUID;
+import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.jackrabbit.core.virtual.AbstractVISProvider;
 import org.apache.jackrabbit.core.virtual.VirtualNodeState;
+import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.uuid.UUID;
 
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;

Modified: incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java?rev=209089&r1=209088&r2=209089&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java (original)
+++ incubator/jackrabbit/trunk/core/src/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java Mon Jul  4 07:52:19 2005
@@ -16,14 +16,13 @@
  */
 package org.apache.jackrabbit.core.nodetype.xml;
 
-import java.util.Enumeration;
-import java.util.Properties;
+import org.apache.jackrabbit.name.NamespaceResolver;
 
 import javax.jcr.NamespaceException;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.RepositoryException;
-
-import org.apache.jackrabbit.core.NamespaceResolver;
+import java.util.Enumeration;
+import java.util.Properties;
 
 /**
  * A simple namespace resolver implementation, that uses the additional



Mime
View raw message