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

58765: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58763: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58759: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            58711: MNT-10136 CLONE - CMIS TCK Test failed
               - Restored POST: http://servername:8080/alfresco/service/cmis/test was lost when test were moved to test-java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:10:00 +00:00
parent 8270475ea1
commit 43ca0651e9
3 changed files with 89 additions and 95 deletions

View File

@@ -346,9 +346,7 @@
<bean id="webscript.org.alfresco.cmiskind" class="org.alfresco.repo.cmis.rest.CMISWebScript" parent="webscript" scope="prototype" />
<!-- CMIS Test Runner Web Script -->
<!-- This is a test and should not be in the bundled with the webapp. Redefined in the test context
<bean id="webscript.org.alfresco.cmis.test.post" class="org.alfresco.repo.cmis.rest.test.CMISTestRunnerWebScript" parent="webscript" />
-->
<!-- Content Retrieval -->
<bean id="webscript.org.alfresco.cmis.content.get" class="org.alfresco.repo.web.scripts.content.ContentGet" parent="webscript">

View File

@@ -23,8 +23,4 @@
</property>
</bean>
<!-- Moved from main context, as it's a test bean -->
<bean id="webscript.org.alfresco.cmis.test.post" class="org.alfresco.repo.cmis.rest.test.CMISTestRunnerWebScript" parent="webscript" />
</beans>