You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/05/20 13:15:01 UTC
svn commit: r1744733 - in /ofbiz/branches/release14.12: ./
framework/base/lib/j2eespecs/ framework/catalina/ framework/catalina/lib/
framework/catalina/src/org/ofbiz/catalina/container/
framework/webapp/src/org/ofbiz/webapp/
Author: jleroux
Date: Fri May 20 13:15:01 2016
New Revision: 1744733
URL: http://svn.apache.org/viewvc?rev=1744733&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/release14.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/release14.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/release14.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/release14.12/framework/catalina/lib/ecj-4.5.jar
- copied unchanged from r1738902, ofbiz/trunk/framework/catalina/lib/ecj-4.5.jar
ofbiz/branches/release14.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/release14.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/release14.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/release14.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/release14.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/release14.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/release14.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/release14.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/release14.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/release14.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/release14.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/release14.12/framework/base/lib/j2eespecs/el-api-2.2.jar
ofbiz/branches/release14.12/framework/base/lib/j2eespecs/jsp-api-2.2.jar
ofbiz/branches/release14.12/framework/base/lib/j2eespecs/servlet-api-3.0.jar
ofbiz/branches/release14.12/framework/catalina/lib/ecj-4.4.2.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-catalina.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-jasper.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar
ofbiz/branches/release14.12/framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/.classpath
ofbiz/branches/release14.12/LICENSE
ofbiz/branches/release14.12/framework/catalina/ofbiz-component.xml
ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 13:15:01 2016
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065
77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17
44662
Modified: ofbiz/branches/release14.12/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/.classpath?rev=1744733&r1=1744732&r2=1744733&view=diff
==============================================================================
--- ofbiz/branches/release14.12/.classpath (original)
+++ ofbiz/branches/release14.12/.classpath Fri May 20 13:15:01 2016
@@ -79,9 +79,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"/>
@@ -95,16 +95,19 @@
<classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.301.v20130717-1549.jar"/>
<classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.osgi_3.9.1.v20130814-1242.jar"/>
<classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.2.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.jar"/>
- <classpathentry kind="lib" path="framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar"/>
+ <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.5.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/entity/lib/commons-dbcp2-2.1.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
<classpathentry kind="lib" path="specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
Modified: ofbiz/branches/release14.12/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/LICENSE?rev=1744733&r1=1744732&r2=1744733&view=diff
==============================================================================
--- ofbiz/branches/release14.12/LICENSE (original)
+++ ofbiz/branches/release14.12/LICENSE Fri May 20 13:15:01 2016
@@ -64,9 +64,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
@@ -75,15 +75,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
@@ -2179,7 +2181,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/release14.12/framework/catalina/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/catalina/ofbiz-component.xml?rev=1744733&r1=1744732&r2=1744733&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/branches/release14.12/framework/catalina/ofbiz-component.xml Fri May 20 13:15:01 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/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1744733&r1=1744732&r2=1744733&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Fri May 20 13:15:01 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/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1744733&r1=1744732&r2=1744733&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original)
+++ ofbiz/branches/release14.12/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Fri May 20 13:15:01 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.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
@@ -114,12 +113,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/release14.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java?rev=1744733&r1=1744732&r2=1744733&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java (original)
+++ ofbiz/branches/release14.12/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java Fri May 20 13:15:01 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;