You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2008/03/18 15:04:51 UTC

svn commit: r638367 - in /jackrabbit/trunk/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/ main/resources/org/apache/jackrabbit/core/ test/java/org/apache/jackrabbit/core/config/ test/resources/org/apache/jackrabbit/core/config/

Author: angela
Date: Tue Mar 18 07:04:48 2008
New Revision: 638367

URL: http://svn.apache.org/viewvc?rev=638367&view=rev
Log:
JCR-1306: Reduce number of different repository.xml present with jackrabbit-core

Removed:
    jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/test-repository.xml
    jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/config/repository.xml
Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TestRepository.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TestRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TestRepository.java?rev=638367&r1=638366&r2=638367&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TestRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TestRepository.java Tue Mar 18 07:04:48 2008
@@ -42,7 +42,7 @@
      * The test repository configuration is located inside the Jackrabbit
      * jar file to enforce a standard test environment.
      */
-    private static final String CONF_RESOURCE = "test-repository.xml";
+    private static final String CONF_RESOURCE = "repository.xml";
 
     /**
      * Name of the system property that can be used to override the

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java?rev=638367&r1=638366&r2=638367&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java Tue Mar 18 07:04:48 2008
@@ -60,8 +60,7 @@
 
         // Copy the repository configuration file in place
         ClassLoader loader = getClass().getClassLoader();
-        InputStream input = loader.getResourceAsStream(
-                "org/apache/jackrabbit/core/config/repository.xml");
+        InputStream input = loader.getResourceAsStream("org/apache/jackrabbit/core/repository.xml");
         try {
             OutputStream output = new FileOutputStream(REPOSITORY_XML);
             try {
@@ -189,9 +188,8 @@
         VersioningConfig vc = config.getVersioningConfig();
         assertEquals(new File(REPOSITORY_HOME, "version"), vc.getHomeDir());
         assertEquals(
-                "org.apache.jackrabbit.core.persistence.obj.ObjectPersistenceManager",
+                "org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager",
                 vc.getPersistenceManagerConfig().getClassName());
-        assertTrue(vc.getPersistenceManagerConfig().getParameters().isEmpty());
     }
 
     public void testInit() throws Exception {