svn commit: r1761874 - /ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java

[jl...@apache.org]

Author: jleroux
Date: Thu Sep 22 09:30:19 2016
New Revision: 1761874

URL: http://svn.apache.org/viewvc?rev=1761874&view=rev
Log:
Fixes: Add WebSocket support in OFBiz (this was broken with Gradle)
(OFBIZ-7073)

WebSocket support was not working after the upgrade of trunk to Gradle. 
I have slightly changed the FilterJar.java to scan only ofbiz.jar. 
It is working now. 

jleroux: Of course the trick used before with the discoverable word in jars 
filenames no longer makes sense. But since there is now only this ofbiz.jar to 
parse it's now less an issue and will not delay OFBiz start in a noticeable
 way. At least I did not notice any noticeable effect.

Thanks: Amardeep Singh Jhajj 

Modified:
    ofbiz/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/FilterJars.java

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=1761874&r1=1761873&r2=1761874&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 Thu Sep 22 09:30:19 2016
@@ -7,7 +7,7 @@ final class FilterJars implements JarSca
 
     @Override
     public boolean check(final JarScanType jarScanType, final String jarName) {
-        if (jarName.contains("discoverable")) {
+        if (jarName.contains("ofbiz.jar")) {
             return true; 
         } else {
             return false;