diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 04209ba9b9..3c78aa1891 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 0000000000..e2c5a489e3
--- /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 b172c6f623..a99423b7ce 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 fde9324002..25fdab32c9 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 77274d36c2..07c4fea7e0 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 993bb1fa67..07d84d35a3 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 828f8ef1bf..6b0db84e67 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 fa12f7d3b0..1842677caf 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 fdb73f67e9..4567b0e902 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">