Author: rmannibucau
Date: Mon Sep 22 19:58:09 2014
New Revision: 1626884
URL: http://svn.apache.org/r1626884
Log:
TOMEE-1358 ensure additional include works + adding java 7 exclusions
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
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=1626884&r1=1626883&r2=1626884&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
Mon Sep 22 19:58:09 2014
@@ -299,13 +299,12 @@ public class NewLoaderLogic {
}
}
+ exclusions = excludes.toArray(new String[excludes.size()]);
getFilter(); // ensure filter is initialized
- final String[] asArray = excludes.toArray(new String[excludes.size()]);
+ logExclusions(exclusions);
- logExclusions(asArray);
-
- return asArray;
+ return exclusions;
}
@SuppressWarnings("unchecked")
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions?rev=1626884&r1=1626883&r2=1626884&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
Mon Sep 22 19:58:09 2014
@@ -61,7 +61,10 @@ el-api
eclipselink-
ehcache-
FastInfoset
-fleece-
+jce.jar
+jfr.jar
+jfxrt.jar
+johnzon-
fusemq-leveldb-
geronimo-
google-
@@ -126,6 +129,7 @@ log4j-
logkit-
lucene-analyzers-
lucene-core-
+management-agent.jar
maven-
mbean-annotation-api-
mimepull-
@@ -198,6 +202,7 @@ spring-
sshd-
stax-api-
stax2-api-
+sunec.jar
surefire-
swizzle-
sxc-
@@ -227,7 +232,7 @@ webbeans-ee
webbeans-ejb
webbeans-impl
webbeans-spi
-websocket-api
+tomcat-websocket-api
woodstox-core-asl-
ws-commons-util-
wsdl4j-
@@ -244,4 +249,5 @@ xmlschema-
xmlsec-
xmltooling-
xmlunit-
-ziplock-
\ No newline at end of file
+ziplock-
+zipfs.jar
