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 21:32:38 UTC

tomee git commit: take into account src/main/webapp for ApplicationComposers

Repository: tomee
Updated Branches:
  refs/heads/develop 26038a10a -> 577688312


take into account src/main/webapp for ApplicationComposers


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/57768831
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/57768831
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/57768831

Branch: refs/heads/develop
Commit: 5776883121b02d1b3df1f97ca583a0816f8cf6b1
Parents: 26038a1
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sat Feb 21 21:32:26 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sat Feb 21 21:32:26 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/openejb/testing/ApplicationComposers.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/57768831/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 d0f13fc..20d24fc 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
@@ -946,6 +946,7 @@ public final class ApplicationComposers {
             thisJar = jarLocation(testClass);
             try {
                 webModule.getAltDDs().putAll(DeploymentLoader.mapDescriptors(new ResourceFinder("", webModule.getClassLoader(), thisJar.toURI().toURL())));
+                webModule.getAltDDs().putAll(DeploymentLoader.getWebDescriptors(new File(thisJar.getParentFile().getParentFile(), "src/main/webapp")));
             } catch (final IOException e) {
                 throw new IllegalStateException(e);
             }