You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by db...@apache.org on 2011/07/22 05:48:44 UTC
svn commit: r1149448 -
/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
Author: dblevins
Date: Fri Jul 22 03:48:43 2011
New Revision: 1149448
URL: http://svn.apache.org/viewvc?rev=1149448&view=rev
Log:
Final tweak for GERONIMO-6090
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=1149448&r1=1149447&r2=1149448&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 03:48:43 2011
@@ -232,8 +232,6 @@ public class OpenWebBeansModuleBuilderEx
@Override
public boolean zipFileDiscoveryRequired(String zipFileName) {
- // There is no path information here so we can only go by file name
- // We were attempting to filter down to only jars in WEB-INF/lib/
return zipFileName.endsWith(".jar");
}
@@ -247,8 +245,6 @@ public class OpenWebBeansModuleBuilderEx
@Override
public boolean foundInJar(Bundle bundle, String zipFileName, ZipEntry zipEntry, InputStream in) throws Exception {
- // TODO This line is never reached, we end up scanning all jar files by default
- // this will no doubt cause a lot of issues in the EE TCK
String zipEntryName = zipEntry.getName();
if (zipEntryName.equals("META-INF/beans.xml")) {
annotationScanRequiredJarFiles.add(zipFileName);