Hmm, while debugging the changes, I remembered that the zipFileName contains the prefix, and the codes were ported from MyFacesModuleBuilderExtension, If it does have no prefix, the other codes might also need to update. Anyway, thanks, David.
2011/7/22 <dblev...@apache.org> > Author: dblevins > Date: Fri Jul 22 00:41:57 2011 > New Revision: 1149422 > > URL: http://svn.apache.org/viewvc?rev=1149422&view=rev > Log: > Tweak to GERONIMO-6090. The lib directory is never part of the jarFile > name > > Modified: > > > geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java > > Modified: > geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java > URL: > http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=1149422&r1=1149421&r2=1149422&view=diff > > ============================================================================== > --- > geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java > (original) > +++ > geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java > Fri Jul 22 00:41:57 2011 > @@ -215,7 +215,6 @@ public class OpenWebBeansModuleBuilderEx > //1. Generated the jar file list, which contains > META-INF/beans.xml file > final Set<String> annotationScanRequiredJarFiles = new > HashSet<String>(); > String moduleNamePrefix = webModule.isStandAlone() ? "" : > webModule.getTargetPath() + "/"; > - final String libDirectory = moduleNamePrefix + "WEB-INF/lib"; > BundleResourceFinder resourceFinder = new > BundleResourceFinder(packageAdmin, bundle, "META-INF/", "beans.xml", new > ResourceDiscoveryFilter() { > > @Override > @@ -230,7 +229,7 @@ public class OpenWebBeansModuleBuilderEx > > @Override > public boolean zipFileDiscoveryRequired(String zipFileName) > { > - return zipFileName.startsWith(libDirectory) && > zipFileName.endsWith(".jar"); > + return zipFileName.endsWith(".jar"); > } > > }); > > > -- Ivan
