Author: rmannibucau
Date: Fri May 17 11:30:11 2013
New Revision: 1483742
URL: http://svn.apache.org/r1483742
Log:
TOMEE-942 (linux) ignoring so in scanning
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1483742&r1=1483741&r2=1483742&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
Fri May 17 11:30:11 2013
@@ -62,6 +62,9 @@ public class NewLoaderLogic {
public static final String ADDITIONAL_EXCLUDES =
SystemInstance.get().getOptions().get("openejb.additional.exclude", (String)
null);
public static final String ADDITIONAL_INCLUDE =
SystemInstance.get().getOptions().get("openejb.additional.include", (String)
null);
public static final String EXCLUSION_FILE = "exclusions.list";
+
+ private static final boolean UNIX =
!System.getProperty("os.name").toLowerCase().contains("win");
+
private static String[] exclusions = null;
private static Filter filter;
@@ -176,6 +179,14 @@ public class NewLoaderLogic {
final File file = URLs.toFile(url);
final String name = filter(file).getName();
+
+ if (UNIX) { // skip native
+ if (!name.endsWith(".jar") && !file.isDirectory()
+ && name.contains(".so") &&
file.getAbsolutePath().startsWith("/usr/lib")) {
+ return true;
+ }
+ }
+
if (includeFilter == null || !includeFilter.accept(name)) {
if (filter != null && filter.accept(name)) {
return true;