You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/02/21 15:52:58 UTC
tomee git commit: for maven @Default = test-classes + classes
Repository: tomee
Updated Branches:
refs/heads/develop 95a9cbf57 -> c5ccadf94
for maven @Default = test-classes + classes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c5ccadf9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c5ccadf9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c5ccadf9
Branch: refs/heads/develop
Commit: c5ccadf949f2a98b3d08bed79af5d16b61e73157
Parents: 95a9cbf
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sat Feb 21 15:52:47 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sat Feb 21 15:52:47 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/testing/ApplicationComposers.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c5ccadf9/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
index c2bebfb..91ca837 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
@@ -995,6 +995,12 @@ public final class ApplicationComposers {
libs = new LinkedList<>();
}
libs.add(thisJar);
+ if ("test-classes".equals(thisJar.getName()) && "target".equals(thisJar.getParentFile().getName())) {
+ final File mainClasses = new File(thisJar.getParentFile(), "classes");
+ if (mainClasses.exists()) {
+ libs.add(mainClasses);
+ }
+ }
}
final IAnnotationFinder finder = finderFromClasses(webModule, classes, libs);