svn commit: r1738902 - in /ofbiz/trunk: ./ framework/base/lib/j2eespecs/ framework/catalina/ framework/catalina/lib/ framework/catalina/src/org/ofb
Locked
svn commit: r1738902 - in /ofbiz/trunk: ./ framework/base/lib/j2eespecs/ framework/catalina/ framework/catalina/lib/ framework/catalina/src/org/ofb
 
|
Author: jleroux
Date: Wed Apr 13 07:40:25 2016 New Revision: 1738902 URL: http://svn.apache.org/viewvc?rev=1738902&view=rev Log: 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/trunk/framework/base/lib/j2eespecs/el-api-3.0.jar (with props) ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.3.jar (with props) ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.1.jar (with props) ofbiz/trunk/framework/catalina/lib/ecj-4.5.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-jasper.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar (with props) ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar (with props) Removed: ofbiz/trunk/framework/base/lib/j2eespecs/el-api-2.2.jar ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.2.jar ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.0.jar ofbiz/trunk/framework/catalina/lib/ecj-4.4.2.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-catalina-ha.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-catalina-tribes.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-catalina.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-jasper.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-tomcat-api.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-tomcat-coyote.jar ofbiz/trunk/framework/catalina/lib/tomcat-7.0.68-tomcat-util.jar ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli-adapters.jar ofbiz/trunk/framework/catalina/lib/tomcat-extras-7.0.68-tomcat-juli.jar Modified: ofbiz/trunk/.classpath ofbiz/trunk/LICENSE ofbiz/trunk/framework/catalina/ofbiz-component.xml ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1738902&r1=1738901&r2=1738902&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Wed Apr 13 07:40:25 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"/> @@ -192,15 +192,17 @@ <classpathentry kind="lib" path="specialpurpose/solr/lib/runtime/org.restlet.ext.servlet-2.3.0.jar"/> <classpathentry kind="lib" path="specialpurpose/solr/lib/runtime/httpmime-4.4.1.jar"/> <classpathentry kind="lib" path="specialpurpose/solr/lib/runtime/lucene-misc-5.3.1.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 kind="output" path="bin"/> </classpath> Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1738902&r1=1738901&r2=1738902&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Wed Apr 13 07:40:25 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 Added: ofbiz/trunk/framework/base/lib/j2eespecs/el-api-3.0.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/el-api-3.0.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/el-api-3.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.3.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.3.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/jsp-api-2.3.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.1.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.1.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/j2eespecs/servlet-api-3.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/ecj-4.5.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/ecj-4.5.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/ecj-4.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-ha.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina-tribes.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-catalina.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-jasper.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-jasper.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-jasper.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-api.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-coyote.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-jni.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util-scan.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-8.0.33-tomcat-util.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli-adapters.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar?rev=1738902&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/catalina/lib/tomcat-extras-8.0.33-tomcat-juli.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/framework/catalina/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/ofbiz-component.xml?rev=1738902&r1=1738901&r2=1738902&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/ofbiz-component.xml (original) +++ ofbiz/trunk/framework/catalina/ofbiz-component.xml Wed Apr 13 07:40:25 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/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=1738902&r1=1738901&r2=1738902&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Wed Apr 13 07:40:25 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; @@ -569,7 +569,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/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1738902&r1=1738901&r2=1738902&view=diff ============================================================================== --- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original) +++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CrossSubdomainSessionValve.java Wed Apr 13 07:40:25 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/trunk/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java?rev=1738902&r1=1738901&r2=1738902&view=diff ============================================================================== --- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java (original) +++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java Wed Apr 13 07:40:25 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; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |