tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1489054 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java container/openejb-core/src/main/resources/default.exclusions pom.xml
Date Mon, 03 Jun 2013 16:25:34 GMT
Author: rmannibucau
Date: Mon Jun  3 16:25:33 2013
New Revision: 1489054

URL: http://svn.apache.org/r1489054
Log:
TOMEE-960 OPENEJB-2030 xbean 3.14 + using include-exclude order with a better exclusion for
quartz

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
    tomee/tomee/trunk/container/openejb-core/src/main/resources/default.exclusions
    tomee/tomee/trunk/pom.xml

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1489054&r1=1489053&r2=1489054&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
Mon Jun  3 16:25:33 2013
@@ -49,7 +49,7 @@ import static org.apache.openejb.util.UR
  */
 public class DeploymentsResolver implements DeploymentFilterable {
 
-    private static final String EXCLUDE_INCLUDE_ORDER = SystemInstance.get().getOptions().get("openejb.exclude-include.order",
"exclude-include");
+    private static final String EXCLUDE_INCLUDE_ORDER = SystemInstance.get().getOptions().get("openejb.exclude-include.order",
"include-exclude");
     private static final String[] ignoreDirs = SystemInstance.get().getProperty("openejb.ignore.directories",
".svn,_svn,cvs,.git,.hg").split(",");
     private static final Logger logger = DeploymentLoader.logger;
     private static File lib = null;

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=1489054&r1=1489053&r2=1489054&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 Jun
 3 16:25:33 2013
@@ -166,7 +166,7 @@ PDFBox
 plexus-
 plugin.jar
 poi-
-quartz-
+quartz-2
 resources.jar
 rmock-
 rt.jar

Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1489054&r1=1489053&r2=1489054&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Jun  3 16:25:33 2013
@@ -97,7 +97,7 @@
     <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
 
     <!-- This is used by a manifest classpath entry -->
-    <xbeanVersion>3.14-SNAPSHOT</xbeanVersion>
+    <xbeanVersion>3.14</xbeanVersion>
 
     <!-- OSGi bundles properties -->
     <openejb.bundle.activator/>



Mime
View raw message