From 572f1514022e83de0396b4754037ed09fa6d4c98 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Wed, 18 Jan 2006 16:30:33 +0000 Subject: [PATCH] Fallout from Spring upgrade git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/content/RoutingContentServiceTest.java | 2 +- source/java/org/alfresco/repo/copy/CopyServiceImplTest.java | 3 +-- .../org/alfresco/repo/descriptor/DescriptorServiceTest.java | 2 +- .../java/org/alfresco/repo/exporter/ExporterComponentTest.java | 2 +- .../java/org/alfresco/repo/importer/ImporterComponentTest.java | 2 +- source/java/org/alfresco/repo/node/BaseNodeServiceTest.java | 3 +-- source/java/org/alfresco/repo/rule/BaseRuleTest.java | 2 +- .../repo/security/permissions/impl/AbstractPermissionTest.java | 2 +- source/java/org/alfresco/repo/security/person/PersonTest.java | 2 +- source/java/org/alfresco/util/BaseAlfrescoSpringTest.java | 3 +-- 10 files changed, 10 insertions(+), 13 deletions(-) diff --git a/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java b/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java index 1e1733e904..91e4bf4383 100644 --- a/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java +++ b/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java @@ -102,7 +102,7 @@ public class RoutingContentServiceTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/copy/CopyServiceImplTest.java b/source/java/org/alfresco/repo/copy/CopyServiceImplTest.java index 593f7f1726..157054d040 100644 --- a/source/java/org/alfresco/repo/copy/CopyServiceImplTest.java +++ b/source/java/org/alfresco/repo/copy/CopyServiceImplTest.java @@ -56,7 +56,6 @@ import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.util.BaseSpringTest; -import org.alfresco.util.debug.NodeStoreInspector; /** * Node operations service unit tests @@ -226,7 +225,7 @@ public class CopyServiceImplTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java b/source/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java index 8f41f92298..4d06efb040 100644 --- a/source/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java +++ b/source/java/org/alfresco/repo/descriptor/DescriptorServiceTest.java @@ -55,7 +55,7 @@ public class DescriptorServiceTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java b/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java index c80c2d2a0f..f9b5c2ce79 100644 --- a/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java +++ b/source/java/org/alfresco/repo/exporter/ExporterComponentTest.java @@ -73,7 +73,7 @@ public class ExporterComponentTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/importer/ImporterComponentTest.java b/source/java/org/alfresco/repo/importer/ImporterComponentTest.java index 619d626c1a..79d70fb672 100644 --- a/source/java/org/alfresco/repo/importer/ImporterComponentTest.java +++ b/source/java/org/alfresco/repo/importer/ImporterComponentTest.java @@ -61,7 +61,7 @@ public class ImporterComponentTest extends BaseSpringTest @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java index 78f3c51ae2..d3ab0d1a24 100644 --- a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java +++ b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java @@ -55,7 +55,6 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.RegexQNamePattern; @@ -158,7 +157,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/rule/BaseRuleTest.java b/source/java/org/alfresco/repo/rule/BaseRuleTest.java index 061f83eaa5..18c5cb4cd4 100644 --- a/source/java/org/alfresco/repo/rule/BaseRuleTest.java +++ b/source/java/org/alfresco/repo/rule/BaseRuleTest.java @@ -136,7 +136,7 @@ public class BaseRuleTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationComponent.clearCurrentSecurityContext(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java index a029b15605..63b43c643d 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java @@ -134,7 +134,7 @@ public class AbstractPermissionTest extends BaseSpringTest authenticationComponent.clearCurrentSecurityContext(); } - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { flushAndClear(); super.onTearDownInTransaction(); diff --git a/source/java/org/alfresco/repo/security/person/PersonTest.java b/source/java/org/alfresco/repo/security/person/PersonTest.java index c710d1864e..c2ee30b69a 100644 --- a/source/java/org/alfresco/repo/security/person/PersonTest.java +++ b/source/java/org/alfresco/repo/security/person/PersonTest.java @@ -59,7 +59,7 @@ public class PersonTest extends BaseSpringTest } - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { super.onTearDownInTransaction(); flushAndClear(); diff --git a/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java b/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java index db1a902398..41432b6f72 100644 --- a/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java +++ b/source/java/org/alfresco/util/BaseAlfrescoSpringTest.java @@ -17,7 +17,6 @@ package org.alfresco.util; import org.alfresco.repo.security.authentication.AuthenticationComponent; -import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.NodeRef; @@ -85,7 +84,7 @@ public abstract class BaseAlfrescoSpringTest extends BaseSpringTest } @Override - protected void onTearDownInTransaction() + protected void onTearDownInTransaction() throws Exception { authenticationService.clearCurrentSecurityContext(); super.onTearDownInTransaction();