From f20f174bc28b51c17b2a612c3eac4a16414a5989 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Sun, 21 Dec 2008 21:27:35 +0000 Subject: [PATCH] Merge/build fix - authenticate now required since authentication util changes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/web/scripts/wcm/WebProjectTest.java | 2 ++ .../web/scripts/wcm/membership/WebProjectMembershipTest.java | 5 ++--- .../org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java | 4 ++-- .../alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/wcm/WebProjectTest.java b/source/java/org/alfresco/repo/web/scripts/wcm/WebProjectTest.java index 1d51cbb985..1413430b50 100644 --- a/source/java/org/alfresco/repo/web/scripts/wcm/WebProjectTest.java +++ b/source/java/org/alfresco/repo/web/scripts/wcm/WebProjectTest.java @@ -80,6 +80,8 @@ public class WebProjectTest extends BaseWebScriptTest this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent"); this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService"); + this.authenticationComponent.setSystemUserAsCurrentUser(); + // Create users createUser(USER_ONE); createUser(USER_TWO); diff --git a/source/java/org/alfresco/repo/web/scripts/wcm/membership/WebProjectMembershipTest.java b/source/java/org/alfresco/repo/web/scripts/wcm/membership/WebProjectMembershipTest.java index 2589364d01..291aec26d8 100644 --- a/source/java/org/alfresco/repo/web/scripts/wcm/membership/WebProjectMembershipTest.java +++ b/source/java/org/alfresco/repo/web/scripts/wcm/membership/WebProjectMembershipTest.java @@ -29,17 +29,14 @@ import java.util.List; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationComponent; -import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.util.GUID; import org.alfresco.util.PropertyMap; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest; import org.alfresco.web.scripts.TestWebScriptServer.GetRequest; import org.alfresco.web.scripts.TestWebScriptServer.PostRequest; -import org.alfresco.web.scripts.TestWebScriptServer.PutRequest; import org.alfresco.web.scripts.TestWebScriptServer.Response; import org.json.JSONArray; import org.json.JSONObject; @@ -84,6 +81,8 @@ public class WebProjectMembershipTest extends BaseWebScriptTest this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent"); this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService"); + this.authenticationComponent.setSystemUserAsCurrentUser(); + // Create users createUser(USER_ONE); createUser(USER_TWO); diff --git a/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java b/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java index daba076ef4..cc8c7aea7c 100644 --- a/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java +++ b/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/AssetTest.java @@ -35,13 +35,11 @@ import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.PersonService; -import org.alfresco.util.ISO8601DateFormat; import org.alfresco.util.PropertyMap; import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest; import org.alfresco.web.scripts.TestWebScriptServer.GetRequest; import org.alfresco.web.scripts.TestWebScriptServer.PostRequest; -import org.alfresco.web.scripts.TestWebScriptServer.PutRequest; import org.alfresco.web.scripts.TestWebScriptServer.Response; import org.json.JSONArray; import org.json.JSONObject; @@ -100,6 +98,8 @@ public class AssetTest extends BaseWebScriptTest { this.avmNonLockingAwareService = (AVMService)getServer().getApplicationContext().getBean("AVMService"); this.avmLockingAwareService = (AVMService)getServer().getApplicationContext().getBean("AVMLockingAwareService"); + this.authenticationComponent.setSystemUserAsCurrentUser(); + // Create users createUser(USER_ONE); createUser(USER_TWO); diff --git a/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java b/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java index cfb4fa7f99..9248a0d7ba 100644 --- a/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java +++ b/source/java/org/alfresco/repo/web/scripts/wcm/sandbox/SandboxTest.java @@ -40,7 +40,6 @@ import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest; import org.alfresco.web.scripts.TestWebScriptServer.GetRequest; import org.alfresco.web.scripts.TestWebScriptServer.PostRequest; -import org.alfresco.web.scripts.TestWebScriptServer.PutRequest; import org.alfresco.web.scripts.TestWebScriptServer.Response; import org.json.JSONArray; import org.json.JSONObject; @@ -85,6 +84,8 @@ public class SandboxTest extends BaseWebScriptTest { this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent"); this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService"); + this.authenticationComponent.setSystemUserAsCurrentUser(); + // Create users createUser(USER_ONE); createUser(USER_TWO);