From 5093fb7df0c9167b80c846ea0c72cd8ed923501e Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 10 Nov 2016 15:31:03 +0000
Subject: [PATCH] REPO-843 Upgrade our Servlet API usage to 3.0.1 (from 2.4 /
 2.5)    - Modified comments in jboss-deployment-structure.xml and
 weblogic-application.xml to indicate that the PLATFORM also has versions of
 these files.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@132647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../META-INF/jboss-deployment-structure.xml   |  4 +
 .../META-INF/weblogic-application.xml         | 83 ++++++++++++-------
 2 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
index c9218b8cd7..655e7c208d 100644
--- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml
+++ b/ear/src/main/application/META-INF/jboss-deployment-structure.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  This jboss-deployment-structure.xml file is for a Share and Platform install.
+  The is another version for a Platform only install.  
+-->
 <jboss-deployment-structure>
     <sub-deployment name="alfresco.war">
         <dependencies>
diff --git a/ear/src/main/application/META-INF/weblogic-application.xml b/ear/src/main/application/META-INF/weblogic-application.xml
index dd479dc6ab..62846f6922 100644
--- a/ear/src/main/application/META-INF/weblogic-application.xml
+++ b/ear/src/main/application/META-INF/weblogic-application.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
-<weblogic-application xmlns="http://xmlns.oracle.com/weblogic/weblogic-application" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
+<!--
+  This weblogic-application.xml file is for a Share and Platform install.
+  The is another version for a Platform only install.  
+-->
+<weblogic-application xmlns="http://xmlns.oracle.com/weblogic/weblogic-application" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
   <security>
     <security-role-assignment>
       <role-name>repoclient</role-name>
@@ -15,31 +20,39 @@
 
   <prefer-application-packages>
     <package-name>antlr.*</package-name>
-    <package-name>com.bea.faces.*</package-name>
     <package-name>com.ctc.wstx.*</package-name>
+    <package-name>com.fasterxml.jackson.*</package-name>
     <package-name>com.google.common.*</package-name>
     <package-name>com.sun.codemodel.*</package-name>
-    <package-name>com.sun.faces.*</package-name>
+    <package-name>com.sun.istack.*</package-name>
     <package-name>com.sun.mail.*</package-name>
     <package-name>com.sun.tools.*</package-name>
     <package-name>com.sun.xml.bind.*</package-name>
-    <package-name>com.sun.xml.ws.*</package-name>
-    <package-name>com.sun.xml.ws.api.*</package-name>
-    <package-name>com.sun.xml.ws.developer.*</package-name> 
-    <package-name>com.sun.xml.ws.server.*</package-name>
-    <package-name>com.sun.xml.ws.transport.*</package-name>
-    <package-name>com.sun.xml.ws.util.*</package-name>
-    <package-name>javax.faces.*</package-name>
+    <package-name>javax.annotation.*</package-name>
+    <package-name>javax.annotation.security.*</package-name>
     <package-name>javax.wsdl.*</package-name>
     <package-name>javax.wsdl.extensions.*</package-name>
     <package-name>javax.wsdl.factory.*</package-name>
     <package-name>javax.wsdl.xml.*</package-name>
+    <package-name>javax.inject.*</package-name>
+    <package-name>javax.jms.*</package-name>
+    <package-name>javax.mail.*</package-name>
+    <package-name>javax.mail.event.*</package-name>
+    <package-name>javax.mail.internet.*</package-name>
+    <package-name>javax.mail.search.*</package-name>
+    <package-name>javax.mail.util.*</package-name>
+    <package-name>javax.management.j2ee.*</package-name>
+    <package-name>javax.transaction.*</package-name>
+    <package-name>javax.transaction.xa.*</package-name>
+    <package-name>javax.xml.rpc.*</package-name>
+    <package-name>net.jcip.annotations.*</package-name>
     <package-name>net.sf.cglib.*</package-name>
     <package-name>org.antlr.runtime.*</package-name>
+    <package-name>org.aopalliance.aop.*</package-name>
+    <package-name>org.aopalliance.intercept.*</package-name>
     <package-name>org.apache.commons.*</package-name>
     <package-name>org.apache.oro.*</package-name>
     <package-name>org.apache.taglibs.*</package-name>
-    <package-name>org.apache.tools.*</package-name>
     <package-name>org.apache.xerces.*</package-name>
     <package-name>org.apache.xmlbeans.*</package-name>
     <package-name>org.apache.xmlcommons.*</package-name>
