You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2010/12/08 11:08:47 UTC
svn commit: r1043343 - in /jackrabbit/trunk:
jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/
jackrabbit-core/...
Author: mduerig
Date: Wed Dec 8 10:08:47 2010
New Revision: 1043343
URL: http://svn.apache.org/viewvc?rev=1043343&view=rev
Log:
JCR-2834: Make DefaultSecurityManager the default security manager (instead of SimpleSecurityManager)
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/config/RepositoryConfigTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java
jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml
jackrabbit/trunk/jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml?rev=1043343&r1=1043342&r2=1043343&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/resources/org/apache/jackrabbit/core/repository.xml Wed Dec 8 10:08:47 2010
@@ -47,7 +47,7 @@
security manager:
class: FQN of class implementing the JackrabbitSecurityManager interface
-->
- <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security">
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
<!--
workspace access:
class: FQN of class implementing the WorkspaceAccessManager interface
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=1043343&r1=1043342&r2=1043343&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 Wed Dec 8 10:08:47 2010
@@ -206,7 +206,7 @@ public class RepositoryConfigTest extend
SecurityManagerConfig smc =
config.getSecurityConfig().getSecurityManagerConfig();
assertEquals(
- "org.apache.jackrabbit.core.security.simple.SimpleSecurityManager",
+ "org.apache.jackrabbit.core.DefaultSecurityManager",
smc.getClassName());
assertTrue(smc.getParameters().isEmpty());
assertNotNull(smc.getWorkspaceName());
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java?rev=1043343&r1=1043342&r2=1043343&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/DataStoreAPITest.java Wed Dec 8 10:08:47 2010
@@ -16,16 +16,7 @@
*/
package org.apache.jackrabbit.core.data;
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
import junit.framework.TestCase;
-
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.api.JackrabbitRepositoryFactory;
@@ -33,6 +24,12 @@ import org.apache.jackrabbit.api.managem
import org.apache.jackrabbit.api.management.RepositoryManager;
import org.apache.jackrabbit.core.RepositoryFactoryImpl;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
/**
* Test data store garbage collection as described in the wiki at
* http://wiki.apache.org/jackrabbit/DataStore
@@ -53,7 +50,7 @@ public class DataStoreAPITest extends Te
RepositoryManager rm = rf.getRepositoryManager(rep);
// need to login to start the repository
- Session session = rep.login(new SimpleCredentials("", "".toCharArray()));
+ Session session = rep.login();
DataStoreGarbageCollector gc = rm.createDataStoreGarbageCollector();
try {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml?rev=1043343&r1=1043342&r2=1043343&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/resources/org/apache/jackrabbit/core/cluster/repository.xml Wed Dec 8 10:08:47 2010
@@ -39,7 +39,7 @@
security manager:
class: FQN of class implementing the JackrabbitSecurityManager interface
-->
- <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security">
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
<!--
workspace access:
class: FQN of class implementing the WorkspaceAccessManager interface
Modified: jackrabbit/trunk/jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java?rev=1043343&r1=1043342&r2=1043343&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java (original)
+++ jackrabbit/trunk/jackrabbit-jca/src/test/java/org/apache/jackrabbit/jca/test/AbstractTestCase.java Wed Dec 8 10:08:47 2010
@@ -16,18 +16,12 @@
*/
package org.apache.jackrabbit.jca.test;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
import junit.framework.TestCase;
-
-import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.jca.JCAManagedConnectionFactory;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
+import java.io.File;
/**
* This implements the abstract test case.
@@ -50,7 +44,7 @@ public abstract class AbstractTestCase
* Default credentials.
*/
public static final Credentials JCR_SUPERUSER =
- new SimpleCredentials("superuser", new char[0]);
+ new SimpleCredentials("admin", "admin".toCharArray());
/**
* Anonymous credentials.