Author: rmannibucau
Date: Mon Jan 7 15:59:01 2019
New Revision: 1850661
URL: http://svn.apache.org/viewvc?rev=1850661&view=rev
Log:
OWB-1278 more precise geronimo exclusions
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1850661&r1=1850660&r2=1850661&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
Mon Jan 7 15:59:01 2019
@@ -37,6 +37,7 @@ import org.apache.xbean.finder.Annotatio
import org.apache.xbean.finder.ClassLoaders;
import org.apache.xbean.finder.archive.Archive;
import org.apache.xbean.finder.filter.Filter;
+import org.apache.xbean.finder.util.Files;
import javax.decorator.Decorator;
import javax.interceptor.Interceptor;
@@ -263,6 +264,15 @@ public abstract class AbstractMetaDataDi
//X TODO we might need to configure it via files
it.remove();
}
+ else
+ {
+ // we could check for META-INF/maven/org.apache.geronimo.specs
presence there but this is faster
+ final String filename = Files.toFile(url).getName();
+ if (filename.startsWith("geronimo-") &&
filename.contains("_spec"))
+ {
+ it.remove();
+ }
+ }
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1850661&r1=1850660&r2=1850661&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Mon Jan 7 15:59:01 2019
@@ -162,7 +162,11 @@ org.apache.webbeans.scanExclusionPaths=/
/javassist, \
/xbean-, \
/jconsole.jar, \
- /geronimo-, \
+ /geronimo-connector,\
+ /geronimo-j2ee-,\
+ /geronimo-jpa_,\
+ /geronimo-javamail,\
+ /geronimo-transaction,\
/commons-, \
/arquillian-, \
/bsh-, \
