svn commit: r645944 - in /ofbiz/branches/release4.0/framework/base/src: base/org/ofbiz/base/container/ComponentContainer.java start/org/ofbiz/base/start/Start.java

Author: jleroux
Date: Tue Apr  8 07:39:38 2008
New Revision: 645944

URL: http://svn.apache.org/viewvc?rev=645944&view=rev
Log:
Applied by hand fix from trunk for revision: 645935

Modified:
    ofbiz/branches/release4.0/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java
    ofbiz/branches/release4.0/framework/base/src/start/org/ofbiz/base/start/Start.java

Modified: ofbiz/branches/release4.0/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java?rev=645944&r1=645943&r2=645944&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java (original)
+++ ofbiz/branches/release4.0/framework/base/src/base/org/ofbiz/base/container/ComponentContainer.java Tue Apr  8 07:39:38 2008
@@ -170,7 +170,7 @@
                 for (int i = 0; i < subs.length; i++) {
                     try {
                         File componentPath = new File(parentPath.getCanonicalPath() + "/" + subs[i]);
-                        if (componentPath.isDirectory() && !subs[i].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/branches/release4.0/framework/base/src/start/org/ofbiz/base/start/Start.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/base/src/start/org/ofbiz/base/start/Start.java?rev=645944&r1=645943&r2=645944&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/base/src/start/org/ofbiz/base/start/Start.java (original)
+++ ofbiz/branches/release4.0/framework/base/src/start/org/ofbiz/base/start/Start.java Tue Apr  8 07:39:38 2008
@@ -169,7 +169,7 @@
             File files[] = libDir.listFiles();
             for (int i = 0; i < files.length; i++) {
                 String fileName = files[i].getName();
-                if (files[i].isDirectory() && !"CVS".equals(fileName) && recurse) {
+                if (file.isDirectory() && !"CVS".equals(fileName) && !".svn".equals(fileName) && recurse) {
                     loadLibs(files[i].getCanonicalPath(), recurse);
                 } else if (fileName.endsWith(".jar") || fileName.endsWith(".zip")) {
                     classPath.addComponent(files[i]);