svn commit: r645935 - in /ofbiz/trunk/framework/base/src: base/org/ofbiz/base/container/ComponentContainer.java start/org/ofbiz/base/start/Start.java

Author: jleroux
Date: Tue Apr  8 07:11:23 2008
New Revision: 645935

URL: http://svn.apache.org/viewvc?rev=645935&view=rev
Log:
A patch from Yin T "Skip ".svn" subdirectories when searching for JAR files during ofbiz startup" (https://issues.apache.org/jira/browse/OFBIZ-1712) - OFBIZ-1712

Modified:
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java
    ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/Start.java

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java?rev=645935&r1=645934&r2=645935&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java Tue Apr  8 07:11:23 2008
@@ -179,7 +179,7 @@
                 for (String sub: parentPath.list()) {
                     try {
                         File componentPath = new File(parentPath.getCanonicalPath() + "/" + sub);
-                        if (componentPath.isDirectory() && !sub.equals("CVS")) {
+                        if (componentPath.isDirectory() && !sub.equals("CVS") && !sub.equals(".svn")) {
                             // make sure we have a component configuraton file
                             String componentLocation = componentPath.getCanonicalPath();
                             File configFile = new File(componentLocation + "/ofbiz-component.xml");

Modified: ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/Start.java?rev=645935&r1=645934&r2=645935&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/Start.java (original)
+++ ofbiz/trunk/framework/base/src/start/org/ofbiz/base/start/Start.java Tue Apr  8 07:11:23 2008
@@ -171,7 +171,7 @@
             for (File file: files) {
                 String fileName = file.getName();
                 // FIXME: filter out other files?
-                if (file.isDirectory() && !"CVS".equals(fileName) && recurse) {
+                if (file.isDirectory() && !"CVS".equals(fileName) && !".svn".equals(fileName) && recurse) {
                     loadLibs(file.getCanonicalPath(), recurse);
                 } else if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) {
                     classPath.addComponent(file);
@@ -750,4 +750,5 @@
         }
     }
 }
+