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 2014/12/30 10:32:52 UTC

tomee git commit: support path as well in @Descriptors

Repository: tomee
Updated Branches:
  refs/heads/develop 5d6bc8f8c -> 3908ec249


support path as well in @Descriptors


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

Branch: refs/heads/develop
Commit: 3908ec24998a647a64add62fbd2f158fe78368cd
Parents: 5d6bc8f
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Dec 30 10:32:46 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Dec 30 10:32:46 2014 +0100

----------------------------------------------------------------------
 .../apache/openejb/testing/ApplicationComposers.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/3908ec24/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 5d63c9f..70db585 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
@@ -1147,12 +1147,22 @@ public final class ApplicationComposers {
             final ClassLoader loader = Thread.currentThread().getContextClassLoader();
             if (descriptors instanceof Descriptors) {
                 for (final Descriptor descriptor : ((Descriptors) descriptors).value()) {
-                    dds.put(descriptor.name(), loader.getResource(descriptor.path()));
+                    URL resource = loader.getResource(descriptor.path());
+                    try {
+                        dds.put(descriptor.name(), resource == null ? new File(descriptor.path()).toURI().toURL()));
+                    } catch (final MalformedURLException e) {
+                        throw new IllegalArgumentException(e);
+                    }
                 }
             } else {
                 if (descriptors instanceof org.apache.openejb.junit.Descriptors) {
                     for (final org.apache.openejb.junit.Descriptor descriptor : ((org.apache.openejb.junit.Descriptors) descriptors).value()) {
-                        dds.put(descriptor.name(), loader.getResource(descriptor.path()));
+                        URL resource = loader.getResource(descriptor.path());
+                        try {
+                            dds.put(descriptor.name(), resource == null ? new File(descriptor.path()).toURI().toURL());
+                        } catch (final MalformedURLException e) {
+                            throw new IllegalArgumentException(e);
+                        }
                     }
                 }
             }