svn commit: r590014 [11/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/jo...

[an...@apache.org]

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java Tue Oct 30 03:02:41 2007
@@ -21,7 +21,7 @@
 import junit.framework.TestCase;
 
 import org.apache.jackrabbit.core.NodeId;
-import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.uuid.UUID;
 
 public class VersionIteratorImplTest extends TestCase {
@@ -48,11 +48,11 @@
 
         public Calendar getCreated() {return null;}
         public InternalFrozenNode getFrozenNode() {return null;}
-        public QName[] getLabels() {return null;}
-        public QName getName() {return null;}
+        public Name[] getLabels() {return null;}
+        public Name getName() {return null;}
         public InternalVersion[] getPredecessors() {return null;}
         public InternalVersionHistory getVersionHistory() {return null;}
-        public boolean hasLabel(QName label) {return false;}
+        public boolean hasLabel(Name label) {return false;}
         public boolean isMoreRecent(InternalVersion v) {return false;}
         public boolean isRootVersion() {return false;}
         public InternalVersionItem getParent() {return null;}

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/ExportDocViewTestData.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/ExportDocViewTestData.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/ExportDocViewTestData.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/ExportDocViewTestData.java Tue Oct 30 03:02:41 2007
@@ -43,29 +43,29 @@
      */
     private static final String ENCODING = "UTF-8";
     /**
-     * Resolved QName for jcr:encoding
+     * Resolved Name for jcr:encoding
      */
     private String jcrEncoding;
     /**
-     * Resolved QName for jcr:mimeType
+     * Resolved Name for jcr:mimeType
      */
     private String jcrMimeType;
     /**
-     * Resolved QName for jcr:lastModified
+     * Resolved Name for jcr:lastModified
      */
     private String jcrLastModified;
 
 
     /**
-     * Resolved QName for nt:unstructured
+     * Resolved Name for nt:unstructured
      */
     private String ntUnstructured;
     /**
-     * Resolved QName for jcr:xmltext
+     * Resolved Name for jcr:xmltext
      */
     private String xmlText;
     /**
-     * Resolved QName for jcr:xmlcharacters
+     * Resolved Name for jcr:xmlcharacters
      */
     private String xmlCharacters;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/NodeTestData.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/NodeTestData.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/NodeTestData.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/NodeTestData.java Tue Oct 30 03:02:41 2007
@@ -39,19 +39,19 @@
     /** The encoding for the test resource */
     private static final String ENCODING = "UTF-8";
 
-    /** Resolved QName for nt:resource */
+    /** Resolved Name for nt:resource */
     private String ntResource;
 
-    /** Resolved QName for jcr:encoding */
+    /** Resolved Name for jcr:encoding */
     private String jcrEncoding;
 
-    /** Resolved QName for jcr:mimeType */
+    /** Resolved Name for jcr:mimeType */
     private String jcrMimeType;
 
-    /** Resolved QName for jcr:data */
+    /** Resolved Name for jcr:data */
     private String jcrData;
 
-    /** Resolved QName for jcr:lastModified */
+    /** Resolved Name for jcr:lastModified */
     private String jcrLastModified;
 
     /**

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RepositorySetup.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RepositorySetup.java?rev=590014&r1=590013&r2=590014&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RepositorySetup.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RepositorySetup.java Tue Oct 30 03:02:41 2007
@@ -204,8 +204,6 @@
                     throw new RepositoryException(e.getMessage());
                 } catch (InvalidNodeTypeDefException e) {
                     throw new RepositoryException(e.getMessage());
-                } catch (org.apache.jackrabbit.name.NameException e) {
-                    throw new RepositoryException(e.getMessage());
                 } finally {
                     try {
                         is.close();