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

76305: Merged EOL2 (5.0.0.EOL2) to HEAD-BUG-FIX (5.0/Cloud)
      76026: ACE-2012 EOL Original SOAP API (CML) - removed. Based on BRANCHES/DEV/EOL:r73833,73932 and CMIS EOL removal merge.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 14:13:46 +00:00
parent 424d15fb17
commit e22fad8365
3 changed files with 0 additions and 3330 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -5,7 +5,6 @@
<import resource="classpath:alfresco/application-context.xml" />
<import resource="classpath:alfresco/web-scripts-application-context.xml" />
<import resource="classpath*:alfresco/enterprise-web-scripts-application-context.xml" />
<import resource="classpath:alfresco/web-services-application-context.xml" />
<!--
To give final control over the tuning of the custom environment, the custom-web-context.xml file is processed
last (note: custom-web-context.xml isn't part of the source tree itself).

View File

@@ -442,18 +442,6 @@
<servlet-class>org.alfresco.web.app.servlet.ajax.AjaxServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>axis</servlet-name>
<servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
<load-on-startup>6</load-on-startup>
</servlet>
<servlet>
<servlet-name>WebDAV</servlet-name>
<servlet-class>org.alfresco.repo.webdav.WebDAVServlet</servlet-class>
@@ -721,16 +709,6 @@
<url-pattern>/ajax/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>axis</servlet-name>
<url-pattern>/soapapi/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/cmis/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>WebDAV</servlet-name>
<url-pattern>/webdav/*</url-pattern>