svn commit: r1763241 - in /ofbiz/trunk/framework/catalina: config/ config/catalina.properties src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java

Author: jleroux
Date: Tue Oct  4 08:09:00 2016
New Revision: 1763241

URL: http://svn.apache.org/viewvc?rev=1763241&view=rev
Log:
Improves: Add WebSocket support in OFBiz
(OFBIZ-7073)

With last Amardeep Singh Jhajj's patch we introduced a slow down when starting.

The simple trick is to check if we want to use websocket or not.
By default (webSocket=false in catalina.properties) we don't and I gain 17 sec
on my machine (13 instead of 30). Not a big deal but the log is also cleaner.
And I guess not everybody needs websockets.

This should be documented in the wiki page to come with OFBIZ-7538. Then the
comment for webSocket in catalina.properties should be changed accordingly

If we want to always have webSocket available, then we should start from
Tomcat StandardJarScanFilter class and adapt it to our needs.

Added:
    ofbiz/trunk/framework/catalina/config/
    ofbiz/trunk/framework/catalina/config/catalina.properties   (with props)
Modified:
    ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java

Added: ofbiz/trunk/framework/catalina/config/catalina.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/config/catalina.properties?rev=1763241&view=auto
==============================================================================
--- ofbiz/trunk/framework/catalina/config/catalina.properties (added)
+++ ofbiz/trunk/framework/catalina/config/catalina.properties Tue Oct  4 08:09:00 2016
@@ -0,0 +1,21 @@
+###############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+###############################################################################
+
+## Use webSocket or not, see OFBIZ-7073 and subtasks
+webSocket=false
\ No newline at end of file

Propchange: ofbiz/trunk/framework/catalina/config/catalina.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/catalina/config/catalina.properties
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/framework/catalina/config/catalina.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java?rev=1763241&r1=1763240&r2=1763241&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java (original)
+++ ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java Tue Oct  4 08:09:00 2016
@@ -1,16 +1,13 @@
 package org.apache.ofbiz.catalina.container;
 
-import org.apache.tomcat.JarScanType;
+import org.apache.ofbiz.base.util.UtilProperties;
 import org.apache.tomcat.JarScanFilter;
+import org.apache.tomcat.JarScanType;
 
 final class FilterJars implements JarScanFilter {
 
     @Override
     public boolean check(final JarScanType jarScanType, final String jarName) {
-        if (jarName.contains("ofbiz.jar")) {
-            return true;
-        } else {
-            return false;
-        }
+        return UtilProperties.getPropertyAsBoolean("catalina", "webSocket", false) ? jarName.contains("ofbiz.jar") : false;
     }
 }