You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2012/05/02 19:08:38 UTC
svn commit: r1333112 - in /jackrabbit/oak/trunk: oak-it/jcr/pom.xml
oak-it/jcr/src/test/resources/repositoryStubImpl.properties
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryFactory.java
Author: reschke
Date: Wed May 2 17:08:37 2012
New Revision: 1333112
URL: http://svn.apache.org/viewvc?rev=1333112&view=rev
Log:
OAK-6: RepositoryFactory: fix config, handle null parameter, update test exclusions
Modified:
jackrabbit/oak/trunk/oak-it/jcr/pom.xml
jackrabbit/oak/trunk/oak-it/jcr/src/test/resources/repositoryStubImpl.properties
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryFactory.java
Modified: jackrabbit/oak/trunk/oak-it/jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/jcr/pom.xml?rev=1333112&r1=1333111&r2=1333112&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/jcr/pom.xml Wed May 2 17:08:37 2012
@@ -97,7 +97,6 @@ org.apache.jackrabbit.test.api.SessionRe
org.apache.jackrabbit.test.api.HasPermissionTest
org.apache.jackrabbit.test.api.WorkspaceTest
org.apache.jackrabbit.test.api.ShareableNodeTest
-org.apache.jackrabbit.test.api.RepositoryFactoryTest
org.apache.jackrabbit.test.api.LifecycleTest
org.apache.jackrabbit.test.api.query
org.apache.jackrabbit.test.api.query.qom
Modified: jackrabbit/oak/trunk/oak-it/jcr/src/test/resources/repositoryStubImpl.properties
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/jcr/src/test/resources/repositoryStubImpl.properties?rev=1333112&r1=1333111&r2=1333112&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/jcr/src/test/resources/repositoryStubImpl.properties (original)
+++ jackrabbit/oak/trunk/oak-it/jcr/src/test/resources/repositoryStubImpl.properties Wed May 2 17:08:37 2012
@@ -48,7 +48,7 @@ javax.jcr.tck.workspacename=default
javax.jcr.tck.holdname=hold
# repository factory class name
-javax.jcr.tck.repository.factory=org.apache.jackrabbit.core.RepositoryFactoryImpl
+javax.jcr.tck.repository.factory=org.apache.jackrabbit.oak.jcr.OakRepositoryFactory
# sample for per test case config overriding
# Test class: AddNodeText
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryFactory.java?rev=1333112&r1=1333111&r2=1333112&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryFactory.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/OakRepositoryFactory.java Wed May 2 17:08:37 2012
@@ -31,9 +31,8 @@ public class OakRepositoryFactory implem
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
- public Repository getRepository(Map parameters)
- throws RepositoryException {
- Object value = parameters.get(REPOSITORY_URI);
+ public Repository getRepository(Map parameters) throws RepositoryException {
+ Object value = parameters == null ? null : parameters.get(REPOSITORY_URI);
if (value != null) {
try {
URI uri = new URI(value.toString());