From 999cdcb5bd467acc94ef87060d38c7894c2ef3d6 Mon Sep 17 00:00:00 2001
From: Brian Remmington <brian.remmington@alfresco.com>
Date: Fri, 26 Aug 2011 14:55:36 +0000
Subject: [PATCH] Publishing: final config adjustments for each of the
 publishing channel types

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/facebook-publishing-context.xml  | 37 +++++++++----------
 config/alfresco/flickr-publishing-context.xml |  4 +-
 .../alfresco/linkedin-publishing-context.xml  | 31 ++++++++--------
 .../alfresco/twitter-publishing-context.xml   |  4 +-
 .../facebook/FacebookChannelType.java         |  2 +-
 .../youtube/YouTubePublishingHelper.java      |  4 +-
 6 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/config/alfresco/facebook-publishing-context.xml b/config/alfresco/facebook-publishing-context.xml
index 3e45992057..207fb6ce02 100644
--- a/config/alfresco/facebook-publishing-context.xml
+++ b/config/alfresco/facebook-publishing-context.xml
@@ -2,26 +2,25 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-    <bean parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
-        <property name="models">
-            <list>
-                <value>alfresco/model/facebookPublishingModel.xml</value>
-            </list>
-        </property>
-    </bean>
+   <bean parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+      <property name="models">
+         <list>
+            <value>alfresco/model/facebookPublishingModel.xml</value>
+         </list>
+      </property>
+   </bean>
 
-    <bean id="facebookDeliveryChannelType" class="org.alfresco.repo.publishing.facebook.FacebookChannelType" parent="baseChannelType" >
-        <property name="publishingHelper" ref="facebookPublishingHelper" />
-    </bean>
+   <bean id="facebookDeliveryChannelType" class="org.alfresco.repo.publishing.facebook.FacebookChannelType" parent="baseChannelType">
+      <property name="publishingHelper" ref="facebookPublishingHelper" />
+   </bean>
 
-    <bean id="facebookPublishingHelper" class="org.alfresco.repo.publishing.facebook.FacebookPublishingHelper">
-        <property name="nodeService" ref="NodeService" />
-        <property name="connectionFactory">
-            <bean class="org.springframework.social.facebook.connect.FacebookConnectionFactory">
-                <constructor-arg value="172471752819337" />
-                <constructor-arg value="663c15276462894fd3f0e94b41a4e2e1" />
-            </bean>
-        </property>
-    </bean>
+   <bean id="facebookPublishingHelper" class="org.alfresco.repo.publishing.facebook.FacebookPublishingHelper">
+      <property name="nodeService" ref="NodeService" />
+      <property name="connectionFactory" ref="facebookConnectionFactory" />
+   </bean>
 
+   <bean id="facebookConnectionFactory" class="org.springframework.social.facebook.connect.FacebookConnectionFactory">
+      <constructor-arg value="239653749405669" />
+      <constructor-arg value="34807bf851b3a73429c8332f14d42ddb" />
+   </bean>
 </beans>
diff --git a/config/alfresco/flickr-publishing-context.xml b/config/alfresco/flickr-publishing-context.xml
index a88f409e9e..91c8a5e9e0 100644
--- a/config/alfresco/flickr-publishing-context.xml
+++ b/config/alfresco/flickr-publishing-context.xml
@@ -22,8 +22,8 @@
     </bean>
 
     <bean id="flickrConnectionFactory" class="org.alfresco.repo.publishing.flickr.springsocial.connect.FlickrConnectionFactory">
-        <constructor-arg value="cc61f5d37569cec8c04fce8b4db3f37d" />
-        <constructor-arg value="75f29c6fc18a1b0c" />
+        <constructor-arg value="f7dafa571e8698ff93b08ebcb8c3de88" />
+        <constructor-arg value="e9a8d6072d4cb9e6" />
     </bean>
 
     <bean id="publish_flickr" parent="action-executer" class="org.alfresco.repo.publishing.flickr.FlickrPublishAction">
diff --git a/config/alfresco/linkedin-publishing-context.xml b/config/alfresco/linkedin-publishing-context.xml
index c007df534d..059d9c10c4 100644
--- a/config/alfresco/linkedin-publishing-context.xml
+++ b/config/alfresco/linkedin-publishing-context.xml
@@ -2,22 +2,21 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 
 <beans>
-    <bean parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
-        <property name="models">
-            <list>
-                <value>alfresco/model/linkedInPublishingModel.xml</value>
-            </list>
-        </property>
-    </bean>
+   <bean parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+      <property name="models">
+         <list>
+            <value>alfresco/model/linkedInPublishingModel.xml</value>
+         </list>
+      </property>
+   </bean>
 
-    <bean id="linkedInDeliveryChannelType" class="org.alfresco.repo.publishing.linkedin.LinkedInChannelType" parent="baseChannelType" >
-        <property name="nodeService" ref="NodeService" />
-        <property name="connectionFactory">
-            <bean class="org.alfresco.repo.publishing.linkedin.springsocial.connect.LinkedInConnectionFactory">
-                <constructor-arg value="l0a39tvf6v4x" />
-                <constructor-arg value="veWjLwlnJmu7IyFs" />
-            </bean>
-        </property>
-    </bean>
+   <bean id="linkedInDeliveryChannelType" class="org.alfresco.repo.publishing.linkedin.LinkedInChannelType" parent="baseChannelType">
+      <property name="nodeService" ref="NodeService" />
+      <property name="connectionFactory" ref="linkedinConnectionFactory" />
+   </bean>
 
+   <bean id="linkedinConnectionFactory" class="org.alfresco.repo.publishing.linkedin.springsocial.connect.LinkedInConnectionFactory">
+      <constructor-arg value="j2efeg3twccy" />
+      <constructor-arg value="z1pgc6svhKKBMeXP" />
+   </bean>
 </beans>
diff --git a/config/alfresco/twitter-publishing-context.xml b/config/alfresco/twitter-publishing-context.xml
index acb153ed4f..4e5301bc56 100644
--- a/config/alfresco/twitter-publishing-context.xml
+++ b/config/alfresco/twitter-publishing-context.xml
@@ -14,8 +14,8 @@
         <property name="nodeService" ref="NodeService" />
         <property name="connectionFactory">
             <bean class="org.springframework.social.twitter.connect.TwitterConnectionFactory">
-                <constructor-arg value="H6xYrEbF7sgGz9eL5s6uA" />
-                <constructor-arg value="JXydqZec0g4Va3mEl1sY2odlYNnyokS5TWy3C1sNVIg" />
+                <constructor-arg value="hXZ5T0h2zTIa7nPrtq2mg" />
+                <constructor-arg value="IdJ8j5Bx8MKYWWVNl4T98rNECSEDbqnBPIoAw1sIPyc" />
             </bean>
         </property>
     </bean>
diff --git a/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java b/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java
index bac6f3d453..67e43e4e69 100644
--- a/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java
+++ b/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java
@@ -40,7 +40,7 @@ import org.springframework.social.oauth2.OAuth2Parameters;
 public class FacebookChannelType extends AbstractChannelType
 {
     public final static String ID = "facebook";
-    public final static String DEFAULT_REDIRECT_URI = "http://cognite.net/alfresco/stand-alone-auth-return.html";
+    public final static String DEFAULT_REDIRECT_URI = "http://alfresco.com/stand-alone-auth-return.html";
 
     private FacebookPublishingHelper publishingHelper;
     private String redirectUri = DEFAULT_REDIRECT_URI;
diff --git a/source/java/org/alfresco/repo/publishing/youtube/YouTubePublishingHelper.java b/source/java/org/alfresco/repo/publishing/youtube/YouTubePublishingHelper.java
index 3b4fb5a506..3645582035 100644
--- a/source/java/org/alfresco/repo/publishing/youtube/YouTubePublishingHelper.java
+++ b/source/java/org/alfresco/repo/publishing/youtube/YouTubePublishingHelper.java
@@ -47,8 +47,8 @@ public class YouTubePublishingHelper
             {
                 String youtubeUsername = (String) nodeService.getProperty(parent, PublishingModel.PROP_CHANNEL_USERNAME);
                 String youtubePassword = (String) nodeService.getProperty(parent, PublishingModel.PROP_CHANNEL_PASSWORD);
-                service = new YouTubeService("Alfresco Kickoff Demo",
-                        "AI39si71pRNHkfExcTpqcZewDtI4GHWuPAXyRPL2Xq-RQUBWlE1bqn77ANXEL5lZUWFDz6ZlS_XWCw8hlr2BJY1TnC-EMs4e4g");
+                service = new YouTubeService("Alfresco",
+                        "AI39si78RHlniONCtnu9o8eBfwZToBAp2ZbbURm5eoJjj4gZi0LcxjDqJTzD35oYokmtFXbCo5ojofbimGnMlRbmNrh7-M7ZCw");
                 try
                 {
                     service.setUserCredentials(youtubeUsername, youtubePassword);