Author: rmannibucau
Date: Tue Oct 29 09:05:18 2013
New Revision: 1536615
URL: http://svn.apache.org/r1536615
Log:
polling xbean version + adding openejb.finder.force.link + removing all
finder.link() invocation which are useless if we use enableFinderOptions
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
tomee/tomee/trunk/examples/polling-parent/pom.xml
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java?rev=1536615&r1=1536614&r2=1536615&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/FinderFactory.java
Tue Oct 29 09:05:18 2013
@@ -46,6 +46,7 @@ public class FinderFactory {
public static final String TOMEE_JAXRS_DEPLOY_UNDECLARED_PROP =
"tomee.jaxrs.deploy.undeclared";
public static final String ASYNC_SCAN =
"openejb.scanning.inheritance.asynchronous";
public static final String SKIP_LINK = "openejb.finder.skip.link";
+ public static final String FORCE_LINK = "openejb.finder.force.link";
private static FinderFactory get() {
FinderFactory factory =
SystemInstance.get().getComponent(FinderFactory.class);
@@ -93,14 +94,14 @@ public class FinderFactory {
final DebugArchive archive = new DebugArchive(new
ConfigurableClasspathArchive((Module) module, url));
final AnnotationFinder annotationFinder = newFinder(archive);
enableFinderOptions(annotationFinder);
- finder = annotationFinder.link();
+ finder = annotationFinder;
} else {
final AnnotationFinder annotationFinder = newFinder(new
DebugArchive(new ConfigurableClasspathArchive(module.getClassLoader(), url)));
enableFinderOptions(annotationFinder);
- finder = annotationFinder.link();
+ finder = annotationFinder;
}
} else {
- finder = new AnnotationFinder(new ClassesArchive()).link();
+ finder = new AnnotationFinder(new ClassesArchive());
}
return new ModuleLimitedFinder(finder);
@@ -134,7 +135,7 @@ public class FinderFactory {
public Class<?> loadClass(String s) throws ClassNotFoundException {
try {
return archive.loadClass(s);
- } catch (ClassNotFoundException e) {
+ } catch (final ClassNotFoundException e) {
e.printStackTrace();
throw e;
}
@@ -155,8 +156,9 @@ public class FinderFactory {
}
private static boolean enableFindSubclasses() {
- return !SystemInstance.get().getOptions().get(SKIP_LINK, false)
- && (isTomEE() || (isJaxRsInstalled() &&
SystemInstance.get().getOptions().get(TOMEE_JAXRS_DEPLOY_UNDECLARED_PROP,
false)));
+ return SystemInstance.get().getOptions().get(FORCE_LINK, false)
+ || (!SystemInstance.get().getOptions().get(SKIP_LINK, false)
+ && (isTomEE() || (isJaxRsInstalled() &&
SystemInstance.get().getOptions().get(TOMEE_JAXRS_DEPLOY_UNDECLARED_PROP,
false))));
}
public static boolean isTomEE() {
Modified: tomee/tomee/trunk/examples/polling-parent/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/pom.xml?rev=1536615&r1=1536614&r2=1536615&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/pom.xml Tue Oct 29 09:05:18 2013
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>2.5.2</version>
+ <version>2.6.9</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
@@ -164,7 +164,7 @@
</dependencyManagement>
<properties>
- <xbean.version>3.14</xbean.version>
+ <xbean.version>3.15-SNAPSHOT</xbean.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
