From a347ae333c81c8f87a472d0ecbeae3a0d17e45ef Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 10 Mar 2010 17:16:34 +0000
Subject: [PATCH] Merged BRANCHES/V3.2 to HEAD:    17409: ETHREEOH-1630
 Webscript Kind=org.alfresco.repository.content.stream returns information
 about the Thumbnail webscript    17444: Update svn:mergeinfo    17940:
 Updated JBPM log level (GraphElement) to hide errors which should be handled
 by Alfresco retrying txn handler    17989: AVM - unreported NPE in
 OrphanRepear (clustered)    17997: WCM clustering - ensure Alfresco/JBPM job
 executor handles retries (from Alfresco retrying txn handler)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../web-scripts-application-context.xml        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 2030549449..093f79d133 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -393,6 +393,22 @@
       <property name="mimetypeService" ref="MimetypeService" />
    </bean>
    
+   <bean id="webscript.org.alfresco.repository.content.stream" class="org.alfresco.repo.web.scripts.content.StreamContent" parent="webscript" scope="prototype">
+      <property name="permissionService" ref="PermissionService" />
+      <property name="nodeService" ref="NodeService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+   </bean>
+   
+   <!--  Content Write -->
+   <bean id="webscript.org.alfresco.repository.store.content.put" class="org.alfresco.repo.web.scripts.content.ContentSet" parent="webscript">
+      <property name="repository" ref="repositoryHelper" />
+      <property name="dictionaryService" ref="DictionaryService" />
+      <property name="namespaceService" ref="NamespaceService" />
+      <property name="contentService" ref="ContentService" />
+      <property name="mimetypeService" ref="MimetypeService" />
+   </bean>
+   
    <!--  Remote Store service - AVM -->
    <bean id="webscript.org.alfresco.repository.store.remoteavm.get" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
       <property name="mimetypeService" ref="MimetypeService" />
@@ -727,4 +743,4 @@
 	<!-- adds a new action to the execution queue. -->
 	<bean id="webscript.org.alfresco.repository.rule.actionQueue.post" class="org.alfresco.repo.web.scripts.rule.ActionQueuePost" parent="abstractRuleWebScript">		      
 	</bean>
-</beans>
\ No newline at end of file
+</beans>