mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Clean up and fixes for webstudio/merge issues with getDocumentPaths() and associated remote store methods.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -247,47 +247,27 @@
|
|||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
|
||||||
<!-- AVM Remote Store -->
|
|
||||||
<!-- bean id="AVMStoreBean" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore">
|
|
||||||
<property name="mimetypeService" ref="MimetypeService" />
|
|
||||||
<property name="avmService" ref="AVMService" />
|
|
||||||
<property name="searchService" ref="SearchService" />
|
|
||||||
</bean>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- Remote Store service - AVM -->
|
<!-- Remote Store service - AVM -->
|
||||||
<bean id="webscript.org.alfresco.repository.store.remoteavm.get" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
|
<bean id="webscript.org.alfresco.repository.store.remoteavm.get" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
|
||||||
<property name="mimetypeService" ref="MimetypeService" />
|
<property name="mimetypeService" ref="MimetypeService" />
|
||||||
<property name="avmService" ref="AVMService" />
|
<property name="avmService" ref="AVMService" />
|
||||||
<property name="searchService" ref="SearchService" />
|
<property name="searchService" ref="SearchService" />
|
||||||
<!--
|
|
||||||
<property name="rootPath"><value>alfresco</value></property>
|
|
||||||
<property name="store"><value>sitestore</value></property>
|
|
||||||
-->
|
|
||||||
</bean>
|
</bean>
|
||||||
<bean id="webscript.org.alfresco.repository.store.remoteavm.post" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
|
<bean id="webscript.org.alfresco.repository.store.remoteavm.post" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
|
||||||
<property name="mimetypeService" ref="MimetypeService" />
|
<property name="mimetypeService" ref="MimetypeService" />
|
||||||
<property name="avmService" ref="AVMService" />
|
<property name="avmService" ref="AVMService" />
|
||||||
<property name="searchService" ref="SearchService" />
|
<property name="searchService" ref="SearchService" />
|
||||||
<!--
|
|
||||||
<property name="rootPath"><value>alfresco</value></property>
|
|
||||||
<property name="store"><value>sitestore</value></property>
|
|
||||||
-->
|
|
||||||
</bean>
|
</bean>
|
||||||
<bean id="webscript.org.alfresco.repository.store.remoteavm.delete" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
|
<bean id="webscript.org.alfresco.repository.store.remoteavm.delete" class="org.alfresco.repo.web.scripts.bean.AVMRemoteStore" parent="webscript">
|
||||||
<property name="mimetypeService" ref="MimetypeService" />
|
<property name="mimetypeService" ref="MimetypeService" />
|
||||||
<property name="avmService" ref="AVMService" />
|
<property name="avmService" ref="AVMService" />
|
||||||
<property name="searchService" ref="SearchService" />
|
<property name="searchService" ref="SearchService" />
|
||||||
<!--
|
|
||||||
<property name="rootPath"><value>alfresco</value></property>
|
|
||||||
<property name="store"><value>sitestore</value></property>
|
|
||||||
-->
|
|
||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
<!-- Web-tier SSO authentication touch point -->
|
<!-- Web-tier SSO authentication touch point -->
|
||||||
<bean id="webscript.org.alfresco.repository.touch.get" class="org.alfresco.repo.web.scripts.bean.Touch" parent="webscript" />
|
<bean id="webscript.org.alfresco.repository.touch.get" class="org.alfresco.repo.web.scripts.bean.Touch" parent="webscript" />
|
||||||
|
|
||||||
|
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<!-- Activity Feed Web Scripts -->
|
<!-- Activity Feed Web Scripts -->
|
||||||
<!-- -->
|
<!-- -->
|
||||||
|
@@ -77,9 +77,9 @@ public class AVMRemoteStore extends BaseRemoteStore
|
|||||||
*/
|
*/
|
||||||
public void setRootPath(String rootPath)
|
public void setRootPath(String rootPath)
|
||||||
{
|
{
|
||||||
if (rootPath != null && rootPath.length() == 0)
|
if (rootPath == null || rootPath.length() == 0)
|
||||||
{
|
{
|
||||||
rootPath = "/";
|
throw new IllegalArgumentException("Root path must be specified.");
|
||||||
}
|
}
|
||||||
|
|
||||||
this.rootPath = rootPath;
|
this.rootPath = rootPath;
|
||||||
|
@@ -227,7 +227,7 @@ public abstract class BaseRemoteStore extends AbstractWebScript
|
|||||||
String path = pathBuilder.toString();
|
String path = pathBuilder.toString();
|
||||||
|
|
||||||
if (logger.isDebugEnabled())
|
if (logger.isDebugEnabled())
|
||||||
logger.debug("Remote method: " + methodName + " Store Id: " + store + " Path: " + path);
|
logger.debug("Remote method: " + methodName.toUpperCase() + " Store Id: " + store + " Path: " + path);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user