OPENJPA-148 Fix for scanning directories for persistent types.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@535139 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Marc Prud'hommeaux 2007-05-04 09:31:17 +00:00
parent d7d400b818
commit 2f4cafdcfb

View File

@ -609,7 +609,7 @@ public abstract class AbstractCFMetaDataFactory
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 @@ public abstract class AbstractCFMetaDataFactory
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 @@ public abstract class AbstractCFMetaDataFactory
}
if (types != null)
names.addAll(types);
if (log.isTraceEnabled())
log.trace(_loc.get("parse-found-names", names));
@ -799,8 +799,8 @@ public abstract class AbstractCFMetaDataFactory
/**
* Add all components in the given repository to the set to be
* serialized.
*/
public void addAll (MetaDataRepository repos);
}
* serialized.
*/
public void addAll (MetaDataRepository repos);
}
}