Author: jacopoc
Date: Tue Sep 3 06:20:23 2013
New Revision: 1519577
URL: http://svn.apache.org/r1519577
Log:
Removed parameter from the catalina-container setup that is deprecated:
public void setResolveHosts(boolean resolveHosts)
Deprecated. Unused, removed in Tomcat 8. See
org.apache.catalina.connector.Connector.setEnableLookups(boolean).
and according to the above notes I have enabled the same behavior using the
enableLookups flag in the Connectors.
This change resolves a warning during compilation but requires more testing.
Modified:
ofbiz/trunk/framework/catalina/ofbiz-component.xml
ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
Modified: ofbiz/trunk/framework/catalina/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/ofbiz-component.xml?rev=1519577&r1=1519576&r2=1519577&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/catalina/ofbiz-component.xml Tue Sep 3 06:20:23 2013
@@ -43,7 +43,6 @@ under the License.
<property name="access-log-pattern">
<property-value>%h %l %u %t "%r" %s %b "%{Referer}i"
"%{User-Agent}i"</property-value>
</property>
- <property name="access-log-resolve" value="true"/>
<property name="access-log-rotate" value="true"/>
<property name="access-log-prefix" value="access_log."/>
<property name="access-log-dir" value="runtime/logs"/>
@@ -74,7 +73,7 @@ under the License.
<!-- see
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference
-->
<property name="allowTrace" value="false"/>
<property name="emptySessionPath" value="false"/>
- <property name="enableLookups" value="false"/>
+ <property name="enableLookups" value="true"/>
<property name="maxPostSize" value="2097152"/>
<property name="protocol" value="AJP/1.3"/>
<property name="proxyName" value=""/>
@@ -100,7 +99,7 @@ under the License.
<!-- see
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference
-->
<property name="allowTrace" value="false"/>
<property name="emptySessionPath" value="false"/>
- <property name="enableLookups" value="false"/>
+ <property name="enableLookups" value="true"/>
<property name="maxPostSize" value="2097152"/>
<property name="protocol" value="HTTP/1.1"/>
<property name="proxyName" value=""/>
@@ -138,7 +137,7 @@ under the License.
<!-- see
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference
-->
<property name="allowTrace" value="false"/>
<property name="emptySessionPath" value="false"/>
- <property name="enableLookups" value="false"/>
+ <property name="enableLookups" value="true"/>
<property name="maxPostSize" value="2097152"/>
<property name="protocol" value="HTTP/1.1"/>
<property name="proxyName" value=""/>
@@ -202,7 +201,6 @@ under the License.
<property name="access-log-pattern">
<property-value>%h %l %u %t "%r" %s %b "%{Referer}i"
"%{User-Agent}i"</property-value>
</property>
- <property name="access-log-resolve" value="true"/>
<property name="access-log-rotate" value="true"/>
<property name="access-log-prefix" value="access_log."/>
<property name="access-log-dir" value="runtime/logs"/>
@@ -233,7 +231,7 @@ under the License.
<!-- see
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/ajp.html for reference
-->
<property name="allowTrace" value="false"/>
<property name="emptySessionPath" value="false"/>
- <property name="enableLookups" value="false"/>
+ <property name="enableLookups" value="true"/>
<property name="maxPostSize" value="2097152"/>
<property name="protocol" value="AJP/1.3"/>
<property name="proxyName" value=""/>
@@ -259,7 +257,7 @@ under the License.
<!-- see
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference
-->
<property name="allowTrace" value="false"/>
<property name="emptySessionPath" value="false"/>
- <property name="enableLookups" value="false"/>
+ <property name="enableLookups" value="true"/>
<property name="maxPostSize" value="2097152"/>
<property name="protocol" value="HTTP/1.1"/>
<property name="proxyName" value=""/>
@@ -297,7 +295,7 @@ under the License.
<!-- see
http://jakarta.apache.org/tomcat/tomcat-5.5-doc/config/http.html for reference
-->
<property name="allowTrace" value="false"/>
<property name="emptySessionPath" value="false"/>
- <property name="enableLookups" value="false"/>
+ <property name="enableLookups" value="true"/>
<property name="maxPostSize" value="2097152"/>
<property name="protocol" value="HTTP/1.1"/>
<property name="proxyName" value=""/>
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=1519577&r1=1519576&r2=1519577&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
Tue Sep 3 06:20:23 2013
@@ -350,12 +350,6 @@ public class CatalinaContainer implement
al.setPrefix(alp3);
}
-
- boolean alp4 = ContainerConfig.getPropertyValue(engineConfig,
"access-log-resolve", true);
- if (al != null) {
- al.setResolveHosts(alp4);
- }
-
boolean alp5 = ContainerConfig.getPropertyValue(engineConfig,
"access-log-rotate", false);
if (al != null) {
al.setRotatable(alp5);