@@ -55,12 +68,10 @@
     <package-name>org.bouncycastle.util.*</package-name>
     <package-name>org.bouncycastle.voms.*</package-name>
     <package-name>org.bouncycastle.x509.*</package-name>
-    <package-name>org.codehaus.jackson.*</package-name> 
+    <package-name>org.codehaus.jackson.*</package-name>
     <package-name>org.codehaus.stax2.*</package-name>
     <package-name>org.joda.time.*</package-name>
     <package-name>org.jvnet.fastinfoset.*</package-name>
-    <package-name>org.jvnet.mimepull.*</package-name>
-    <package-name>org.jvnet.staxex.*</package-name>
     <package-name>org.kohsuke.rngom.*</package-name>
     <package-name>org.mozilla.*</package-name>
     <package-name>org.objectweb.asm.*</package-name>
@@ -79,28 +90,38 @@
     <package-name>schemaorg_apache_xmlbeans.system.sXMLLANG.*</package-name>
     <package-name>schemaorg_apache_xmlbeans.system.sXMLSCHEMA.*</package-name>
     <package-name>schemaorg_apache_xmlbeans.system.sXMLTOOLS.*</package-name>
+
+    <!--
+      Entries from WebLogic's CAT that have not been included in this file.
+
+      The following cause startup exceptions:
+
+      <package-name>com.sun.xml.*</package-name>
+      <package-name>javax.servlet.jsp.*</package-name>
+      <package-name>org.w3c.dom.*</package-name>
+
+      The following are for server faces used by the old Explorer UI removed in 5.0.
+      We really should not be package myfaces-api-1.1.10.jar any more, but still do
+      because we have a special internal use case. It does not use WebLogic.
+
+      <package-name>javax.faces.*</package-name>
+      <package-name>javax.faces.application.*</package-name>
+      <package-name>javax.faces.component.*</package-name>
+      <package-name>javax.faces.context.*</package-name>
+      <package-name>javax.faces.convert.*</package-name>
+      <package-name>javax.faces.el.*</package-name>
+      <package-name>javax.faces.event.*</package-name>
+      <package-name>javax.faces.lifecycle.*</package-name>
+      <package-name>javax.faces.model.*</package-name>
+      <package-name>javax.faces.render.*</package-name>
+      <package-name>javax.faces.validator.*</package-name>
+      <package-name>javax.faces.webapp.*</package-name>
+    -->
   </prefer-application-packages>
 
   <prefer-application-resources>
-    <resource-name>javax.faces.*</resource-name>
-    <resource-name>com.sun.faces.*</resource-name>
-    <resource-name>com.bea.faces.*</resource-name>
     <resource-name>META-INF/services/javax.servlet.ServletContainerInitializer</resource-name>
-    <resource-name>META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler</resource-name>
-    <resource-name>META-INF/services/com.sun.tools.ws.processor.generator.GeneratorBase</resource-name>
-    <resource-name>META-INF/services/com.sun.tools.ws.processor.generator.GeneratorExtension</resource-name>
-    <resource-name>META-INF/services/com.sun.xml.ws.api.BindingIDFactory</resource-name>
-    <resource-name>META-INF/services/com.sun.xml.ws.api.client.ServiceInterceptorFactory</resource-name>
-    <resource-name>META-INF/services/com.sun.xml.ws.api.wsdl.parser.WSDLParserExtension</resource-name>
-    <resource-name>META-INF/services/com.sun.xml.ws.api.wsdl.writer.WSDLGeneratorExtension</resource-name>
-    <resource-name>META-INF/services/com.sun.xml.ws.spi.db.BindingContextFactory</resource-name>
-    <resource-name>META-INF/services/com.sun.xml.ws.spi.db.DatabindingProvider</resource-name>
     <resource-name>META-INF/services/javax.xml.bind.JAXBContext</resource-name>
-    <resource-name>META-INF/services/javax.xml.soap.MessageFactory</resource-name>
-    <resource-name>META-INF/services/javax.xml.soap.MetaFactory</resource-name>
-    <resource-name>META-INF/services/javax.xml.soap.SOAPConnectionFactory</resource-name>
-    <resource-name>META-INF/services/javax.xml.soap.SOAPElementFactory</resource-name>
-    <resource-name>META-INF/services/javax.xml.soap.SOAPFactory</resource-name>
     <resource-name>META-INF/services/javax.xml.ws.spi.Provider</resource-name>
   </prefer-application-resources>