svn commit: r1831076 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ build.gradle framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java

[jacopoc]

Author: jacopoc
Date: Mon May  7 07:24:53 2018
New Revision: 1831076

URL: http://svn.apache.org/viewvc?rev=1831076&view=rev
Log:
Applied fix from trunk for revision: 1831074
===

Implemented: Upgraded to latest Tomcat (9.0.7).
(OFBIZ-10036)


Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/build.gradle
    ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May  7 07:24:53 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074

Modified: ofbiz/ofbiz-framework/branches/release17.12/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/build.gradle?rev=1831076&r1=1831075&r2=1831076&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/build.gradle (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/build.gradle Mon May  7 07:24:53 2018
@@ -129,10 +129,10 @@ dependencies {
     compile 'org.apache.shiro:shiro-core:1.4.0'
     compile 'org.apache.tika:tika-core:1.16'
     compile 'org.apache.tika:tika-parsers:1.16'
-    compile 'org.apache.tomcat:tomcat-catalina-ha:8.5.24'
-    compile 'org.apache.tomcat:tomcat-catalina:8.5.24'
-    compile 'org.apache.tomcat:tomcat-jasper:8.5.24'
-    compile 'org.apache.tomcat:tomcat-tribes:8.5.24'
+    compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.7'
+    compile 'org.apache.tomcat:tomcat-catalina:9.0.7'
+    compile 'org.apache.tomcat:tomcat-jasper:9.0.7'
+    compile 'org.apache.tomcat:tomcat-tribes:9.0.7'
     compile 'org.apache.xmlgraphics:fop:2.2'
     compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
     compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'

Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java?rev=1831076&r1=1831075&r2=1831076&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/OFBizRealm.java Mon May  7 07:24:53 2018
@@ -36,11 +36,6 @@ public class OFBizRealm extends RealmBas
     public static final String module = OFBizRealm.class.getName();
 
     @Override
-    protected String getName() {
-        return "OFBizRealm";
-    }
-
-    @Override
     protected String getPassword(String username) {
         Delegator delegator = DelegatorFactory.getDelegator(null);
         try {