svn commit: r1640305 - in /ofbiz/branches/release12.04/framework/base/config: both-containers.xml ofbiz-containers.xml test-containers.xml

Author: jleroux
Date: Tue Nov 18 10:43:38 2014
New Revision: 1640305

URL: http://svn.apache.org/r1640305
Log:
"Applied fix from trunk for revision: 1640299" ***All done by hand*** (not the same files)
------------------------------------------------------------------------
r1640299 | jleroux | 2014-11-18 11:33:50 +0100 (mar. 18 nov. 2014) | 1 ligne

With Tomcat 7.0.57 we no longer need to force the TLS version to v1.2
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release12.04/framework/base/config/both-containers.xml
    ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml
    ofbiz/branches/release12.04/framework/base/config/test-containers.xml

Modified: ofbiz/branches/release12.04/framework/base/config/both-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/config/both-containers.xml?rev=1640305&r1=1640304&r2=1640305&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/base/config/both-containers.xml (original)
+++ ofbiz/branches/release12.04/framework/base/config/both-containers.xml Tue Nov 18 10:43:38 2014
@@ -246,8 +246,7 @@ under the License.
             <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/>
             <property name="keystorePass" value="changeit"/>
             <property name="keystoreType" value="JKS"/>
-            <property name="sslProtocol" value="TLSv1.2"/>
-            <property name="sslEnabledProtocols" value="TLSv1.2"/>
+            <property name="sslProtocol" value="TLS"/>
             <property name="ciphers" value=""/>
         </property>
     </container>

Modified: ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml?rev=1640305&r1=1640304&r2=1640305&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/release12.04/framework/base/config/ofbiz-containers.xml Tue Nov 18 10:43:38 2014
@@ -243,8 +243,7 @@ under the License.
             <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/>
             <property name="keystorePass" value="changeit"/>
             <property name="keystoreType" value="JKS"/>
-            <property name="sslProtocol" value="TLSv1.2"/>
-            <property name="sslEnabledProtocols" value="TLSv1.2"/>
+            <property name="sslProtocol" value="TLS"/>
             <property name="ciphers" value=""/>
         </property>
     </container>

Modified: ofbiz/branches/release12.04/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/base/config/test-containers.xml?rev=1640305&r1=1640304&r2=1640305&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/base/config/test-containers.xml (original)
+++ ofbiz/branches/release12.04/framework/base/config/test-containers.xml Tue Nov 18 10:43:38 2014
@@ -215,8 +215,7 @@ under the License.
             <property name="keystoreFile" value="framework/base/config/ofbizssl.jks"/>
             <property name="keystorePass" value="changeit"/>
             <property name="keystoreType" value="JKS"/>
-            <property name="sslProtocol" value="TLSv1.2"/>
-            <property name="sslEnabledProtocols" value="TLSv1.2"/>
+            <property name="sslProtocol" value="TLS"/>
             <property name="ciphers" value=""/>
         </property>
     </container>