From bf9d125eaa3e8b010126b8ada976ea6bb8f589cd Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Feb 2014 14:37:42 +0000
Subject: [PATCH] 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
---
 source/web/WEB-INF/web.xml                               | 9 +++++++++
 source/web/WEB-INF/weblogic.xml                          | 8 ++++++++
 .../jsp/content/create-content-wizard/create-form.jsp    | 2 +-
 .../create-form-wizard/configure-rendering-engines.jsp   | 2 +-
 source/web/jsp/wcm/create-form-wizard/details.jsp        | 2 +-
 .../wcm/create-form-wizard/select-default-workflow.jsp   | 2 +-
 .../web/jsp/wcm/create-web-content-wizard/create-xml.jsp | 2 +-
 .../regenerate-renditions-wizard/select_renditions.jsp   | 2 +-
 .../web/jsp/wcm/regenerate-renditions-wizard/summary.jsp | 2 +-
 9 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 source/web/WEB-INF/weblogic.xml

diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 04209ba9b..3c78aa189 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -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>
\ No newline at end of file
diff --git a/source/web/WEB-INF/weblogic.xml b/source/web/WEB-INF/weblogic.xml
new file mode 100644
index 000000000..e2c5a489e
--- /dev/null
+++ b/source/web/WEB-INF/weblogic.xml
@@ -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>
\ No newline at end of file
diff --git a/source/web/jsp/content/create-content-wizard/create-form.jsp b/source/web/jsp/content/create-content-wizard/create-form.jsp
index b172c6f62..a99423b7c 100644
--- a/source/web/jsp/content/create-content-wizard/create-form.jsp
+++ b/source/web/jsp/content/create-content-wizard/create-form.jsp
@@ -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()
diff --git a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
index fde932400..25fdab32c 100644
--- a/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/configure-rendering-engines.jsp
@@ -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">
 
diff --git a/source/web/jsp/wcm/create-form-wizard/details.jsp b/source/web/jsp/wcm/create-form-wizard/details.jsp
index 77274d36c..07c4fea7e 100644
--- a/source/web/jsp/wcm/create-form-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/details.jsp
@@ -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">
 
diff --git a/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp b/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
index 993bb1fa6..07d84d35a 100644
--- a/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
@@ -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">
 
diff --git a/source/web/jsp/wcm/create-web-content-wizard/create-xml.jsp b/source/web/jsp/wcm/create-web-content-wizard/create-xml.jsp
index 828f8ef1b..6b0db84e6 100644
--- a/source/web/jsp/wcm/create-web-content-wizard/create-xml.jsp
+++ b/source/web/jsp/wcm/create-web-content-wizard/create-xml.jsp
@@ -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()
diff --git a/source/web/jsp/wcm/regenerate-renditions-wizard/select_renditions.jsp b/source/web/jsp/wcm/regenerate-renditions-wizard/select_renditions.jsp
index fa12f7d3b..1842677ca 100644
--- a/source/web/jsp/wcm/regenerate-renditions-wizard/select_renditions.jsp
+++ b/source/web/jsp/wcm/regenerate-renditions-wizard/select_renditions.jsp
@@ -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">
 
diff --git a/source/web/jsp/wcm/regenerate-renditions-wizard/summary.jsp b/source/web/jsp/wcm/regenerate-renditions-wizard/summary.jsp
index fdb73f67e..4567b0e90 100644
--- a/source/web/jsp/wcm/regenerate-renditions-wizard/summary.jsp
+++ b/source/web/jsp/wcm/regenerate-renditions-wizard/summary.jsp
@@ -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">