From d1876f6f46a25cf7a28387e2e4e567767c37de3e Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Thu, 25 Feb 2010 20:55:11 +0000 Subject: [PATCH] Merged DM-DM_deployment to HEAD git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../transfer/AbortTransferCommandProcessor.java | 11 +++++------ .../transfer/BeginTransferCommandProcessor.java | 8 ++++---- .../repo/web/scripts/transfer/CommandProcessor.java | 5 +++-- .../transfer/CommitTransferCommandProcessor.java | 10 +++++----- .../transfer/MessagesTransferCommandProcessor.java | 8 ++++---- .../scripts/transfer/PostContentCommandProcessor.java | 10 +++++----- .../transfer/PostSnapshotCommandProcessor.java | 10 +++++----- .../transfer/PrepareTransferCommandProcessor.java | 10 +++++----- .../transfer/TestCredentialsCommandProcessor.java | 7 ++++--- .../repo/web/scripts/transfer/TransferWebScript.java | 10 +++++----- .../web/scripts/transfer/TransferWebScriptTest.java | 7 ++++--- 11 files changed, 49 insertions(+), 47 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java index 6b2a76dec9..23c97843bf 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java @@ -31,14 +31,14 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.json.JSONWriter; -import org.alfresco.web.scripts.servlet.WebScriptServletRequest; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.json.JSONWriter; +import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; /** * This command processor is used to record the start a transfer. No other transfer can be started after this command @@ -117,6 +117,5 @@ public class AbortTransferCommandProcessor implements CommandProcessor { this.receiver = receiver; } - } diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java index 4579ff31d5..3f8c236039 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java @@ -30,12 +30,12 @@ import java.io.StringWriter; import org.alfresco.repo.transfer.RepoTransferReceiverImpl; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.json.JSONWriter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.json.JSONWriter; /** * This command processor is used to record the start a transfer. No other transfer can be started after this command diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java index 39cde3b98d..cbb4c2b6da 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java @@ -25,8 +25,9 @@ package org.alfresco.repo.web.scripts.transfer; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; + /** * @author brian diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java index 03902e1f03..360ae48161 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java @@ -31,14 +31,14 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.json.JSONWriter; -import org.alfresco.web.scripts.servlet.WebScriptServletRequest; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.json.JSONWriter; +import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; /** * This command processor is used to record the start a transfer. No other transfer can be started after this command diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java index 7c04a5b15c..4c46fe60f7 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java @@ -29,10 +29,10 @@ import java.io.StringWriter; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.json.JSONWriter; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.json.JSONWriter; /** * This command processor is used to record the start a transfer. No other transfer can be started after this command diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java index 0cd6db4ad8..65c1397716 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java @@ -29,16 +29,16 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.servlet.WebScriptServletRequest; -import org.alfresco.web.scripts.servlet.FormData.FormField; import org.apache.commons.fileupload.FileItemIterator; import org.apache.commons.fileupload.FileItemStream; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; +import org.springframework.extensions.webscripts.servlet.FormData.FormField; /** * This command processor is used to receive one or more content files for a given transfer. diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java index 2c2e6f7771..3d959ad30c 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java @@ -30,16 +30,16 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.repo.transfer.TransferCommons; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.servlet.WebScriptServletRequest; -import org.alfresco.web.scripts.servlet.FormData.FormField; import org.apache.commons.fileupload.FileItemIterator; import org.apache.commons.fileupload.FileItemStream; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; +import org.springframework.extensions.webscripts.servlet.FormData.FormField; /** * This command processor is used to receive the snapshot for a given transfer. diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java index d963932ded..6537c37852 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java @@ -32,14 +32,14 @@ import javax.servlet.http.HttpServletRequest; import org.alfresco.repo.transfer.TransferServiceImpl; import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferReceiver; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.json.JSONWriter; -import org.alfresco.web.scripts.servlet.WebScriptServletRequest; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.json.JSONWriter; +import org.springframework.extensions.webscripts.servlet.WebScriptServletRequest; /** * diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java b/source/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java index bcde3c3cdf..5de0ace06b 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java @@ -25,9 +25,10 @@ package org.alfresco.repo.web.scripts.transfer; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; + /** * This command processor is used simply to check that the transfer receiver is enabled and that the supplied diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java b/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java index 51442fd90f..57c26f81a9 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java @@ -32,13 +32,13 @@ import java.util.TreeMap; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.transfer.TransferException; -import org.alfresco.web.scripts.AbstractWebScript; -import org.alfresco.web.scripts.Status; -import org.alfresco.web.scripts.WebScriptRequest; -import org.alfresco.web.scripts.WebScriptResponse; -import org.alfresco.web.scripts.json.JSONWriter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.extensions.webscripts.AbstractWebScript; +import org.springframework.extensions.webscripts.Status; +import org.springframework.extensions.webscripts.WebScriptRequest; +import org.springframework.extensions.webscripts.WebScriptResponse; +import org.springframework.extensions.webscripts.json.JSONWriter; /** * @author brian diff --git a/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java b/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java index 9a658042f6..ee22c713cb 100644 --- a/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java +++ b/source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java @@ -32,10 +32,11 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.service.cmr.security.AuthenticationService; +import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.util.PropertyMap; -import org.alfresco.web.scripts.TestWebScriptServer.PostRequest; import org.json.JSONObject; +import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest; /** * Test the transfer web script API @@ -46,7 +47,7 @@ public class TransferWebScriptTest extends BaseWebScriptTest { private static final String USERNAME = "noddy.transfer"; - private AuthenticationService authenticationService; + private MutableAuthenticationService authenticationService; private AuthenticationComponent authenticationComponent; private PersonService personService; private List createdPeople = new ArrayList(5); @@ -57,7 +58,7 @@ public class TransferWebScriptTest extends BaseWebScriptTest super.setUp(); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName()); - this.authenticationService = (AuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService"); + this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService"); this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent"); this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");