Re: svn commit: r1772879 - in /ofbiz/trunk: ./ framework/base/src/main/java/org/apache/ofbiz/base/container/ framework/start/src/main/java/org/apache/ofbiz/base/start/

[Jacques Le Roux]

Le 06/12/2016 à 13:31, ta...@apache.org a écrit :

Author: taher
Date: Tue Dec  6 12:31:00 2016
New Revision: 1772879

URL: http://svn.apache.org/viewvc?rev=1772879&view=rev
Log:
Improved: Refactor and simplify the startup sequence in OFBiz
(OFBIZ-8337)

This is another major commit to the refactoring of the startup sequence in
OFBiz with the following highlighted changes:

[...]

- Add the DTDs defined in base through Gradle because we removed the
   NativeLibClassLoader and the classpath buildup logic in StartupControlPanel

Thanks: Jacopo Cappellato for reviewing the work

Removed:
     
ofbiz/trunk/framework/start/src/main/java/org/apache/ofbiz/base/start/NativeLibClassLoader.java
Modified:
     ofbiz/trunk/build.gradle

[...]

Modified: ofbiz/trunk/build.gradle
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1772879&r1=1772878&r2=1772879&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Tue Dec  6 12:31:00 2016
@@ -204,19 +204,19 @@ sourceSets {
          resources {
              srcDirs = getDirectoryInActiveComponentsIfExists('src/main/java')
              srcDirs += getDirectoryInActiveComponentsIfExists('config')
+            srcDirs += "${rootDir}/framework/base/dtd"
              exclude excludedJavaSources
              exclude excludedConfigFiles
              // Below are necessary for unit tests run by Gradle and 
integration tests
+            exclude { FileTreeElement elem -> 
elem.getName().contains('.Labels.xml') }
              exclude { FileTreeElement elem -> elem.getName().contains('.properties') 
&&
                  !elem.getName().contains('start.properties') &&
                  !elem.getName().contains('load-data.properties') &&
                  !elem.getName().contains('debug.properties') &&
                  !elem.getName().contains('cache.properties') &&
                  !elem.getName().contains('test.properties') &&
-                !elem.getName().contains('rmi.properties')}
-            exclude { FileTreeElement elem -> elem.getName().contains('.xml') 
&&
-                !elem.getName().contains('entityengine.xml')
-                }
+                !elem.getName().contains('rmi.properties')
+            }
          }
      }

Hi Taher,

I'm just begining to review and stumbled upon this. What is the plan of having 
all XML files embedded in the ofbiz.jar file?

Notably the labels files are bad because being static in the ofbiz.jar file 
they no longer can be modified.
It seems you took this into account after 
https://issues.apache.org/jira/browse/OFBIZ-8321 but wrongly wrote the related 
line (you would need a regexp)

+            exclude { FileTreeElement elem -> 
elem.getName().contains('.Labels.xml') }

Now I see no reasons to put other XML files in the ofbiz.jar file but 
entityengine.xml which should not be changed when OFBiz runs.
So the only resources which should be in ofbiz.jars are
    cache.properties
    debug.properties
    entityengine.xml
Else please explain why.

Thanks

Jacques