svn commit: r1550453 - in /jackrabbit/oak/trunk/oak-jcr/src/test: java/org/apache/jackrabbit/oak/jcr/ java/org/apache/jackrabbit/oak/jcr/tck/ resources/

[mr...@apache.org]

Author: mreutegg
Date: Thu Dec 12 17:02:35 2013
New Revision: 1550453

URL: http://svn.apache.org/r1550453
Log:
OAK-1282: Clean up RepositoryStub classes
- remove redundant OakRepositoryStub and OakRepositoryStubBase (use OakTarMKRepositoryStub instead)
- add a repositoryHelperPool.properties config to limit the pool to one stub instance
- switch to OakTarMKRepositoryStub in repositoryStubImpl.properties

Added:
    jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryHelperPool.properties   (with props)
Removed:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStub.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakRepositoryStubBase.java
Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
    jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java?rev=1550453&r1=1550452&r2=1550453&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java Thu Dec 12 17:02:35 2013
@@ -24,7 +24,6 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.jackrabbit.oak.jcr.OakMongoMKRepositoryStub;
-import org.apache.jackrabbit.oak.jcr.OakRepositoryStub;
 import org.apache.jackrabbit.oak.jcr.OakSegmentMKRepositoryStub;
 import org.apache.jackrabbit.oak.jcr.OakTarMKRepositoryStub;
 import org.apache.jackrabbit.test.RepositoryHelper;
@@ -48,7 +47,6 @@ public abstract class TCKBase extends Te
 
     public TCKBase(String name) {
         super(name);
-        Setup.wrap(this, OakRepositoryStub.class.getName());
         Setup.wrap(this, OakTarMKRepositoryStub.class.getName());
         if (OakSegmentMKRepositoryStub.isAvailable()) {
             //Setup.wrap(this, OakSegmentMKRepositoryStub.class.getName());

Added: jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryHelperPool.properties
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryHelperPool.properties?rev=1550453&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryHelperPool.properties (added)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryHelperPool.properties Thu Dec 12 17:02:35 2013
@@ -0,0 +1,17 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You 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.
+
+# first helper uses default values
+helper.0.=

Propchange: jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryHelperPool.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties?rev=1550453&r1=1550452&r2=1550453&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/resources/repositoryStubImpl.properties Thu Dec 12 17:02:35 2013
@@ -14,7 +14,7 @@
 #  limitations under the License.
 
 # Stub implementation class
-javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.oak.jcr.OakRepositoryStub
+javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.oak.jcr.OakTarMKRepositoryStub
 
 # credential configuration
 javax.jcr.tck.superuser.name=admin