inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DM-DM_deployment to HEAD

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-02-25 20:55:11 +00:00
parent db04a8db8a
commit d1876f6f46
11 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/web/scripts/transfer/AbortTransferCommandProcessor.java
View File

@@ -31,14 +31,14 @@ import javax.servlet.http.HttpServletRequest;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; 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.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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 * This command processor is used to record the start a transfer. No other transfer can be started after this command
@@ -118,5 +118,4 @@ public class AbortTransferCommandProcessor implements CommandProcessor
this.receiver = receiver; this.receiver = receiver;
} }
} }

8
source/java/org/alfresco/repo/web/scripts/transfer/BeginTransferCommandProcessor.java
View File

@@ -30,12 +30,12 @@ import java.io.StringWriter;
import org.alfresco.repo.transfer.RepoTransferReceiverImpl; import org.alfresco.repo.transfer.RepoTransferReceiverImpl;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; 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.Log;
import org.apache.commons.logging.LogFactory; 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 * This command processor is used to record the start a transfer. No other transfer can be started after this command

5
source/java/org/alfresco/repo/web/scripts/transfer/CommandProcessor.java
View File

@@ -25,8 +25,9 @@
package org.alfresco.repo.web.scripts.transfer; package org.alfresco.repo.web.scripts.transfer;
import org.alfresco.web.scripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.alfresco.web.scripts.WebScriptResponse; import org.springframework.extensions.webscripts.WebScriptResponse;
/** /**
* @author brian * @author brian

10
source/java/org/alfresco/repo/web/scripts/transfer/CommitTransferCommandProcessor.java
View File

@@ -31,14 +31,14 @@ import javax.servlet.http.HttpServletRequest;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; 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.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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 * This command processor is used to record the start a transfer. No other transfer can be started after this command

8
source/java/org/alfresco/repo/web/scripts/transfer/MessagesTransferCommandProcessor.java
View File

@@ -29,10 +29,10 @@ import java.io.StringWriter;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; import org.alfresco.service.cmr.transfer.TransferReceiver;
import org.alfresco.web.scripts.Status; import org.springframework.extensions.webscripts.Status;
import org.alfresco.web.scripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.alfresco.web.scripts.WebScriptResponse; import org.springframework.extensions.webscripts.WebScriptResponse;
import org.alfresco.web.scripts.json.JSONWriter; 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 * This command processor is used to record the start a transfer. No other transfer can be started after this command

10
source/java/org/alfresco/repo/web/scripts/transfer/PostContentCommandProcessor.java
View File

@@ -29,16 +29,16 @@ import javax.servlet.http.HttpServletRequest;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; 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.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream; import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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. * This command processor is used to receive one or more content files for a given transfer.

10
source/java/org/alfresco/repo/web/scripts/transfer/PostSnapshotCommandProcessor.java
View File

@@ -30,16 +30,16 @@ import javax.servlet.http.HttpServletRequest;
import org.alfresco.repo.transfer.TransferCommons; import org.alfresco.repo.transfer.TransferCommons;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; 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.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream; import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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. * This command processor is used to receive the snapshot for a given transfer.

10
source/java/org/alfresco/repo/web/scripts/transfer/PrepareTransferCommandProcessor.java
View File

@@ -32,14 +32,14 @@ import javax.servlet.http.HttpServletRequest;
import org.alfresco.repo.transfer.TransferServiceImpl; import org.alfresco.repo.transfer.TransferServiceImpl;
import org.alfresco.service.cmr.transfer.TransferException; import org.alfresco.service.cmr.transfer.TransferException;
import org.alfresco.service.cmr.transfer.TransferReceiver; 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.fileupload.servlet.ServletFileUpload;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; 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;
/** /**
* *

7
source/java/org/alfresco/repo/web/scripts/transfer/TestCredentialsCommandProcessor.java
View File

@@ -25,9 +25,10 @@
package org.alfresco.repo.web.scripts.transfer; package org.alfresco.repo.web.scripts.transfer;
import org.alfresco.web.scripts.Status; import org.springframework.extensions.webscripts.Status;
import org.alfresco.web.scripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.alfresco.web.scripts.WebScriptResponse; import org.springframework.extensions.webscripts.WebScriptResponse;
/** /**
* This command processor is used simply to check that the transfer receiver is enabled and that the supplied * This command processor is used simply to check that the transfer receiver is enabled and that the supplied

10
source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScript.java
View File

@@ -32,13 +32,13 @@ import java.util.TreeMap;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.transfer.TransferException; 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.Log;
import org.apache.commons.logging.LogFactory; 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 * @author brian

7
source/java/org/alfresco/repo/web/scripts/transfer/TransferWebScriptTest.java
View File

@@ -32,10 +32,11 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
/** /**
* Test the transfer web script API * Test the transfer web script API
@@ -46,7 +47,7 @@ public class TransferWebScriptTest extends BaseWebScriptTest
{ {
private static final String USERNAME = "noddy.transfer"; private static final String USERNAME = "noddy.transfer";
private AuthenticationService authenticationService; private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent; private AuthenticationComponent authenticationComponent;
private PersonService personService; private PersonService personService;
private List<String> createdPeople = new ArrayList<String>(5); private List<String> createdPeople = new ArrayList<String>(5);
@@ -57,7 +58,7 @@ public class TransferWebScriptTest extends BaseWebScriptTest
super.setUp(); super.setUp();
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName()); 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.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService"); this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");