You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/09/13 21:48:20 UTC
svn commit: r996665 - in /geronimo/server/trunk/plugins:
j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/
jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/
openjpa2/geronimo-persistence-jpa20-builde...
Author: gawor
Date: Mon Sep 13 19:48:19 2010
New Revision: 996665
URL: http://svn.apache.org/viewvc?rev=996665&view=rev
Log:
ResourceFinderCallback API updates
Modified:
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java?rev=996665&r1=996664&r2=996665&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/merge/MergeHelper.java Mon Sep 13 19:48:19 2010
@@ -257,11 +257,12 @@ public class MergeHelper {
BundleResourceFinder resourceFinder = new BundleResourceFinder(packageAdmin, bundle, "META-INF/services", "javax.servlet.ServletContainerInitializer");
resourceFinder.find(new ResourceFinderCallback() {
- public void foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception {
+ public boolean foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception {
//ignore
+ return true;
}
- public void foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception {
+ public boolean foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception {
if (!excludedJarNames.contains(jarName)) {
BufferedReader bufferedReader = null;
try {
@@ -279,6 +280,7 @@ public class MergeHelper {
IOUtils.close(bufferedReader);
}
}
+ return true;
}
});
Map<String, Set<String>> servletContainerInitializerClassNamesMap = new HashMap<String, Set<String>>();
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java?rev=996665&r1=996664&r2=996665&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/GeronimoTldLocationsCache.java Mon Sep 13 19:48:19 2010
@@ -269,13 +269,15 @@ public class GeronimoTldLocationsCache e
BundleResourceFinder resourceFinder = new BundleResourceFinder(packageAdmin, bundle, "META-INF/", ".tld");
resourceFinder.find(new ResourceFinderCallback() {
- public void foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception {
+ public boolean foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception {
tldScanStream(url, new TldLocation(url.getPath()));
+ return true;
}
- public void foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception {
+ public boolean foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception {
URL jarURL = bundle.getEntry(jarName);
tldScanStream(in, new TldLocation(entry.getName(), jarURL.toExternalForm()));
+ return true;
}
});
Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java?rev=996665&r1=996664&r2=996665&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/src/main/java/org/apache/geronimo/jasper/TldRegistration.java Mon Sep 13 19:48:19 2010
@@ -99,16 +99,18 @@ public class TldRegistration implements
return tlds;
}
- public void foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception {
+ public boolean foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception {
LOGGER.debug("Found {} TLD in bundle {}", url, bundle);
tlds.add(new TldProvider.TldEntry(bundle, url));
+ return true;
}
- public void foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception {
+ public boolean foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception {
URL jarURL = bundle.getEntry(jarName);
URL url = new URL("jar:" + jarURL.toString() + "!/" + entry.getName());
LOGGER.debug("Found {} TLD in bundle {}", url, bundle);
tlds.add(new TldProvider.TldEntry(bundle, url, jarURL));
+ return false;
}
}
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java?rev=996665&r1=996664&r2=996665&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java Mon Sep 13 19:48:19 2010
@@ -154,16 +154,16 @@ public class PersistenceUnitBuilder impl
final Map<URL, String> persistenceURLs = new HashMap<URL, String>();
finder.find(new BundleResourceFinder.ResourceFinderCallback() {
- @Override
- public void foundInDirectory(Bundle bundle, String baseDir, URL url) throws Exception {
+ public boolean foundInDirectory(Bundle bundle, String baseDir, URL url) throws Exception {
persistenceURLs.put(url, baseDir);
+ return true;
}
- @Override
- public void foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream inputStream) throws Exception {
+ public boolean foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream inputStream) throws Exception {
URL jarURL = bundle.getEntry(jarName);
URL url = new URL("jar:" + jarURL.toString() + "!/" + entry.getName());
persistenceURLs.put(url, jarName);
+ return true;
}
});
if (raws.length > 0 || persistenceURLs.size() > 0) {