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

svn commit: r769038 - in /jackrabbit/commons/ocm/trunk: nodemanagement/src/test/config/ nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/ src/test/config/ src/test/config/jackrabbit/ src/test/java/org/apache/jackrabbit/ocm/nodemana...

Author: jukka
Date: Mon Apr 27 16:03:44 2009
New Revision: 769038

URL: http://svn.apache.org/viewvc?rev=769038&view=rev
Log:
OCM-1: Move jackrabbit-ocm to JCR Commons

Merge the nodemanagement tests to the main OCM codebase.

Added:
    jackrabbit/commons/ocm/trunk/src/test/config/   (props changed)
      - copied from r768978, jackrabbit/commons/ocm/trunk/nodemanagement/src/test/config/
    jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/   (props changed)
      - copied from r768978, jackrabbit/commons/ocm/trunk/nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/
Removed:
    jackrabbit/commons/ocm/trunk/nodemanagement/src/test/config/
    jackrabbit/commons/ocm/trunk/nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/
Modified:
    jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/repository.xml
    jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java

Propchange: jackrabbit/commons/ocm/trunk/src/test/config/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 27 16:03:44 2009
@@ -0,0 +1 @@
+/jackrabbit/branches/1.3/jackrabbit-ocm/nodemanagement/src/test/config:631261

Modified: jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/repository.xml?rev=769038&r1=768978&r2=769038&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/repository.xml (original)
+++ jackrabbit/commons/ocm/trunk/src/test/config/jackrabbit/repository.xml Mon Apr 27 16:03:44 2009
@@ -15,8 +15,8 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
-                            "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
 <!-- Example Repository Configuration File
      Used by
      - org.apache.jackrabbit.core.config.RepositoryConfigTest.java

Propchange: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 27 16:03:44 2009
@@ -0,0 +1 @@
+/jackrabbit/branches/1.3/jackrabbit-ocm/nodemanagement/src/test/java/org/apache/jackrabbit/ocm/nodemanagement:631261

Modified: jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java?rev=769038&r1=768978&r2=769038&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java (original)
+++ jackrabbit/commons/ocm/trunk/src/test/java/org/apache/jackrabbit/ocm/nodemanagement/TestBase.java Mon Apr 27 16:03:44 2009
@@ -28,7 +28,7 @@
  *
  * @author Oliver Kiessler
  */
-public class TestBase  extends TestCase
+public abstract class TestBase  extends TestCase
 {
     protected static Session session;
 
@@ -44,7 +44,7 @@
             RepositoryConfiguration configuration = new RepositoryConfiguration();
             configuration.setConfigurationFile("./src/test/config/jackrabbit/repository.xml");
             configuration.setRepositoryName("repositoryTest");
-            configuration.setRepositoryPath("./target/repository");
+            configuration.setRepositoryPath("./target/nodemanagement-repository");
             session = RepositorySessionFactory.getSession(RepositorySessionFactory.JACKRABBIT, "superuser", "superuser", configuration);
 
             /*RepositoryConfiguration configuration = new RepositoryConfiguration();