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

60757: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60710: Merged DEV to V4.2-BUG-FIX (4.2.2)
         60678: MNT-10482: JSP compilation error in Weblogic 12.1.2 when creating a web form
          - Use url for importing alfresco/wcm tld files instead of relative location. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:37:42 +00:00
parent d3f7ca23b2
commit bf9d125eaa
9 changed files with 24 additions and 7 deletions

View File

@@ -979,4 +979,13 @@
<env-entry-type>java.lang.String</env-entry-type>
</env-entry>
<taglib>
<taglib-uri>http://alfresco.com/alfresco</taglib-uri>
<taglib-location>/WEB-INF/alfresco.tld</taglib-location>
</taglib>
<taglib>
<taglib-uri>http://alfresco.com/wcm</taglib-uri>
<taglib-location>/WEB-INF/wcm.tld</taglib-location>
</taglib>
</web-app>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app">
<container-descriptor>
<show-archived-real-path-enabled>true</show-archived-real-path-enabled>
</container-descriptor>
</weblogic-web-app>

View File

@@ -18,7 +18,7 @@
-->
<jsp:root version="1.2"
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:wcm="urn:jsptld:/WEB-INF/wcm.tld"
xmlns:wcm="http://alfresco.com/wcm"
xmlns:f="http://java.sun.com/jsf/core">
<script type="text/javascript">
function _xforms_getSubmitButtons()

View File

@@ -20,7 +20,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
xmlns:a="http://alfresco.com/alfresco"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">

View File

@@ -20,7 +20,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
xmlns:a="http://alfresco.com/alfresco"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">

View File

@@ -19,7 +19,7 @@
<jsp:root version="1.2"
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
xmlns:a="http://alfresco.com/alfresco"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">

View File

@@ -18,7 +18,7 @@
-->
<jsp:root version="1.2"
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:wcm="urn:jsptld:/WEB-INF/wcm.tld"
xmlns:wcm="http://alfresco.com/wcm"
xmlns:f="http://java.sun.com/jsf/core">
<script type="text/javascript">
function _xforms_getSubmitButtons()

View File

@@ -20,7 +20,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
xmlns:a="http://alfresco.com/alfresco"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">

View File

@@ -20,7 +20,7 @@
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
xmlns:a="urn:jsptld:/WEB-INF/alfresco.tld"
xmlns:a="http://alfresco.com/alfresco"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html">