Publishing:

- Added start of the Flickr channel. Channel creation and authorisation is complete (written as a new Spring Social module). API not currently working.
- Fixed a problem with SlideShare API: it relies on the file extension to determine the type of the file, so needed to alter the way the files are sent.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29085 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2011-07-15 15:47:26 +00:00
parent 4694cec30a
commit 26bf61764a
2 changed files with 8 additions and 3 deletions

View File

@@ -18,7 +18,7 @@
]]></description> ]]></description>
<description></description> <description></description>
<url>/api/publishing/channel</url> <url>/api/publishing/channels</url>
<format default="json"/> <format default="json"/>
<authentication>user</authentication> <authentication>user</authentication>
<transaction>required</transaction> <transaction>required</transaction>

View File

@@ -20,6 +20,8 @@
package org.alfresco.repo.web.scripts.publishing; package org.alfresco.repo.web.scripts.publishing;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@@ -28,6 +30,7 @@ import org.alfresco.service.cmr.publishing.channels.Channel;
import org.alfresco.service.cmr.publishing.channels.ChannelService; import org.alfresco.service.cmr.publishing.channels.ChannelService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
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.AbstractWebScript;
@@ -86,7 +89,9 @@ public class AuthCallbackWebScript extends AbstractWebScript
if (channel.getChannelType().acceptAuthorisationCallback(channel, headers, params)) if (channel.getChannelType().acceptAuthorisationCallback(channel, headers, params))
{ {
nodeService.setProperty(channelNodeRef, PublishingModel.PROP_AUTHORISATION_COMPLETE, Boolean.TRUE); Map<QName,Serializable> props = new HashMap<QName, Serializable>();
props.put(PublishingModel.PROP_AUTHORISATION_COMPLETE, Boolean.TRUE);
channelService.updateChannel(channel, props);
res.getWriter().write("Authorisation granted!"); res.getWriter().write("Authorisation granted!");
} }
else else
@@ -96,7 +101,7 @@ public class AuthCallbackWebScript extends AbstractWebScript
{ {
//If we have not been granted access by the service provider then we //If we have not been granted access by the service provider then we
//simply delete this publishing channel //simply delete this publishing channel
nodeService.deleteNode(channelNodeRef); channelService.deleteChannel(channel);
} }
res.getWriter().write("Authorisation denied!"); res.getWriter().write("Authorisation denied!");
} }