Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

101331: Merge RA-SPRINT2 to HEAD-BUG-FIX (5.1)
      100711: RA-86, RA-87 & RA-88 (sub-tasks of RA-56): Move wiki service back-end classes to share services project.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/tests/RepoService.java

@@ -120,8 +120,6 @@ import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.cmr.version.VersionService;
 import org.alfresco.service.cmr.version.VersionType;
-import org.alfresco.service.cmr.wiki.WikiPageInfo;
-import org.alfresco.service.cmr.wiki.WikiService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.FileFilterMode.Client;
@@ -191,7 +189,6 @@ public class RepoService
 	protected FavouritesService favouritesService;
 	protected InvitationService invitationService;
 	protected LockService lockService;
-	protected WikiService wikiService;
 	protected CMISConnector cmisConnector;
 	protected NodeIndexer nodeIndexer;
 	protected HiddenAspect hiddenAspect;
@@ -248,7 +245,6 @@ public class RepoService
     	this.dictionaryService =  (DictionaryService)applicationContext.getBean("dictionaryService");
     	this.invitationService = (InvitationService)applicationContext.getBean("InvitationService");
     	this.lockService = (LockService)applicationContext.getBean("LockService");
-    	this.wikiService = (WikiService)applicationContext.getBean("WikiService");
     	this.cmisConnector = (CMISConnector)applicationContext.getBean("CMISConnector");
     	this.nodeIndexer = (NodeIndexer)applicationContext.getBean("nodeIndexer");
     	this.activities = (Activities)applicationContext.getBean("activities");
@@ -369,12 +365,6 @@ public class RepoService
 		lockService.unlock(nodeRef);
 	}
 	
-	public WikiPageInfo createWiki(String siteId, String title, String contents)
-	{
-		WikiPageInfo info = wikiService.createWikiPage(siteId, title, contents);
-		return info;
-	}
-	
 	public TestPerson createUser(final PersonInfo personInfo, final String username, final TestNetwork network)
 	{
 		return AuthenticationUtil.runAsSystem(new RunAsWork<TestPerson>()
@@ -1086,7 +1076,7 @@ public class RepoService
     	nodeService.addAspect(nodeRef, aspectTypeQName, aspectProperties);
     }
     
-    public void createComment(NodeRef nodeRef, final Comment comment)
+    public NodeRef createComment(NodeRef nodeRef, final Comment comment)
     {
 		NodeRef commentNodeRef = commentService.createComment(nodeRef, comment.getTitle(), comment.getContent(), false);
 		comment.setId(commentNodeRef.getId());
@@ -1094,6 +1084,7 @@ public class RepoService
 		comment.setCreatedAt(PublicApiDateFormat.getDateFormat().format(created));
 		TestPerson person = getPerson((String)nodeService.getProperty(commentNodeRef, ContentModel.PROP_CREATOR));
 		comment.setCreatedBy(person);
+		return commentNodeRef;
     }
     
     public TestNetwork createNetworkWithAlias(String alias, boolean enabled)

source/test-java/org/alfresco/rest/api/tests/TestFavourites.java

@@ -32,6 +32,7 @@ import org.alfresco.rest.api.tests.client.PublicApiClient.Paging;
 import org.alfresco.rest.api.tests.client.PublicApiClient.SiteMembershipRequests;
 import org.alfresco.rest.api.tests.client.PublicApiException;
 import org.alfresco.rest.api.tests.client.RequestContext;
+import org.alfresco.rest.api.tests.client.data.Comment;
 import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Favourite;
 import org.alfresco.rest.api.tests.client.data.FavouritesTarget;
@@ -49,7 +50,6 @@ import org.alfresco.service.cmr.favourites.FavouritesService;
 import org.alfresco.service.cmr.favourites.FavouritesService.Type;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.site.SiteVisibility;
-import org.alfresco.service.cmr.wiki.WikiPageInfo;
 import org.alfresco.util.GUID;
 import org.alfresco.util.Pair;
 import org.apache.commons.httpclient.HttpStatus;
@@ -516,6 +516,8 @@ public class TestFavourites extends EnterpriseTestApi
 
 		// cloud-2468
 		// invalid type
+		// NOTE: The test below has swapped to attempt to favorite a comment rather than a
+		//       a wiki page as the WikiService has moved to the Share Services AMP in 5.1
 		
 		try
 		{
@@ -523,19 +525,19 @@ public class TestFavourites extends EnterpriseTestApi
 
 			publicApiClient.setRequestContext(new RequestContext(network1.getId(), person10Id));
 			
-			final TestSite site = personSites.get(0);
+			final NodeRef document = personDocs.get(0);
-			final WikiPageInfo wiki = TenantUtil.runAsUserTenant(new TenantRunAsWork<WikiPageInfo>()
+			final NodeRef comment = TenantUtil.runAsUserTenant(new TenantRunAsWork<NodeRef>()
 			{
 				@Override
-				public WikiPageInfo doWork() throws Exception
+				public NodeRef doWork() throws Exception
 				{
-					WikiPageInfo wiki = repoService.createWiki(site.getSiteId(), GUID.generate(), GUID.generate());
+					NodeRef comment = repoService.createComment(document, new Comment("Title", "Content"));
-					return wiki;
+					return comment;
 				}
 			}, person10Id, network1.getId());
 
-			final String guid = wiki.getNodeRef().getId();
+			final String guid = comment.getId();
-			JSONAble wikiJSON = new JSONAble()
+			JSONAble commentJSON = new JSONAble()
 			{
 				@SuppressWarnings("unchecked")
 				@Override
@@ -547,7 +549,7 @@ public class TestFavourites extends EnterpriseTestApi
 				}
 			};
 
-			FavouritesTarget target = new InvalidFavouriteTarget("wiki", wikiJSON, guid);
+			FavouritesTarget target = new InvalidFavouriteTarget("comment", commentJSON, guid);
 			Favourite favourite = new Favourite(target);
 
 			favouritesProxy.createFavourite(person10Id, favourite);