:-) Thank you Jacques.
Jacopo On Fri, May 20, 2016 at 3:18 PM, Jacques Le Roux < jacques.le.r...@les7arts.com> wrote: > With 3 positive committers I decided to go, done for R14.12 r1744733 > > R13.07 will need more work... > > > > Le 20/05/2016 à 14:12, Jacopo Cappellato a écrit : > >> It sounds like a good idea to me too. And I agree with Jacques that we >> should strive to maintain the same version in all the active release >> branches 13.07, 14.12, 15.12. >> >> Jacopo >> >> On Fri, May 20, 2016 at 1:17 PM, Deepak Dixit < >> deepak.di...@hotwaxsystems.com> wrote: >> >> No Jacques there is not specific reason for this, I generally prefer to >>> backport changes to most recent/active branches. Just to avoid conflicts >>> I >>> skip 13.07 most of the time :) >>> >>> Thanks & Regards >>> -- >>> Deepak Dixit >>> www.hotwaxsystems.com >>> >>> On Fri, May 20, 2016 at 4:34 PM, Jacques Le Roux < >>> jacques.le.r...@les7arts.com> wrote: >>> >>> That sounds like a good idea to me Deepak, and then why not R13.07? >>>> >>>> I though noticed that Pierre Smits suggested to not backport in earlier >>>> releases branches than R15.12. Pierre is there a special reason with >>>> >>> that? >>> >>>> BTW I noticed that you guys at HW are not backporting much in R13.07, is >>>> there a special reason with that? >>>> >>>> Thanks! >>>> >>>> Jacques >>>> >>>> >>>> >>>> Le 20/05/2016 à 12:24, Deepak Dixit a écrit : >>>> >>>> Hi Jacques, >>>>> >>>>> I think it would be useful to backport this to 14.12 releases.In this >>>>> >>>> way >>> >>>> we will have less tomcat revisions to keep an eye on for vulnerability >>>>> fixes, and we will specialize in one version only so that our upgrade >>>>> effort will be smaller. >>>>> >>>>> >>>>> >>>>> Thanks & Regards >>>>> -- >>>>> Deepak Dixit >>>>> www.hotwaxsystems.com >>>>> >>>>> On Wed, Apr 13, 2016 at 1:13 PM, <jler...@apache.org> wrote: >>>>> >>>>> Author: jleroux >>>>> >>>>>> Date: Wed Apr 13 07:43:07 2016 >>>>>> New Revision: 1738904 >>>>>> >>>>>> URL: http://svn.apache.org/viewvc?rev=1738904&view=rev >>>>>> Log: >>>>>> "Applied fix from trunk for revision: 1738902" >>>>>> >>>>>> >>> ------------------------------------------------------------------------ >>> >>>> r1738902 | jleroux | 2016-04-13 09:40:25 +0200 (mer. 13 avr. 2016) | 4 >>>>>> lignes >>>>>> >>>>>> A slightly modified patch from Chatree Srichart for "Upgrade Tomcat to >>>>>> 8.0.32" https://issues.apache.org/jira/browse/OFBIZ-6915 >>>>>> >>>>>> jleroux: I simply changed the doc link in catalina ofbiz-component.xml >>>>>> >>>>>> >>>>>> >>> ------------------------------------------------------------------------ >>> >>>> >>>>>> Added: >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/base/lib/j2eespecs/el-api-3.0.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/base/lib/j2eespecs/el-api-3.0.jar >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/base/lib/j2eespecs/jsp-api-2.3.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.3.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/base/lib/j2eespecs/servlet-api-3.1.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.1.jar >>>>>> ofbiz/branches/release15.12/framework/catalina/lib/ecj-4.5.jar >>>>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/ecj-4.5.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-catalina.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-jasper.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-jasper.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar >>> >>>> - copied unchanged from r1738902, >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar >>> >>>> - copied unchanged from r1738902, >>>>>> >>>>>> >>>>>> >>> ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar >>> >>>> - copied unchanged from r1738902, >>>>>> >>>>>> ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar >>>>>> Removed: >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/base/lib/j2eespecs/el-api-2.2.jar >>> >>>> >>>>>> >>> ofbiz/branches/release15.12/framework/base/lib/j2eespecs/jsp-api-2.2.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/base/lib/j2eespecs/servlet-api-3.0.jar >>> >>>> ofbiz/branches/release15.12/framework/catalina/lib/ecj-4.4.2.jar >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-catalina.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-jasper.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar >>> >>>> Modified: >>>>>> ofbiz/branches/release15.12/ (props changed) >>>>>> ofbiz/branches/release15.12/.classpath >>>>>> ofbiz/branches/release15.12/LICENSE >>>>>> >>>>>> ofbiz/branches/release15.12/framework/catalina/ofbiz-component.xml >>>>>> >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java >>> >>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java >>> >>>> Propchange: ofbiz/branches/release15.12/ >>>>>> >>>>>> >>>>>> >>>>>> >>> ------------------------------------------------------------------------------ >>> >>>> --- svn:mergeinfo (original) >>>>>> +++ svn:mergeinfo Wed Apr 13 07:43:07 2016 >>>>>> @@ -9,4 +9,4 @@ >>>>>> /ofbiz/branches/json-integration-refactoring:1634077-1635900 >>>>>> /ofbiz/branches/multitenant20100310:921280-927264 >>>>>> /ofbiz/branches/release13.07:1547657 >>>>>> >>>>>> >>>>>> >>>>>> >>> -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407 >>> >>>> >>>>>> >>>>>> >>> +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902 >>> >>>> Modified: ofbiz/branches/release15.12/.classpath >>>>>> URL: >>>>>> >>>>>> >>>>>> >>> http://svn.apache.org/viewvc/ofbiz/branches/release15.12/.classpath?rev=1738904&r1=1738903&r2=1738904&view=diff >>> >>>> >>>>>> >>>>>> >>> ============================================================================== >>> >>>> --- ofbiz/branches/release15.12/.classpath (original) >>>>>> +++ ofbiz/branches/release15.12/.classpath Wed Apr 13 07:43:07 2016 >>>>>> @@ -81,9 +81,9 @@ >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/annotations-api-3.0.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/el-api-2.2.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/jsp-api-2.2.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/servlet-api-3.0.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/el-api-3.0.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/jsp-api-2.3.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/base/lib/j2eespecs/servlet-api-3.1.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/scripting/antlr-2.7.6.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/scripting/asm-3.2.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/scripting/bsf-2.4.0.jar"/> >>>>>> @@ -91,7 +91,7 @@ >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/scripting/groovy-all-2.4.5.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/scripting/jython-nooro.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/ecj-4.4.2.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/ecj-4.5.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/entity/lib/commons-dbcp2-2.1.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/service/lib/axiom-api-1.2.17.jar"/> >>>>>> @@ -190,15 +190,17 @@ >>>>>> <classpathentry kind="lib" >>>>>> path="specialpurpose/solr/lib/runtime/noggit-0.6.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="specialpurpose/solr/lib/runtime/org.restlet-2.3.0.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> >>>>>> >>>>>> >>> path="specialpurpose/solr/lib/runtime/org.restlet.ext.servlet-2.3.0.jar"/> >>> >>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-catalina.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-jasper.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar"/> >>>>>> - <classpathentry kind="lib" >>>>>> >>>>>> >>>>>> >>> path="framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar"/> >>> >>>> - <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-catalina.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-jasper.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar"/> >>>>>> + <classpathentry kind="lib" >>>>>> >>>>>> >>>>>> >>> path="framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar"/> >>> >>>> + <classpathentry kind="lib" >>>>>> path="framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar"/> >>>>>> <classpathentry kind="lib" >>>>>> path="framework/base/lib/xstream-1.4.9.jar"/> >>>>>> <classpathentry exported="true" kind="con" >>>>>> path="GROOVY_DSL_SUPPORT"/> >>>>>> <classpathentry kind="output" path="bin"/> >>>>>> >>>>>> Modified: ofbiz/branches/release15.12/LICENSE >>>>>> URL: >>>>>> >>>>>> >>>>>> >>> http://svn.apache.org/viewvc/ofbiz/branches/release15.12/LICENSE?rev=1738904&r1=1738903&r2=1738904&view=diff >>> >>>> >>>>>> >>>>>> >>> ============================================================================== >>> >>>> --- ofbiz/branches/release15.12/LICENSE (original) >>>>>> +++ ofbiz/branches/release15.12/LICENSE Wed Apr 13 07:43:07 2016 >>>>>> @@ -67,9 +67,9 @@ framework/base/lib/j2eespecs/geronimo-jm >>>>>> framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar >>>>>> framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar >>>>>> framework/base/lib/j2eespecs/annotations-api-3.0.jar >>>>>> -framework/base/lib/j2eespecs/el-api-2.2.jar >>>>>> -framework/base/lib/j2eespecs/jsp-api-2.2.jar >>>>>> -framework/base/lib/j2eespecs/servlet-api-3.0.jar >>>>>> +framework/base/lib/j2eespecs/el-api-3.0.jar >>>>>> +framework/base/lib/j2eespecs/jsp-api-2.3.jar >>>>>> +framework/base/lib/j2eespecs/servlet-api-3.1.jar >>>>>> framework/base/lib/owasp-java-html-sanitizer-r239.jar >>>>>> framework/base/lib/scripting/bsf-2.4.0.jar >>>>>> framework/base/lib/scripting/jakarta-oro-2.0.8.jar >>>>>> @@ -78,15 +78,17 @@ framework/base/lib/scripting/jansi-1.2.1 >>>>>> framework/base/lib/xmlrpc-client-3.1.2.jar >>>>>> framework/base/lib/xmlrpc-common-3.1.2.jar >>>>>> framework/base/lib/xmlrpc-server-3.1.2.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-catalina.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-jasper.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar >>>>>> -framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar >>>>>> -framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar >>>>>> -framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-catalina.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-jasper.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar >>>>>> +framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar >>>>>> +framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar >>>>>> +framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar >>>>>> framework/entity/lib/commons-dbcp2-2.1.jar >>>>>> framework/entity/lib/jdbc/derby-10.11.1.1.jar >>>>>> framework/geronimo/lib/geronimo-transaction-3.1.1.jar >>>>>> @@ -2182,7 +2184,7 @@ of California, with venue lying in Santa >>>>>> >>>>>> >>>>>> >>> ========================================================================= >>> >>>> The following libraries distributed with Apache OFBiz are licensed >>>>>> under >>>>>> the >>>>>> Eclipse Public License - v 1.0: >>>>>> -framework/catalina/lib/ecj-4.4.2.jar >>>>>> +framework/catalina/lib/ecj-4.5.jar >>>>>> >>>>>> >>>>>> >>> ========================================================================= >>> >>>> Eclipse Public License - v 1.0 >>>>>> >>>>>> >>>>>> Modified: >>>>>> ofbiz/branches/release15.12/framework/catalina/ofbiz-component.xml >>>>>> URL: >>>>>> >>>>>> >>>>>> >>> http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/catalina/ofbiz-component.xml?rev=1738904&r1=1738903&r2=1738904&view=diff >>> >>>> >>>>>> >>>>>> >>> ============================================================================== >>> >>>> --- ofbiz/branches/release15.12/framework/catalina/ofbiz-component.xml >>>>>> (original) >>>>>> +++ ofbiz/branches/release15.12/framework/catalina/ofbiz-component.xml >>>>>> Wed >>>>>> Apr 13 07:43:07 2016 >>>>>> @@ -67,7 +67,7 @@ under the License. >>>>>> <property name="enable-cross-subdomain-sessions" >>>>>> value="false"/> >>>>>> </property> >>>>>> <property name="ajp-connector" value="connector"> >>>>>> - <!-- see >>>>>> http://tomcat.apache.org/tomcat-7.0-doc/config/ajp.html for reference >>>>>> --> >>>>>> + <!-- see >>>>>> http://tomcat.apache.org/tomcat-8.0-doc/config/ajp.html for reference >>>>>> --> >>>>>> <!--<property name="address" value=""/>--> >>>>>> <property name="port" value="8009"/> >>>>>> <property name="protocol" value="AJP/1.3"/> >>>>>> @@ -96,7 +96,7 @@ under the License. >>>>>> --> >>>>>> </property> >>>>>> <property name="http-connector" value="connector"> >>>>>> - <!-- see >>>>>> http://tomcat.apache.org/tomcat-7.0-doc/config/http.html for >>>>>> reference >>>>>> --> >>>>>> + <!-- see >>>>>> http://tomcat.apache.org/tomcat-8.0-doc/config/http.html for >>>>>> reference >>>>>> --> >>>>>> <!--<property name="address" value=""/>--> >>>>>> <property name="port" value="8080"/> >>>>>> <property name="protocol" value="HTTP/1.1"/> >>>>>> @@ -125,7 +125,7 @@ under the License. >>>>>> --> >>>>>> </property> >>>>>> <property name="https-connector" value="connector"> >>>>>> - <!-- see >>>>>> http://tomcat.apache.org/tomcat-7.0-doc/config/http.html for >>>>>> reference >>>>>> --> >>>>>> + <!-- see >>>>>> http://tomcat.apache.org/tomcat-8.0-doc/config/http.html for >>>>>> reference >>>>>> --> >>>>>> <!--<property name="address" value=""/>--> >>>>>> <property name="port" value="8443"/> >>>>>> <property name="protocol" value="HTTP/1.1"/> >>>>>> >>>>>> Modified: >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java >>> >>>> URL: >>>>>> >>>>>> >>>>>> >>> http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1738904&r1=1738903&r2=1738904&view=diff >>> >>>> >>>>>> >>>>>> >>> ============================================================================== >>> >>>> --- >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java >>> >>>> (original) >>>>>> +++ >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java >>> >>>> Wed Apr 13 07:43:07 2016 >>>>>> @@ -45,8 +45,6 @@ import org.apache.catalina.core.Standard >>>>>> import org.apache.catalina.core.StandardEngine; >>>>>> import org.apache.catalina.core.StandardHost; >>>>>> import org.apache.catalina.core.StandardServer; >>>>>> -import org.apache.catalina.deploy.FilterDef; >>>>>> -import org.apache.catalina.deploy.FilterMap; >>>>>> import org.apache.catalina.filters.RequestDumperFilter; >>>>>> import org.apache.catalina.ha.tcp.ReplicationValve; >>>>>> import org.apache.catalina.ha.tcp.SimpleTcpCluster; >>>>>> @@ -60,10 +58,12 @@ import org.apache.catalina.tribes.transp >>>>>> import org.apache.catalina.tribes.transport.nio.NioReceiver; >>>>>> import org.apache.catalina.util.ServerInfo; >>>>>> import org.apache.catalina.valves.AccessLogValve; >>>>>> +import org.apache.catalina.webresources.StandardRoot; >>>>>> import org.apache.tomcat.JarScanner; >>>>>> import org.apache.tomcat.util.IntrospectionUtils; >>>>>> +import org.apache.tomcat.util.descriptor.web.FilterDef; >>>>>> +import org.apache.tomcat.util.descriptor.web.FilterMap; >>>>>> import org.apache.tomcat.util.scan.StandardJarScanner; >>>>>> - >>>>>> import org.ofbiz.base.component.ComponentConfig; >>>>>> import org.ofbiz.base.concurrent.ExecutionPool; >>>>>> import org.ofbiz.base.container.Container; >>>>>> @@ -572,7 +572,10 @@ public class CatalinaContainer implement >>>>>> >>>>>> context.setDisplayName(appInfo.name); >>>>>> context.setDocBase(location); >>>>>> - context.setAllowLinking(true); >>>>>> + >>>>>> + StandardRoot resources = new StandardRoot(context); >>>>>> + resources.setAllowLinking(true); >>>>>> + context.setResources(resources); >>>>>> >>>>>> context.setReloadable(contextReloadable); >>>>>> >>>>>> >>>>>> Modified: >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java >>> >>>> URL: >>>>>> >>>>>> >>>>>> >>> http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1738904&r1=1738903&r2=1738904&view=diff >>> >>>> >>>>>> >>>>>> >>> ============================================================================== >>> >>>> --- >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java >>> >>>> (original) >>>>>> +++ >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java >>> >>>> Wed Apr 13 07:43:07 2016 >>>>>> @@ -29,7 +29,6 @@ import org.apache.catalina.util.SessionC >>>>>> import org.apache.catalina.valves.ValveBase; >>>>>> import org.apache.tomcat.util.buf.MessageBytes; >>>>>> import org.apache.tomcat.util.http.MimeHeaders; >>>>>> -import org.apache.tomcat.util.http.ServerCookie; >>>>>> import org.ofbiz.base.util.Debug; >>>>>> import org.ofbiz.base.util.UtilValidate; >>>>>> import org.ofbiz.entity.Delegator; >>>>>> @@ -113,12 +112,10 @@ public class CrossSubdomainSessionValve >>>>>> if (mimeHeaders.getName(i).equals("Set-Cookie")) { >>>>>> MessageBytes value = mimeHeaders.getValue(i); >>>>>> if (value.indexOf(cookie.getName()) >= 0) { >>>>>> - StringBuffer buffer = new StringBuffer(); >>>>>> - ServerCookie.appendCookieValue(buffer, >>>>>> newCookie.getVersion(), newCookie.getName(), newCookie.getValue(), >>>>>> newCookie.getPath(), >>>>>> - newCookie.getDomain(), >>>>>> newCookie.getComment(), newCookie.getMaxAge(), newCookie.getSecure(), >>>>>> true); >>>>>> + String newCookieValue = >>>>>> request.getContext().getCookieProcessor().generateHeader(newCookie); >>>>>> >>>>>> Debug.logVerbose("CrossSubdomainSessionValve: >>>>>> old >>>>>> Set-Cookie value: " + value.toString(), module); >>>>>> - Debug.logVerbose("CrossSubdomainSessionValve: >>>>>> new >>>>>> Set-Cookie value: " + buffer, module); >>>>>> - value.setString(buffer.toString()); >>>>>> + Debug.logVerbose("CrossSubdomainSessionValve: >>>>>> new >>>>>> Set-Cookie value: " + newCookieValue, module); >>>>>> + value.setString(newCookieValue); >>>>>> } >>>>>> } >>>>>> } >>>>>> >>>>>> Modified: >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java >>> >>>> URL: >>>>>> >>>>>> >>>>>> >>> http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java?rev=1738904&r1=1738903&r2=1738904&view=diff >>> >>>> >>>>>> >>>>>> >>> ============================================================================== >>> >>>> --- >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java >>> >>>> (original) >>>>>> +++ >>>>>> >>>>>> >>>>>> >>> ofbiz/branches/release15.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java >>> >>>> Wed Apr 13 07:43:07 2016 >>>>>> @@ -24,11 +24,11 @@ import java.io.IOException; >>>>>> import java.io.InputStream; >>>>>> import java.util.Map.Entry; >>>>>> >>>>>> -import org.apache.catalina.deploy.ServletDef; >>>>>> -import org.apache.catalina.deploy.WebXml; >>>>>> -import org.apache.catalina.startup.WebRuleSet; >>>>>> import org.apache.tomcat.util.digester.Digester; >>>>>> import org.apache.tomcat.util.descriptor.DigesterFactory; >>>>>> +import org.apache.tomcat.util.descriptor.web.ServletDef; >>>>>> +import org.apache.tomcat.util.descriptor.web.WebRuleSet; >>>>>> +import org.apache.tomcat.util.descriptor.web.WebXml; >>>>>> import org.ofbiz.base.component.ComponentConfig; >>>>>> import org.ofbiz.base.component.ComponentConfig.WebappInfo; >>>>>> import org.ofbiz.base.util.Assert; >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> >
