Refactored the Invitation Workflow Actions and Delegates. Pulled most of the functionality out into an InviteHelper class.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-08-17 14:22:55 +00:00
parent 062dc3705b
commit 7d41229582
4 changed files with 5 additions and 7 deletions

View File

@@ -31,7 +31,7 @@ import org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest;
import org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test; import org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test;
import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test; import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test;
import org.alfresco.repo.web.scripts.groups.GroupsTest; import org.alfresco.repo.web.scripts.groups.GroupsTest;
import org.alfresco.repo.web.scripts.invitation.InvitationTest; import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
import org.alfresco.repo.web.scripts.invite.InviteServiceTest; import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
import org.alfresco.repo.web.scripts.person.PersonServiceTest; import org.alfresco.repo.web.scripts.person.PersonServiceTest;
import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest; import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest;
@@ -73,7 +73,7 @@ public class WebScriptTestSuite extends TestSuite
suite.addTestSuite( FormRestApiGet_Test.class ); suite.addTestSuite( FormRestApiGet_Test.class );
suite.addTestSuite( FormRestApiJsonPost_Test.class ); suite.addTestSuite( FormRestApiJsonPost_Test.class );
suite.addTestSuite( GroupsTest.class ); suite.addTestSuite( GroupsTest.class );
suite.addTestSuite( InvitationTest.class ); suite.addTestSuite( InvitationWebScriptTest.class );
suite.addTestSuite( InviteServiceTest.class ); suite.addTestSuite( InviteServiceTest.class );
suite.addTestSuite( LoginTest.class ); suite.addTestSuite( LoginTest.class );
suite.addTestSuite( PersonSearchTest.class ); suite.addTestSuite( PersonSearchTest.class );

View File

@@ -56,7 +56,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
* *
* @author Mark Rogers * @author Mark Rogers
*/ */
public class InvitationTest extends BaseWebScriptTest public class InvitationWebScriptTest extends BaseWebScriptTest
{ {
private final static QName avatarQName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "test"); private final static QName avatarQName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "test");

View File

@@ -21,8 +21,8 @@ package org.alfresco.repo.web.scripts.invite;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.invitation.InviteHelper;
import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation; import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
import org.alfresco.repo.invitation.site.InviteHelper;
import org.alfresco.service.cmr.invitation.Invitation; import org.alfresco.service.cmr.invitation.Invitation;
import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden; import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
import org.alfresco.service.cmr.invitation.InvitationExceptionUserError; import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
@@ -35,8 +35,6 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** /**
* Web Script invoked by a Site Manager (Inviter) to either send * Web Script invoked by a Site Manager (Inviter) to either send

View File

@@ -25,9 +25,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl; import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl;
import org.alfresco.repo.invitation.InviteHelper;
import org.alfresco.service.cmr.invitation.InvitationSearchCriteria; import org.alfresco.service.cmr.invitation.InvitationSearchCriteria;
import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation; import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
import org.alfresco.repo.invitation.site.InviteHelper;
import org.alfresco.repo.invitation.site.InviteInfo; import org.alfresco.repo.invitation.site.InviteInfo;
import org.alfresco.repo.template.TemplateNode; import org.alfresco.repo.template.TemplateNode;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;