svn commit: r535139 - /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java

[mprudhom]

Author: mprudhom
Date: Fri May  4 02:31:17 2007
New Revision: 535139

URL: http://svn.apache.org/viewvc?view=rev&rev=535139
Log:
OPENJPA-148 Fix for scanning directories for persistent types.

Modified:
    
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java

Modified: 
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java?view=diff&rev=535139&r1=535138&r2=535139
==============================================================================
--- 
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
 (original)
+++ 
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
 Fri May  4 02:31:17 2007
@@ -609,7 +609,7 @@
                 if (file.isDirectory()) {
                     if (log.isTraceEnabled())
                         log.trace(_loc.get("scanning-directory", file));
-                    scan(new FileMetaDataIterator(dir, newMetaDataFilter()),
+                    scan(new FileMetaDataIterator(file, newMetaDataFilter()),
                         cparser, names, true, file);
                 } else if (file.getName().endsWith(".jar")) {
                     if (log.isTraceEnabled())
@@ -668,7 +668,7 @@
                             log.trace(_loc.get("scanning-jar-stream-url", 
url));
                         scan(new ZipStreamMetaDataIterator
                             (new ZipInputStream(url.openStream()),
-                                newMetaDataFilter()), cparser, names, true, 
+                                newMetaDataFilter()), cparser, names, true,
                                 url);
                     }
                 } else {
@@ -695,7 +695,7 @@
         }
         if (types != null)
             names.addAll(types);
-        
+
         if (log.isTraceEnabled())
             log.trace(_loc.get("parse-found-names", names));
         
@@ -799,8 +799,8 @@
 
         /**
          * Add all components in the given repository to the set to be
-                * serialized.
-                */
-               public void addAll (MetaDataRepository repos);
-       }
+         * serialized.
+         */
+        public void addAll (MetaDataRepository repos);
+    }
 }