You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2009/07/04 23:40:42 UTC
svn commit: r791180 [1/3] - in /jackrabbit/trunk:
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/
jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/
jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/use...
Author: mreutegg
Date: Sat Jul 4 21:40:37 2009
New Revision: 791180
URL: http://svn.apache.org/viewvc?rev=791180&view=rev
Log:
JCR-2185: Encapsulate RepositoryHelper field
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/PrincipalManagerTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ImpersonationTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AbstractConcurrencyTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrencyTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentLoginTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentModificationBase.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentNodeModificationTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/LockTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadVersionsWhileModified.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadWhileSaveTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReferencesTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/SessionGarbageCollectedTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ExportImportTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/GarbageCollectorTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/OpenFilesTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/ConcurrentQueryTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RestoreSameNameSiblingTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/VersioningTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/VersionEventsTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractIndexingTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/IndexFormatVersionTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/AccessManagerTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/NullLoginTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/GroupAdministratorTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/ImpersonationImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NotUserAdministratorTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserAdministratorTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserManagerImplTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/RemoveOrphanVersionHistoryTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/xml/DocumentViewTest.java
jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/xml/WorkspaceImporterTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/AbstractJCRTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/RepositoryStub.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AbstractWorkspaceCopyBetweenTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/AddNodeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/CheckPermissionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportDocViewTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ExportSysViewTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/HasPermissionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ImpersonateTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRegistryReadMethodsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NamespaceRemappingTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeAddMixinTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeCanAddMixinTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeDiscoveringNodeTypesTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeReadMethodsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeRemoveMixinTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeSetPrimaryTypeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/NodeUUIDTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/PropertyReadMethodsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/PropertyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/PropertyTypeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ReferenceableRootNodesTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/RepositoryDescriptorTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/RepositoryLoginTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/RootNodeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SerializationTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionReadMethodsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionRemoveItemTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SessionUUIDTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/SetValueVersionExceptionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/UndefinedPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/ValueFactoryTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCloneTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyBetweenWorkspacesTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceCopyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceMoveTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/WorkspaceReadMethodsTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/AbstractLockTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/DeepLockTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockManagerTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/LockTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SessionScopedLockTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/lock/SetValueLockExceptionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanAddChildNodeCallWithNodeTypeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanAddChildNodeCallWithoutNodeTypeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanRemoveItemTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyBinaryTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyBooleanTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDateTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyDoubleTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyLongTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyMultipleTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyNameTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyPathTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyStringTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/CanSetPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeDefTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeManagerTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/NodeTypeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PredefinedNodeTypeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/nodetype/PropertyDefTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/AddEventListenerTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/observation/EventJournalTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/DerefQueryLevel1Test.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetLanguageTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPersistentQueryPathLevel1Test.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetPropertyNamesTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetStatementTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/GetSupportedQueryLanguagesTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/PredicatesTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLJcrPathTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SQLPathTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SimpleSelectionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/XPathJcrPathTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldEffectTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyEffectTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlListTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/AccessControlPolicyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlDiscoveryTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlPolicyTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeNodeTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/VersionStorageTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/WorkspaceRestoreTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/IsSameTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LoginTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MixinModificationTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/test/java/org/apache/jackrabbit/spi2jcr/ServiceStubImpl.java
jackrabbit/trunk/jackrabbit-spi2jcr/src/test/resources/repositoryStubImpl.properties
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java Sat Jul 4 21:40:37 2009
@@ -28,6 +28,8 @@
import java.util.Calendar;
import java.util.Collection;
import java.util.Properties;
+import java.util.Map;
+import java.util.HashMap;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
@@ -80,9 +82,24 @@
private final Properties settings;
/**
- * The repository instance.
+ * Map of repository instances. Key = repository home, value = repository
+ * instance.
*/
- private Repository repository;
+ private static final Map<String, Repository> REPOSITORY_INSTANCES = new HashMap<String, Repository>();
+
+ static {
+ Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+ public void run() {
+ synchronized (REPOSITORY_INSTANCES) {
+ for (Repository repo : REPOSITORY_INSTANCES.values()) {
+ if (repo instanceof RepositoryImpl) {
+ ((RepositoryImpl) repo).shutdown();
+ }
+ }
+ }
+ }
+ }));
+ }
private static Properties getStaticProperties() {
Properties properties = new Properties();
@@ -129,33 +146,27 @@
*/
public synchronized Repository getRepository()
throws RepositoryStubException {
- if (repository == null) {
- try {
- String dir = settings.getProperty(PROP_REPOSITORY_HOME);
- if (dir == null) {
- dir = new File("target", "repository").getPath();
- }
+ try {
+ String dir = settings.getProperty(PROP_REPOSITORY_HOME);
+ if (dir == null) {
+ dir = new File("target", "repository").getAbsolutePath();
+ } else {
+ dir = new File(dir).getAbsolutePath();
+ }
- String xml = settings.getProperty(PROP_REPOSITORY_CONFIG);
- if (xml == null) {
- xml = new File(dir, "repository.xml").getPath();
- }
+ String xml = settings.getProperty(PROP_REPOSITORY_CONFIG);
+ if (xml == null) {
+ xml = new File(dir, "repository.xml").getPath();
+ }
- repository = createRepository(dir, xml);
- Session session = repository.login(superuser);
- try {
- prepareTestContent(session);
- } finally {
- session.logout();
- }
- } catch (Exception e) {
- RepositoryStubException exception =
+ return getOrCreateRepository(dir, xml);
+
+ } catch (Exception e) {
+ RepositoryStubException exception =
new RepositoryStubException("Failed to start repository");
- exception.initCause(e);
- throw exception;
- }
+ exception.initCause(e);
+ throw exception;
}
- return repository;
}
protected Repository createRepository(String dir, String xml)
@@ -180,6 +191,25 @@
return RepositoryImpl.create(config);
}
+ protected Repository getOrCreateRepository(String dir, String xml)
+ throws Exception {
+ synchronized (REPOSITORY_INSTANCES) {
+ Repository repo = REPOSITORY_INSTANCES.get(dir);
+ if (repo == null) {
+ repo = createRepository(dir, xml);
+ Session session = repo.login(superuser);
+ try {
+ prepareTestContent(session);
+ } finally {
+ session.logout();
+ }
+
+ REPOSITORY_INSTANCES.put(dir, repo);
+ }
+ return repo;
+ }
+ }
+
private void prepareTestContent(Session session)
throws RepositoryException, IOException {
JackrabbitWorkspace workspace =
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/PrincipalManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/PrincipalManagerTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/PrincipalManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/principal/PrincipalManagerTest.java Sat Jul 4 21:40:37 2009
@@ -74,7 +74,7 @@
}
public void testReadOnlyIsEveryOne() throws RepositoryException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
Principal[] pcpls = getPrincipals(s);
for (int i = 0; i < pcpls.length; i++) {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ImpersonationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ImpersonationTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ImpersonationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/ImpersonationTest.java Sat Jul 4 21:40:37 2009
@@ -69,7 +69,7 @@
}
public void testImpersonateGroup() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
Principal group = getTestGroup(s).getPrincipal();
Subject subject = createSubject(group);
@@ -80,7 +80,7 @@
}
public void testGrantImpersonationToGroupPrincipal() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
Principal group = getTestGroup(s).getPrincipal();
try {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/security/user/UserTest.java Sat Jul 4 21:40:37 2009
@@ -44,7 +44,7 @@
}
public void testReadOnlyIsntAdmin() throws NotExecutableException, RepositoryException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
User user = getTestUser(s);
assertFalse(user.isAdmin());
@@ -60,7 +60,7 @@
}
public void testChangePassword() throws RepositoryException, NotExecutableException {
- String oldPw = helper.getProperty("javax.jcr.tck.superuser.pwd");
+ String oldPw = getHelper().getProperty("javax.jcr.tck.superuser.pwd");
if (oldPw == null) {
// missing property
throw new NotExecutableException();
@@ -70,7 +70,7 @@
try {
user.changePassword("pw");
// make sure the user can login with the new pw
- Session s = helper.getRepository().login(new SimpleCredentials(user.getID(), "pw".toCharArray()));
+ Session s = getHelper().getRepository().login(new SimpleCredentials(user.getID(), "pw".toCharArray()));
s.logout();
} finally {
user.changePassword(oldPw);
@@ -78,7 +78,7 @@
}
public void testChangePassword2() throws RepositoryException, NotExecutableException {
- String oldPw = helper.getProperty("javax.jcr.tck.superuser.pwd");
+ String oldPw = getHelper().getProperty("javax.jcr.tck.superuser.pwd");
if (oldPw == null) {
// missing property
throw new NotExecutableException();
@@ -88,7 +88,7 @@
try {
user.changePassword("pw");
- Session s = helper.getRepository().login(new SimpleCredentials(user.getID(), oldPw.toCharArray()));
+ Session s = getHelper().getRepository().login(new SimpleCredentials(user.getID(), oldPw.toCharArray()));
s.logout();
fail("superuser pw has changed. login must fail.");
} catch (LoginException e) {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AbstractConcurrencyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AbstractConcurrencyTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AbstractConcurrencyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/AbstractConcurrencyTest.java Sat Jul 4 21:40:37 2009
@@ -68,7 +68,7 @@
for (int t = 0; t < tasks.length; t++) {
for (int i = 0; i < concurrency; i++) {
int id = t * concurrency + i;
- Session s = helper.getSuperuserSession();
+ Session s = getHelper().getSuperuserSession();
Node test = s.getRootNode().addNode(testPath + "/node" + id);
s.save();
executors[id] = new Executor(s, test, tasks[t]);
@@ -89,7 +89,7 @@
throws RepositoryException {
Executor[] executors = new Executor[concurrency];
for (int i = 0; i < concurrency; i++) {
- Session s = helper.getSuperuserSession();
+ Session s = getHelper().getSuperuserSession();
Node test = (Node) s.getItem(path);
s.save();
executors[i] = new Executor(s, test, task);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrencyTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrencyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrencyTest.java Sat Jul 4 21:40:37 2009
@@ -55,7 +55,7 @@
Thread[] threads = new Thread[NUM_SESSIONS];
for (int i = 0; i < threads.length; i++) {
// create new session
- Session session = helper.getSuperuserSession();
+ Session session = getHelper().getSuperuserSession();
TestSession ts = new TestSession("s" + i, session);
Thread t = new Thread(ts);
t.setName((NUM_ITERATIONS - n) + "-s" + i);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentLoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentLoginTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentLoginTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentLoginTest.java Sat Jul 4 21:40:37 2009
@@ -50,10 +50,10 @@
for (int i = 0; i < NUM_THREADS; i++) {
testRunner.add(new Thread(new Runnable() {
public void run() {
- Credentials cred = helper.getSuperuserCredentials();
+ Credentials cred = getHelper().getSuperuserCredentials();
for (int i = 0; i < NUM_LOGINS_PER_THREAD; i++) {
try {
- Session s = helper.getRepository().login(cred);
+ Session s = getHelper().getRepository().login(cred);
// immediately logout
s.logout();
} catch (Exception e) {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentModificationBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentModificationBase.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentModificationBase.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentModificationBase.java Sat Jul 4 21:40:37 2009
@@ -30,7 +30,7 @@
protected void setUp() throws Exception {
super.setUp();
- session = helper.getSuperuserSession();
+ session = getHelper().getSuperuserSession();
}
protected void tearDown() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentNodeModificationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentNodeModificationTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentNodeModificationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentNodeModificationTest.java Sat Jul 4 21:40:37 2009
@@ -48,7 +48,7 @@
Thread[] threads = new Thread[NUM_SESSIONS];
for (int i = 0; i < threads.length; i++) {
// create new session
- Session session = helper.getSuperuserSession();
+ Session session = getHelper().getSuperuserSession();
TestSession ts = new TestSession("s" + i, session);
Thread t = new Thread(ts);
t.setName((NUM_ITERATIONS - n) + "-s" + i);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java Sat Jul 4 21:40:37 2009
@@ -42,8 +42,8 @@
protected void setUp() throws Exception {
super.setUp();
- addNodeSession = helper.getSuperuserSession();
- removePropertySession = helper.getSuperuserSession();
+ addNodeSession = getHelper().getSuperuserSession();
+ removePropertySession = getHelper().getSuperuserSession();
}
protected void tearDown() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/LockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/LockTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/LockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/LockTest.java Sat Jul 4 21:40:37 2009
@@ -58,7 +58,7 @@
public void run() {
Session s;
try {
- s = helper.getSuperuserSession();
+ s = getHelper().getSuperuserSession();
} catch (RepositoryException e) {
return;
}
@@ -125,7 +125,7 @@
public void run() {
Session s;
try {
- s = helper.getSuperuserSession();
+ s = getHelper().getSuperuserSession();
} catch (RepositoryException e) {
return;
}
@@ -191,7 +191,7 @@
public void run() {
Session s;
try {
- s = helper.getSuperuserSession();
+ s = getHelper().getSuperuserSession();
} catch (RepositoryException e) {
return;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java Sat Jul 4 21:40:37 2009
@@ -77,8 +77,8 @@
}
}
- private static Principal getReadOnlyPrincipal() throws RepositoryException, NotExecutableException {
- SessionImpl s = (SessionImpl) helper.getReadOnlySession();
+ private Principal getReadOnlyPrincipal() throws RepositoryException, NotExecutableException {
+ SessionImpl s = (SessionImpl) getHelper().getReadOnlySession();
try {
for (Iterator it = s.getSubject().getPrincipals().iterator(); it.hasNext();) {
Principal p = (Principal) it.next();
@@ -108,7 +108,7 @@
changeReadPermission(principal, n, false);
changeReadPermission(principal, testNode, true);
- Session readOnly = helper.getReadOnlySession();
+ Session readOnly = getHelper().getReadOnlySession();
try {
NodeImpl tn = (NodeImpl) readOnly.getItem(testNode.getPath());
assertTrue(tn.internalIsCheckedOut());
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadVersionsWhileModified.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadVersionsWhileModified.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadVersionsWhileModified.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadVersionsWhileModified.java Sat Jul 4 21:40:37 2009
@@ -37,7 +37,7 @@
final Node n = testRootNode.addNode(nodeName1);
n.addMixin(mixVersionable);
testRootNode.save();
- final Session s = helper.getSuperuserSession();
+ final Session s = getHelper().getSuperuserSession();
Thread t = new Thread(new Runnable() {
public void run() {
long end = System.currentTimeMillis() + RUN_NUM_SECONDS * 1000;
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadWhileSaveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadWhileSaveTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadWhileSaveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReadWhileSaveTest.java Sat Jul 4 21:40:37 2009
@@ -42,7 +42,7 @@
Thread t = runExpensiveSave();
long numReads = 0;
while (t.isAlive()) {
- Session s = helper.getSuperuserSession();
+ Session s = getHelper().getSuperuserSession();
try {
for (NodeIterator it = s.getRootNode().getNodes(); it.hasNext(); ) {
it.nextNode();
@@ -71,7 +71,7 @@
out.write(randomKb);
}
out.close();
- final Session s = helper.getSuperuserSession();
+ final Session s = getHelper().getSuperuserSession();
final Node stuff = s.getRootNode().getNode(testPath).addNode("stuff");
Thread t = new Thread(new Runnable() {
public void run() {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReferencesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReferencesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReferencesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ReferencesTest.java Sat Jul 4 21:40:37 2009
@@ -189,7 +189,7 @@
* @throws RepositoryException on error
*/
private Session createSession() throws RepositoryException {
- return helper.getSuperuserSession();
+ return getHelper().getSuperuserSession();
}
private void saveAndlogout(Session... sessions) throws RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RestoreAndCheckoutTest.java Sat Jul 4 21:40:37 2009
@@ -32,7 +32,7 @@
private static final int NODES_COUNT = 10;
public void testRestoreAndCheckout() throws RepositoryException {
- Session session = helper.getSuperuserSession();
+ Session session = getHelper().getSuperuserSession();
Node rootNode = session.getRootNode();
Node myRoot = rootNode.addNode("myRoot");
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/RetentionRegistryImplTest.java Sat Jul 4 21:40:37 2009
@@ -133,7 +133,7 @@
}
public void testReadRetentionFromFile() throws RepositoryException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistryImpl re = new RetentionRegistryImpl(s, createFileSystem());
try {
assertTrue(re.hasEffectiveRetention(s.getQPath(childNPath), false));
@@ -223,7 +223,7 @@
}
public void testRemoveHold() throws RepositoryException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistry re = s.getRetentionRegistry();
try {
Hold[] holds = retentionMgr.getHolds(childNPath);
@@ -242,7 +242,7 @@
}
public void testRemoveRetentionPolicy() throws RepositoryException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistry re = s.getRetentionRegistry();
try {
retentionMgr.removeRetentionPolicy(childNPath);
@@ -259,7 +259,7 @@
}
public void testAddHold() throws RepositoryException, NotExecutableException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistry re = s.getRetentionRegistry();
Hold h = null;
try {
@@ -281,7 +281,7 @@
}
public void testAddMultipleHold() throws RepositoryException, NotExecutableException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistry re = s.getRetentionRegistry();
try {
retentionMgr.addHold(childN2.getPath(), getHoldName(), false);
@@ -310,7 +310,7 @@
}
public void testSetRetentionPolicy() throws RepositoryException, NotExecutableException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistry re = s.getRetentionRegistry();
try {
retentionMgr.setRetentionPolicy(childN2.getPath(), getApplicableRetentionPolicy("test2"));
@@ -329,7 +329,7 @@
}
public void testChangeRetentionPolicy() throws RepositoryException, NotExecutableException {
- SessionImpl s = (SessionImpl) helper.getSuperuserSession();
+ SessionImpl s = (SessionImpl) getHelper().getSuperuserSession();
RetentionRegistry re = s.getRetentionRegistry();
try {
retentionMgr.setRetentionPolicy(childN2.getPath(), getApplicableRetentionPolicy("test2"));
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/SessionGarbageCollectedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/SessionGarbageCollectedTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/SessionGarbageCollectedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/SessionGarbageCollectedTest.java Sat Jul 4 21:40:37 2009
@@ -38,7 +38,7 @@
Error error = null;
try {
for (int i = 0;; i++) {
- Session s = helper.getReadWriteSession();
+ Session s = getHelper().getReadWriteSession();
// eat a lot of memory so it gets garbage collected quickly
// (or quickly runs out of memory)
Node n = s.getRootNode().addNode("n" + i);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Sat Jul 4 21:40:37 2009
@@ -51,10 +51,10 @@
protected void setUp() throws Exception {
super.setUp();
- otherSuperuser = helper.getSuperuserSession();
+ otherSuperuser = getHelper().getSuperuserSession();
// clean testroot on second workspace
- Session s2 = helper.getSuperuserSession(workspaceName);
+ Session s2 = getHelper().getSuperuserSession(workspaceName);
try {
Node root = s2.getRootNode();
if (root.hasNode(testPath)) {
@@ -129,7 +129,7 @@
}
// assertion: node does not exist in other session
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
try {
otherSuperuser.getNodeByUUID(n.getUUID());
@@ -185,7 +185,7 @@
assertTrue(testRootNode.hasProperty(propertyName1));
// assertion: property does not exist in other session
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
Node otherRootNode = otherSuperuser.getRootNode().getNode(testPath);
assertFalse(otherRootNode.hasProperty(propertyName1));
@@ -230,7 +230,7 @@
utx.commit();
// check property value
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
Node n = (Node) otherSuperuser.getItem(testRootNode.getPath());
assertEquals(n.getProperty(propertyName1).getString(), "1");
otherSuperuser.logout();
@@ -338,7 +338,7 @@
utx.commit();
// check property value
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
Node n = (Node) otherSuperuser.getItem(testRootNode.getPath());
assertEquals(n.getProperty(propertyName1).getString(), "1");
otherSuperuser.logout();
@@ -370,7 +370,7 @@
utx.commit();
// check property value
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
Node n = (Node) otherSuperuser.getItem(testRootNode.getPath());
assertFalse("Property must be deleted.", n.hasProperty(propertyName1));
otherSuperuser.logout();
@@ -404,7 +404,7 @@
utx.commit();
// check property value
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
Node n = (Node) otherSuperuser.getItem(testRootNode.getPath());
assertFalse("Property must be deleted.", n.hasProperty(propertyName1));
otherSuperuser.logout();
@@ -578,7 +578,7 @@
testRootNode.save();
// remove referenced node in other session
- Session otherSuperuser = helper.getSuperuserSession();
+ Session otherSuperuser = getHelper().getSuperuserSession();
Node otherRootNode = otherSuperuser.getRootNode().getNode(testPath);
otherSuperuser.getNodeByUUID(n2.getUUID()).remove();
otherRootNode.save();
@@ -751,7 +751,7 @@
* @throws Exception
*/
public void testLockCommit() throws Exception {
- Session other = helper.getSuperuserSession();
+ Session other = getHelper().getSuperuserSession();
try {
// add node that is both lockable and referenceable, save
Node n = testRootNode.addNode(nodeName1);
@@ -792,7 +792,7 @@
* @throws Exception
*/
public void testLockUnlockCommit() throws Exception {
- Session other = helper.getSuperuserSession();
+ Session other = getHelper().getSuperuserSession();
try {
// add node that is both lockable and referenceable, save
Node n = testRootNode.addNode(nodeName1);
@@ -835,7 +835,7 @@
* @throws Exception
*/
public void testLockRollback() throws Exception {
- Session other = helper.getSuperuserSession();
+ Session other = getHelper().getSuperuserSession();
try {
// add node that is both lockable and referenceable, save
Node n = testRootNode.addNode(nodeName1);
@@ -879,7 +879,7 @@
* @throws Exception
*/
public void testLockTwice() throws Exception {
- Session other = helper.getSuperuserSession();
+ Session other = getHelper().getSuperuserSession();
try {
// add node that is both lockable and referenceable, save
Node n = testRootNode.addNode(nodeName1);
@@ -949,12 +949,12 @@
utx.commit();
// Check if it is locked in other session
- Session other = helper.getSuperuserSession();
+ Session other = getHelper().getSuperuserSession();
Node nOther = other.getNodeByUUID(n.getUUID());
assertTrue(nOther.isLocked());
// Check if it is also locked in other transaction
- Session other2 = helper.getSuperuserSession();
+ Session other2 = getHelper().getSuperuserSession();
// start new Transaction and try to add locktoken
utx = new UserTransactionImpl(other2);
utx.begin();
@@ -1008,7 +1008,7 @@
assertNull("session must get a null lock token", lock.getLockToken());
- Session other = helper.getSuperuserSession();
+ Session other = getHelper().getSuperuserSession();
try {
// start new Transaction and try to add lock token
utx = new UserTransactionImpl(other);
@@ -1389,7 +1389,7 @@
*/
public void testXAVersionsThoroughly() throws Exception {
Session s1 = superuser;
- Session s2 = helper.getSuperuserSession(workspaceName);
+ Session s2 = getHelper().getSuperuserSession(workspaceName);
// add node and save
Node n1 = testRootNode.addNode(nodeName1, testNodeType);
@@ -1654,7 +1654,7 @@
public void testSetProperty() throws Exception {
final String testNodePath = testPath + "/" + Math.random();
- Session session = helper.getSuperuserSession();
+ Session session = getHelper().getSuperuserSession();
try {
// Add node
doTransactional(new Operation() {
@@ -1689,7 +1689,7 @@
public void testDeleteNode() throws Exception {
final String testNodePath = testPath + "/" + Math.random();
- Session session = helper.getSuperuserSession();
+ Session session = getHelper().getSuperuserSession();
try {
for (int i = 1; i <= 3; i++) {
// Add parent node
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ExportImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ExportImportTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ExportImportTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/ExportImportTest.java Sat Jul 4 21:40:37 2009
@@ -61,7 +61,7 @@
}
private void doTestExportImportLargeText(char[] chars) throws RepositoryException {
- Session session = helper.getReadWriteSession();
+ Session session = getHelper().getReadWriteSession();
try {
Node root = session.getRootNode();
clean(root);
@@ -111,7 +111,7 @@
}
private void doTestExportImportBinary(int len) throws RepositoryException {
- Session session = helper.getReadWriteSession();
+ Session session = getHelper().getReadWriteSession();
try {
Node root = session.getRootNode();
clean(root);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/GarbageCollectorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/GarbageCollectorTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/GarbageCollectorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/GarbageCollectorTest.java Sat Jul 4 21:40:37 2009
@@ -188,8 +188,8 @@
deleteMyNodes();
- Credentials cred = helper.getSuperuserCredentials();
- Session s2 = helper.getRepository().login(cred);
+ Credentials cred = getHelper().getSuperuserCredentials();
+ Session s2 = getHelper().getRepository().login(cred);
root = s2.getRootNode();
Node node2 = root.addNode("node3");
Node n = node2.addNode("nodeWithBlob");
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/OpenFilesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/OpenFilesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/OpenFilesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/OpenFilesTest.java Sat Jul 4 21:40:37 2009
@@ -34,7 +34,7 @@
* Test opening a large number of streams.
*/
public void testStreams() throws RepositoryException {
- Session session = helper.getReadWriteSession();
+ Session session = getHelper().getReadWriteSession();
try {
Node test = session.getRootNode().addNode("test");
ValueFactory vf = session.getValueFactory();
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java Sat Jul 4 21:40:37 2009
@@ -70,7 +70,7 @@
}
for (int i = 0; i < names.length && i < 1; i++) {
- Session s = helper.getSuperuserSession(names[i]);
+ Session s = getHelper().getSuperuserSession(names[i]);
try {
Method m = r.getClass().getDeclaredMethod("getWorkspaceInfo", new Class[] { String.class });
m.setAccessible(true);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/ConcurrentQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/ConcurrentQueryTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/ConcurrentQueryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/ConcurrentQueryTest.java Sat Jul 4 21:40:37 2009
@@ -51,7 +51,7 @@
protected void setUp() throws Exception {
super.setUp();
for (int i = 0; i < NUM_READERS; i++) {
- readSessions.add(helper.getReadOnlySession());
+ readSessions.add(getHelper().getReadOnlySession());
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RepositoryFactoryImplTest.java Sat Jul 4 21:40:37 2009
@@ -148,8 +148,8 @@
//-------------------------< internal helper >------------------------------
- private static void checkRepository(Repository r) throws RepositoryException {
- r.login(helper.getSuperuserCredentials()).logout();
+ private void checkRepository(Repository r) throws RepositoryException {
+ r.login(getHelper().getSuperuserCredentials()).logout();
}
private static void setProperties() {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RestoreSameNameSiblingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RestoreSameNameSiblingTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RestoreSameNameSiblingTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/RestoreSameNameSiblingTest.java Sat Jul 4 21:40:37 2009
@@ -31,7 +31,7 @@
public class RestoreSameNameSiblingTest extends AbstractJCRTest {
public void testRestoreSNS() throws RepositoryException {
- Session session = helper.getSuperuserSession();
+ Session session = getHelper().getSuperuserSession();
// - Create a node 'a' with nodetype nt:unstructured
// (defining it's childnodes to show OPV Version behaviour)
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/SessionImplTest.java Sat Jul 4 21:40:37 2009
@@ -36,7 +36,7 @@
* instead of AccessControlException
*/
public void testCheckAddNodePermissionOnRoot() throws RepositoryException {
- Session session = helper.getReadOnlySession();
+ Session session = getHelper().getReadOnlySession();
try {
session.checkPermission("/", "add_node");
} catch (PathNotFoundException e) {
@@ -59,7 +59,7 @@
SimpleCredentials credentials =
new SimpleCredentials("admin", "admin".toCharArray());
credentials.setAttribute("test", "attribute");
- Session session = helper.getRepository().login(credentials);
+ Session session = getHelper().getRepository().login(credentials);
try {
String[] names = session.getAttributeNames();
assertEquals(1, names.length);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/VersioningTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/VersioningTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/VersioningTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/VersioningTest.java Sat Jul 4 21:40:37 2009
@@ -37,12 +37,12 @@
protected void setUp() throws Exception {
super.setUp();
- Session s1 = helper.getSuperuserSession();
+ Session s1 = getHelper().getSuperuserSession();
n1 = s1.getRootNode().addNode("VersioningTest");
n1.addMixin(mixVersionable);
n1.getSession().save();
- Session s2 = helper.getSuperuserSession(workspaceName);
+ Session s2 = getHelper().getSuperuserSession(workspaceName);
s2.getWorkspace().clone(
s1.getWorkspace().getName(), n1.getPath(),
"/VersioningTest", true);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java Sat Jul 4 21:40:37 2009
@@ -37,7 +37,7 @@
Thread t = new Thread(new Runnable() {
public void run() {
try {
- helper.getSuperuserSession("workspace-init-test").logout();
+ getHelper().getSuperuserSession("workspace-init-test").logout();
} catch (RepositoryException e) {
throw new RuntimeException(e);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java Sat Jul 4 21:40:37 2009
@@ -68,7 +68,7 @@
//isReadOnly = true;
super.setUp();
- session = helper.getReadOnlySession();
+ session = getHelper().getReadOnlySession();
manager = session.getWorkspace().getNodeTypeManager();
nameFactory = NameFactoryImpl.getInstance();
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java Sat Jul 4 21:40:37 2009
@@ -19,7 +19,6 @@
import junit.framework.AssertionFailedError;
import org.apache.jackrabbit.api.JackrabbitNodeTypeManager;
-import org.apache.jackrabbit.core.TestRepository;
import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
import org.apache.jackrabbit.core.nodetype.NodeDef;
import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
@@ -39,7 +38,6 @@
import javax.jcr.NamespaceRegistry;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.jcr.version.OnParentVersionAction;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -236,46 +234,40 @@
/** Test for namespace registration on node type import. */
public void testImportXMLNodeTypes() throws Exception {
- Session session = TestRepository.getInstance().login();
try {
- session.getNamespacePrefix("test-namespace2");
+ superuser.getNamespacePrefix("test-namespace2");
// Ignore test case, node type and namespace already registered
} catch (NamespaceException e1) {
// Namespace testns2 not yet registered
JackrabbitNodeTypeManager ntm = (JackrabbitNodeTypeManager)
- session.getWorkspace().getNodeTypeManager();
+ superuser.getWorkspace().getNodeTypeManager();
ntm.registerNodeTypes(
TestAll.class.getResourceAsStream(TEST_NS_XML_NODETYPES),
JackrabbitNodeTypeManager.TEXT_XML);
try {
- session.getNamespacePrefix("test-namespace2");
+ superuser.getNamespacePrefix("test-namespace2");
} catch (NamespaceException e2) {
fail("xml test2 namespace not registered");
}
- } finally {
- session.logout();
}
}
/** Test for namespace registration on node type import. */
public void testImportCNDNodeTypes() throws Exception {
- Session session = TestRepository.getInstance().login();
try {
- session.getNamespacePrefix("test-namespace3");
+ superuser.getNamespacePrefix("test-namespace3");
// Ignore test case, node type and namespace already registered
} catch (NamespaceException e1) {
JackrabbitNodeTypeManager ntm = (JackrabbitNodeTypeManager)
- session.getWorkspace().getNodeTypeManager();
+ superuser.getWorkspace().getNodeTypeManager();
ntm.registerNodeTypes(
TestAll.class.getResourceAsStream(TEST_NS_CND_NODETYPES),
JackrabbitNodeTypeManager.TEXT_X_JCR_CND);
try {
- session.getNamespacePrefix("test-namespace3");
+ superuser.getNamespacePrefix("test-namespace3");
} catch (NamespaceException e2) {
fail("cnd test3 namespace not registered");
}
- } finally {
- session.logout();
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/VersionEventsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/VersionEventsTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/VersionEventsTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/observation/VersionEventsTest.java Sat Jul 4 21:40:37 2009
@@ -178,7 +178,7 @@
n1.addMixin(mixVersionable);
testRootNode.save();
- Session s = helper.getReadOnlySession(workspaceName);
+ Session s = getHelper().getReadOnlySession(workspaceName);
try {
EventResult listener = new EventResult(log);
ObservationManager obsMgr = s.getWorkspace().getObservationManager();
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractIndexingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractIndexingTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractIndexingTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/AbstractIndexingTest.java Sat Jul 4 21:40:37 2009
@@ -33,7 +33,7 @@
protected void setUp() throws Exception {
super.setUp();
- session = helper.getSuperuserSession(WORKSPACE_NAME);
+ session = getHelper().getSuperuserSession(WORKSPACE_NAME);
testRootNode = cleanUpTestRoot(session);
// overwrite query manager
qm = session.getWorkspace().getQueryManager();
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/IndexFormatVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/IndexFormatVersionTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/IndexFormatVersionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/IndexFormatVersionTest.java Sat Jul 4 21:40:37 2009
@@ -45,7 +45,7 @@
private void checkIndexFormatVersion(String wspName,
IndexFormatVersion version)
throws RepositoryException {
- Session session = helper.getSuperuserSession(wspName);
+ Session session = getHelper().getSuperuserSession(wspName);
try {
QueryManager qm = session.getWorkspace().getQueryManager();
QueryHandler handler = ((QueryManagerImpl) qm).getQueryHandler();
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java Sat Jul 4 21:40:37 2009
@@ -37,7 +37,7 @@
protected void setUp() throws Exception {
super.setUp();
- s2 = helper.getSuperuserSession();
+ s2 = getHelper().getSuperuserSession();
qm = s2.getWorkspace().getQueryManager();
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeniedNodesTest.java Sat Jul 4 21:40:37 2009
@@ -51,7 +51,7 @@
protected void setUp() throws Exception {
super.setUp();
- anonymous = helper.getReadOnlySession();
+ anonymous = getHelper().getReadOnlySession();
n1 = testRootNode.addNode(nodeName1);
n1.setProperty(propertyName1, "a");
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/IndexingQueueTest.java Sat Jul 4 21:40:37 2009
@@ -113,7 +113,7 @@
Thread t = new Thread(new Runnable() {
public void run() {
try {
- session = helper.getSuperuserSession(WORKSPACE_NAME);
+ session = getHelper().getSuperuserSession(WORKSPACE_NAME);
} catch (RepositoryException e) {
throw new RuntimeException(e);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/AccessManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/AccessManagerTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/AccessManagerTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/AccessManagerTest.java Sat Jul 4 21:40:37 2009
@@ -70,7 +70,7 @@
// TODO: add specific tests for 'AC-read/modify' privileges
public void testCheckPermissionReadOnlySession() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
AccessManager acMgr = getAccessManager(s);
@@ -114,7 +114,7 @@
}
public void testCheckPermissionWithUnknowId() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
NodeId id = new NodeId(UUID.randomUUID());
try {
AccessManager acMgr = getAccessManager(s);
@@ -128,7 +128,7 @@
}
public void testIsGranted() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
AccessManager acMgr = getAccessManager(s);
@@ -142,7 +142,7 @@
}
public void testIsGrantedOnProperty() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
AccessManager acMgr = getAccessManager(s);
@@ -157,7 +157,7 @@
}
public void testIsGrantedOnNewNode() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadWriteSession();
+ Session s = getHelper().getReadWriteSession();
try {
AccessManager acMgr = getAccessManager(s);
@@ -173,7 +173,7 @@
}
public void testCanAccess() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
String wspName = s.getWorkspace().getName();
@@ -184,7 +184,7 @@
}
public void testCanAccessAllAvailable() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
String[] wspNames = s.getWorkspace().getAccessibleWorkspaceNames();
for (int i = 0; i < wspNames.length; i++) {
@@ -196,7 +196,7 @@
}
public void testCanAccessDeniedWorkspace() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
Set allAccessibles = new HashSet(Arrays.asList(superuser.getWorkspace().getAccessibleWorkspaceNames()));
Set sWorkspaceNames = new HashSet(Arrays.asList(s.getWorkspace().getAccessibleWorkspaceNames()));
@@ -213,7 +213,7 @@
}
public void testCanAccessNotExistingWorkspace() throws RepositoryException, NotExecutableException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
List all = Arrays.asList(s.getWorkspace().getAccessibleWorkspaceNames());
String testName = "anyWorkspace";
@@ -261,7 +261,7 @@
}
public void testIsGrantedReadOnlySession() throws NotExecutableException, RepositoryException {
- Session s = helper.getReadOnlySession();
+ Session s = getHelper().getReadOnlySession();
try {
AccessManager acMgr = getAccessManager(s);
Path p = PathFactoryImpl.getInstance().getRootPath();
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/GuestLoginTest.java Sat Jul 4 21:40:37 2009
@@ -29,7 +29,7 @@
protected void setUp() throws Exception {
super.setUp();
- guest = helper.getRepository().login(new GuestCredentials());
+ guest = getHelper().getRepository().login(new GuestCredentials());
}
protected void tearDown() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/NullLoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/NullLoginTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/NullLoginTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authentication/NullLoginTest.java Sat Jul 4 21:40:37 2009
@@ -25,8 +25,8 @@
public class NullLoginTest extends AbstractJCRTest {
public void testNullLogin() throws RepositoryException {
- Session s = helper.getRepository().login();
- Session s2 = helper.getRepository().login(null, null);
+ Session s = getHelper().getRepository().login();
+ Session s2 = getHelper().getRepository().login(null, null);
try {
assertNotNull(s.getUserID());
assertEquals(s.getUserID(), s2.getUserID());
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractEvaluationTest.java Sat Jul 4 21:40:37 2009
@@ -111,7 +111,7 @@
protected Session getTestSession() throws RepositoryException {
if (testSession == null) {
- testSession = helper.getRepository().login(creds);
+ testSession = getHelper().getRepository().login(creds);
}
return testSession;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java Sat Jul 4 21:40:37 2009
@@ -313,7 +313,7 @@
// test if login as testuser -> item at path must not exist.
Session s = null;
try {
- s = helper.getRepository().login(creds);
+ s = getHelper().getRepository().login(creds);
assertFalse(s.itemExists(path));
} finally {
if (s != null) {
@@ -915,7 +915,7 @@
testUser = null;
// try to retrieve the acl again
- Session s = helper.getSuperuserSession();
+ Session s = getHelper().getSuperuserSession();
try {
AccessControlManager acMgr = getAccessControlManager(s);
acMgr.getPolicies(acPath);
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/GroupAdministratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/GroupAdministratorTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/GroupAdministratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/GroupAdministratorTest.java Sat Jul 4 21:40:37 2009
@@ -75,7 +75,7 @@
grID = groupAdmin.getID();
// create a session for the grou-admin user.
- uSession = helper.getRepository().login(creds);
+ uSession = getHelper().getRepository().login(creds);
}
protected void tearDown() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/ImpersonationImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/ImpersonationImplTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/ImpersonationImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/ImpersonationImplTest.java Sat Jul 4 21:40:37 2009
@@ -55,7 +55,7 @@
creds = buildCredentials(p.getName(), pw);
UserImpl u = (UserImpl) userMgr.createUser(p.getName(), pw);
uID = u.getID();
- uSession = helper.getRepository().login(creds);
+ uSession = getHelper().getRepository().login(creds);
uMgr = getUserManager(uSession);
// create a second user 'below' the first user.
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NotUserAdministratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NotUserAdministratorTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NotUserAdministratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/NotUserAdministratorTest.java Sat Jul 4 21:40:37 2009
@@ -55,7 +55,7 @@
uPath = u.getNode().getPath();
// create a session for the other user.
- uSession = helper.getRepository().login(new SimpleCredentials(uID, pw.toCharArray()));
+ uSession = getHelper().getRepository().login(new SimpleCredentials(uID, pw.toCharArray()));
uMgr = getUserManager(uSession);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserAdministratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserAdministratorTest.java?rev=791180&r1=791179&r2=791180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserAdministratorTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/user/UserAdministratorTest.java Sat Jul 4 21:40:37 2009
@@ -76,7 +76,7 @@
uAdministrators.addMember(other);
// create a session for the other user.
- otherSession = helper.getRepository().login(otherCreds);
+ otherSession = getHelper().getRepository().login(otherCreds);
}
protected void tearDown() throws Exception {