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 an...@apache.org on 2013/04/03 14:18:17 UTC
svn commit: r1463955 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/
oak-core/src/test/java/org/apache/jackrabbit/oak/
oak-core/src/test/java/org/apache/jackrabbit/oak...
Author: angela
Date: Wed Apr 3 12:18:16 2013
New Revision: 1463955
URL: http://svn.apache.org/r1463955
Log:
OAK-737 : Remove default security provider in Oak.java
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/ContentSessionTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/QueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/RootTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerOursTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTheirsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableTreeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeLocationTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java
jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Wed Apr 3 12:18:16 2013
@@ -48,7 +48,6 @@ import org.apache.jackrabbit.oak.spi.lif
import org.apache.jackrabbit.oak.spi.lifecycle.WorkspaceInitializer;
import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -85,8 +84,7 @@ public class Oak {
private List<EditorProvider> editorProviders = newArrayList();
- // TODO: review if we really want to have the OpenSecurityProvider as default.
- private SecurityProvider securityProvider = new OpenSecurityProvider();
+ private SecurityProvider securityProvider;
private String defaultWorkspaceName = DEFAULT_WORKSPACE_NAME;
@@ -209,7 +207,7 @@ public class Oak {
@Nonnull
public Oak with(@Nonnull SecurityProvider securityProvider) {
- this.securityProvider = securityProvider;
+ this.securityProvider = checkNotNull(securityProvider);
initializers.add(securityProvider.getPrivilegeConfiguration().getPrivilegeInitializer());
return this;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/Activator.java Wed Apr 3 12:18:16 2013
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.core.Co
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.osgi.OsgiRepositoryInitializer.RepositoryInitializerObserver;
import org.apache.jackrabbit.oak.plugins.nodetype.DefaultTypeEditor;
+import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
import org.apache.jackrabbit.oak.spi.lifecycle.OakInitializer;
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -55,8 +56,7 @@ public class Activator implements Bundle
private final OsgiRepositoryInitializer repositoryInitializerTracker = new OsgiRepositoryInitializer();
- private final Map<ServiceReference, ServiceRegistration> services =
- new HashMap<ServiceReference, ServiceRegistration>();
+ private final Map<ServiceReference, ServiceRegistration> services = new HashMap<ServiceReference, ServiceRegistration>();
//----------------------------------------------------< BundleActivator >---
@@ -100,9 +100,10 @@ public class Activator implements Bundle
new Properties()));
} else if (service instanceof NodeStore) {
NodeStore store = (NodeStore) service;
- OakInitializer.initialize(
- store, repositoryInitializerTracker, indexHookProvider);
+ OakInitializer.initialize(store, repositoryInitializerTracker, indexHookProvider);
Oak oak = new Oak(store)
+ // FIXME: proper osgi setup for security provider (see OAK-17 and sub-tasks)
+ .with(new SecurityProviderImpl())
// TODO: DefaultTypeEditor is JCR specific and does not belong here
.with(new DefaultTypeEditor())
.with(validatorProvider)
@@ -131,8 +132,7 @@ public class Activator implements Bundle
@Override
public void newRepositoryInitializer(RepositoryInitializer ri) {
- List<ServiceReference> mkRefs = new ArrayList<ServiceReference>(
- services.keySet());
+ List<ServiceReference> mkRefs = new ArrayList<ServiceReference>(services.keySet());
for (ServiceReference ref : mkRefs) {
Object service = context.getService(ref);
if (service instanceof ContentRepositoryImpl) {
Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java?rev=1463955&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java Wed Apr 3 12:18:16 2013
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+package org.apache.jackrabbit.oak;
+
+import org.apache.jackrabbit.oak.api.ContentRepository;
+import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+
+/**
+ * OakBaseTest... TODO
+ */
+public abstract class OakBaseTest {
+
+ protected ContentRepository createContentRepository() {
+ return new Oak().with(new OpenSecurityProvider()).createContentRepository();
+ }
+
+ protected ContentSession createContentSession() {
+ return new Oak().with(new OpenSecurityProvider()).createContentSession();
+ }
+}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java Wed Apr 3 12:18:16 2013
@@ -20,6 +20,7 @@ import javax.jcr.NoSuchWorkspaceExceptio
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -32,7 +33,7 @@ public class OakTest {
@Test
public void testWithDefaultWorkspaceName() throws Exception {
- ContentRepository repo = new Oak().with("test").createContentRepository();
+ ContentRepository repo = new Oak().with("test").with(new OpenSecurityProvider()).createContentRepository();
String[] valid = new String[] {null, "test"};
for (String wspName : valid) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/ContentSessionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/ContentSessionTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/ContentSessionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/ContentSessionTest.java Wed Apr 3 12:18:16 2013
@@ -23,18 +23,18 @@ import java.io.IOException;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.login.LoginException;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class ContentSessionTest {
+public class ContentSessionTest extends OakBaseTest {
private ContentRepository repository;
@Before
public void setUp() {
- repository = new Oak().createContentRepository();
+ repository = createContentRepository();
}
@After
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/QueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/QueryTest.java Wed Apr 3 12:18:16 2013
@@ -28,6 +28,7 @@ import javax.jcr.query.Query;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,7 +36,7 @@ import org.junit.Test;
import static junit.framework.Assert.assertEquals;
/**
- * <code>QueryTest</code> contains query related tests.
+ * {@code QueryTest} contains query related tests.
*/
public class QueryTest {
@@ -43,7 +44,7 @@ public class QueryTest {
@Before
public void setUp() {
- repository = new Oak().with(new InitialContent()).createContentRepository();
+ repository = new Oak().with(new OpenSecurityProvider()).with(new InitialContent()).createContentRepository();
}
@After
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/RootTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/RootTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/RootTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/RootTest.java Wed Apr 3 12:18:16 2013
@@ -18,15 +18,16 @@
*/
package org.apache.jackrabbit.oak.api;
-import static org.apache.jackrabbit.oak.OakAssert.assertSequence;
-
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.plugins.commit.ConflictValidator;
import org.apache.jackrabbit.oak.plugins.commit.JcrConflictHandler;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.apache.jackrabbit.oak.OakAssert.assertSequence;
+
/**
* Contains tests related to {@link Root}
*/
@@ -37,6 +38,7 @@ public class RootTest {
@Before
public void setUp() {
repository = new Oak()
+ .with(new OpenSecurityProvider())
.with(JcrConflictHandler.JCR_CONFLICT_HANDLER)
.with(new ConflictValidator())
.createContentRepository();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/TreeTest.java Wed Apr 3 12:18:16 2013
@@ -18,11 +18,6 @@
*/
package org.apache.jackrabbit.oak.api;
-import static org.apache.jackrabbit.oak.OakAssert.assertSequence;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.util.Set;
import com.google.common.collect.Sets;
@@ -30,12 +25,18 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler;
import org.apache.jackrabbit.oak.plugins.commit.ChildOrderConflictHandler;
import org.apache.jackrabbit.oak.plugins.commit.ConflictValidator;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import static org.apache.jackrabbit.oak.OakAssert.assertSequence;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Contains tests related to {@link Tree}
*/
@@ -46,6 +47,7 @@ public class TreeTest {
@Before
public void setUp() {
repository = new Oak()
+ .with(new OpenSecurityProvider())
.with(new ChildOrderConflictHandler(new AnnotatingConflictHandler()) {
/**
@@ -54,8 +56,8 @@ public class TreeTest {
*/
@Override
public Resolution deleteChangedNode(NodeBuilder parent,
- String name,
- NodeState theirs) {
+ String name,
+ NodeState theirs) {
return Resolution.OURS;
}
})
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/api/UniquePropertyTest.java Wed Apr 3 12:18:16 2013
@@ -22,6 +22,7 @@ import org.apache.jackrabbit.JcrConstant
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.util.NodeUtil;
import org.junit.Test;
@@ -36,6 +37,7 @@ public class UniquePropertyTest {
public void testUniqueness() throws CommitFailedException {
Root root = new Oak()
+ .with(new OpenSecurityProvider())
.with(new Property2IndexHookProvider())
.with(new InitialContent()).createRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerOursTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerOursTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerOursTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerOursTest.java Wed Apr 3 12:18:16 2013
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.commit.DefaultConflictHandler;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -45,6 +46,7 @@ public class DefaultConflictHandlerOursT
@Before
public void setUp() throws CommitFailedException {
ContentSession session = new Oak()
+ .with(new OpenSecurityProvider())
.with(DefaultConflictHandler.OURS)
.createContentSession();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTheirsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTheirsTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTheirsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTheirsTest.java Wed Apr 3 12:18:16 2013
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.plugins.commit.DefaultConflictHandler;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -45,6 +46,7 @@ public class DefaultConflictHandlerTheir
@Before
public void setUp() throws CommitFailedException {
ContentSession session = new Oak()
+ .with(new OpenSecurityProvider())
.with(DefaultConflictHandler.THEIRS)
.createContentSession();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java Wed Apr 3 12:18:16 2013
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.core;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
@@ -27,13 +27,13 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
-public class ImmutableRootTest {
+public class ImmutableRootTest extends OakBaseTest {
private ImmutableRoot root;
@Before
public void setUp() throws CommitFailedException {
- ContentSession session = new Oak().createContentSession();
+ ContentSession session = createContentSession();
// Add test content
Root root = session.getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableTreeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableTreeTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableTreeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableTreeTest.java Wed Apr 3 12:18:16 2013
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.core;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
@@ -32,13 +32,13 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class ImmutableTreeTest {
+public class ImmutableTreeTest extends OakBaseTest {
private Root root;
@Before
public void setUp() throws CommitFailedException {
- ContentSession session = new Oak().createContentSession();
+ ContentSession session = createContentSession();
// Add test content
root = session.getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/LargeMoveTestIT.java Wed Apr 3 12:18:16 2013
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.core;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
@@ -32,14 +32,14 @@ import org.junit.Test;
* Test case for asserting large moves don't run out of memory.
* See OAK-463, OAK-464
*/
-public class LargeMoveTestIT {
+public class LargeMoveTestIT extends OakBaseTest {
private ContentSession session;
private String treeAPath;
private String treeBPath;
@Before
public void setUp() throws CommitFailedException {
- session = new Oak().createContentSession();
+ session = createContentSession();
// Add test content
Root root = session.getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplTest.java Wed Apr 3 12:18:16 2013
@@ -18,18 +18,10 @@
*/
package org.apache.jackrabbit.oak.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.util.ArrayList;
import java.util.List;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -41,13 +33,21 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class RootImplTest {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class RootImplTest extends OakBaseTest {
private ContentSession session;
@Before
public void setUp() throws CommitFailedException {
- session = new Oak().createContentSession();
+ session = createContentSession();
// Add test content
Root root = session.getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeImplTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeImplTest.java Wed Apr 3 12:18:16 2013
@@ -30,6 +30,7 @@ import java.util.Set;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -44,13 +45,13 @@ import org.junit.Test;
/**
* TreeImplTest...
*/
-public class TreeImplTest {
+public class TreeImplTest extends OakBaseTest {
private Root root;
@Before
public void setUp() throws CommitFailedException {
- ContentSession session = new Oak().createContentSession();
+ ContentSession session = createContentSession();
// Add test content
root = session.getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeLocationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeLocationTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeLocationTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/TreeLocationTest.java Wed Apr 3 12:18:16 2013
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.core;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
@@ -34,13 +34,13 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-public class TreeLocationTest {
+public class TreeLocationTest extends OakBaseTest {
private Root root;
@Before
public void setUp() throws CommitFailedException {
- ContentSession session = new Oak().createContentSession();
+ ContentSession session = createContentSession();
// Add test content
root = session.getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManagerTest.java Wed Apr 3 12:18:16 2013
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.core.IdentifierManager;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Before;
import org.junit.Test;
@@ -54,6 +55,7 @@ public class IdentifierManagerTest {
@Before
public void setUp() throws CommitFailedException {
root = new Oak()
+ .with(new OpenSecurityProvider())
.with(new InitialContent())
.createContentSession().getLatestRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java Wed Apr 3 12:18:16 2013
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Ignore;
import org.junit.Test;
@@ -40,6 +41,7 @@ public class QueryTest extends AbstractQ
PropertyIndexer indexer = new PropertyIndexer(mk.getIndexer());
return new Oak(mk)
+ .with(new OpenSecurityProvider())
.with(new InitialContent())
.with((QueryIndexProvider) indexer)
.with((CommitHook) indexer)
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexQueryTest.java Wed Apr 3 12:18:16 2013
@@ -20,6 +20,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Ignore;
import org.junit.Test;
@@ -32,6 +33,7 @@ public class Property2IndexQueryTest ext
@Override
protected ContentRepository createRepository() {
return new Oak().with(new InitialContent())
+ .with(new OpenSecurityProvider())
.with(new Property2IndexProvider())
.with(new Property2IndexHookProvider())
.createContentRepository();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java Wed Apr 3 12:18:16 2013
@@ -16,11 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.property;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -28,9 +23,15 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Ignore;
import org.junit.Test;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
+
/**
* Tests the query engine using the default index implementation: the
* {@link PropertyIndexProvider}
@@ -42,6 +43,7 @@ public class PropertyIndexQueryTest exte
protected ContentRepository createRepository() {
return new Oak()
.with(new InitialContent())
+ .with(new OpenSecurityProvider())
.with(new PropertyIndexProvider())
.with(new PropertyIndexHookProvider())
.createContentRepository();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/name/ReadWriteNamespaceRegistryTest.java Wed Apr 3 12:18:16 2013
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import javax.jcr.NamespaceRegistry;
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -26,11 +26,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
-public class ReadWriteNamespaceRegistryTest{
+public class ReadWriteNamespaceRegistryTest extends OakBaseTest {
@Test
public void testMappings() throws Exception {
- final ContentSession session = new Oak().createContentSession();
+ final ContentSession session = createContentSession();
NamespaceRegistry r = new ReadWriteNamespaceRegistry() {
@Override
protected Tree getReadTree() {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorTest.java Wed Apr 3 12:18:16 2013
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Test;
/**
@@ -31,6 +32,7 @@ public class TypeEditorTest {
@Test
public void ignoreHidden() throws CommitFailedException {
Oak oak = new Oak()
+ .with(new OpenSecurityProvider())
.with(new InitialContent())
.with(new TypeEditorProvider());
ContentSession session = oak.createContentSession();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexQueryTest.java Wed Apr 3 12:18:16 2013
@@ -17,6 +17,7 @@ import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
/**
* Tests the query engine using the default index implementation: the
@@ -27,6 +28,7 @@ public class TraversingIndexQueryTest ex
@Override
protected ContentRepository createRepository() {
return new Oak()
+ .with(new OpenSecurityProvider())
.with(new InitialContent())
.createContentRepository();
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java Wed Apr 3 12:18:16 2013
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.plugins.index.p2.Property2IndexHookProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.apache.jackrabbit.util.Text;
import org.junit.After;
@@ -56,6 +57,7 @@ public class UserProviderTest {
@Before
public void setUp() throws Exception {
root = new Oak()
+ .with(new OpenSecurityProvider())
.with(new InitialContent())
.with(new Property2IndexHookProvider())
.createRoot();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/util/JsopUtilTest.java Wed Apr 3 12:18:16 2013
@@ -16,22 +16,22 @@
*/
package org.apache.jackrabbit.oak.util;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-import static org.apache.jackrabbit.oak.api.Type.STRING;
-
-import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.query.JsopUtil;
import org.junit.Test;
-public class JsopUtilTest {
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static org.apache.jackrabbit.oak.api.Type.STRING;
+
+public class JsopUtilTest extends OakBaseTest {
@Test
public void test() throws Exception {
- Root root = new Oak().createRoot();
+ Root root = createContentSession().getLatestRoot();
Tree t = root.getTree("/");
assertFalse(t.hasChild("test"));
Modified: jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java (original)
+++ jackrabbit/oak/trunk/oak-http/src/main/java/org/apache/jackrabbit/oak/http/OakServlet.java Wed Apr 3 12:18:16 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map.Entry;
+import javax.jcr.GuestCredentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.login.LoginException;
import javax.servlet.ServletException;
@@ -64,7 +65,7 @@ public class OakServlet extends HttpServ
HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
try {
- ContentSession session = repository.login(null, null);
+ ContentSession session = repository.login(new GuestCredentials(), null);
try {
Root root = session.getLatestRoot();
request.setAttribute("root", root);
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java Wed Apr 3 12:18:16 2013
@@ -16,10 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.util.Iterator;
import org.apache.jackrabbit.oak.Oak;
@@ -28,9 +24,14 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.query.JsopUtil;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Ignore;
import org.junit.Test;
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
/**
* Tests the query engine using the default index implementation: the
* {@link LuceneIndexProvider}
@@ -47,6 +48,7 @@ public class LuceneIndexQueryTest extend
@Override
protected ContentRepository createRepository() {
return new Oak().with(new InitialContent())
+ .with(new OpenSecurityProvider())
.with(new LowCostLuceneIndexProvider())
.with(new LuceneIndexHookProvider())
.createContentRepository();
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Wed Apr 3 12:18:16 2013
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.run;
import java.io.InputStream;
import java.util.Properties;
import java.util.concurrent.Executors;
-
import javax.jcr.Repository;
import org.apache.jackrabbit.mk.api.MicroKernel;
@@ -37,7 +36,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.DefaultTypeEditor;
import org.apache.jackrabbit.oak.plugins.nodetype.RegistrationEditorProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.webdav.jcr.JCRWebdavServerServlet;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
@@ -160,8 +160,7 @@ public class Main {
}
private void addServlets(MicroKernel kernel, String path) {
- // TODO: review usage of opensecurity provider (using default will cause BasicServerTest to fail. usage of a:a credentials)
- SecurityProvider securityProvider = new OpenSecurityProvider();
+ SecurityProvider securityProvider = new SecurityProviderImpl();
ContentRepository repository = new Oak(kernel)
.with(JcrConflictHandler.JCR_CONFLICT_HANDLER)
.with(new ConflictValidatorProvider())
@@ -172,10 +171,10 @@ public class Main {
.with(new DefaultTypeEditor())
.with(new Property2IndexHookProvider())
.with(securityProvider)
+ .with(new InitialContent())
.createContentRepository();
- ServletHolder oak =
- new ServletHolder(new OakServlet(repository));
+ ServletHolder oak = new ServletHolder(new OakServlet(repository));
context.addServlet(oak, path + "/*");
final Repository jcrRepository = new RepositoryImpl(
Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/BasicServerTest.java Wed Apr 3 12:18:16 2013
@@ -59,7 +59,7 @@ public class BasicServerTest {
URL server = new URL(SERVER_URL);
HttpURLConnection conn = (HttpURLConnection) server.openConnection();
conn.setRequestProperty("Authorization",
- "Basic " + Base64.encode("a:a"));
+ "Basic " + Base64.encode("admin:admin"));
assertEquals(200, conn.getResponseCode());
}
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java?rev=1463955&r1=1463954&r2=1463955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTest.java Wed Apr 3 12:18:16 2013
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.AbstractQueryTest;
import org.apache.jackrabbit.oak.query.JsopUtil;
-import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.solr.client.solrj.SolrServer;
import org.junit.After;
import org.junit.Ignore;
@@ -35,9 +35,6 @@ import org.junit.Test;
import static junit.framework.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
/**
* General query extensive testcase for {@link SolrQueryIndex} and {@link
@@ -66,6 +63,7 @@ public class SolrIndexQueryTest extends
try {
solrServer = TestUtils.createSolrServer();
return new Oak().with(new InitialContent())
+ .with(new OpenSecurityProvider())
.with(TestUtils.getTestQueryIndexProvider(solrServer, testConfiguration))
.with(TestUtils.getTestIndexHookProvider(solrServer, testConfiguration))
.createContentRepository();