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/10/20 14:16:41 UTC
git commit: fixing CheckDescriptorLocationTest and keeping
compatibility with external tools using deploymentLoader.lod(File)
Repository: tomee
Updated Branches:
refs/heads/develop 96adff22e -> 42ad84d70
fixing CheckDescriptorLocationTest and keeping compatibility with external tools using deploymentLoader.lod(File)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/42ad84d7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/42ad84d7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/42ad84d7
Branch: refs/heads/develop
Commit: 42ad84d70c0457125ab27f3d6211e8e92c90ee1c
Parents: 96adff2
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Oct 20 14:16:25 2014 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Oct 20 14:16:25 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/DeploymentLoader.java | 7 ++++++-
.../apache/openejb/config/CheckDescriptorLocationTest.java | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/42ad84d7/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index 7b1f995..01657f8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -111,9 +111,14 @@ public class DeploymentLoader implements DeploymentFilterable {
private static String ALTDD = SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
private volatile List<URL> containerUrls = null;
+ @Deprecated // use load(File, ExternalConfiguration)
+ public AppModule load(final File jarFile) throws OpenEJBException {
+ return load(jarFile, null);
+ }
+
/**
* @param jarFile the app file (war, jar, ear)
- * @param additionalAppDescriptors potentially some more desriptor, used *only* today for context.xml of tomcat
+ * @param config potentially some more config, mainly used when linking to another system like tomcat to enrich the conf we can guess
* @return the loaded module
*/
public AppModule load(final File jarFile, final ExternalConfiguration config) throws OpenEJBException {
http://git-wip-us.apache.org/repos/asf/tomee/blob/42ad84d7/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
index 5efe6a4..36d11ed 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/CheckDescriptorLocationTest.java
@@ -44,7 +44,7 @@ public class CheckDescriptorLocationTest {
final File jarFile = Archives.jarArchive(map, FILENAME_PREFIX, FooBean.class);
final DeploymentLoader loader = new DeploymentLoader();
- final AppModule appModule = loader.load(jarFile);
+ final AppModule appModule = loader.load(jarFile, null);
return appModule;
}
@@ -62,7 +62,7 @@ public class CheckDescriptorLocationTest {
final File warFile = WebArchives.warArchive(map, FILENAME_PREFIX, FooBean.class);
final DeploymentLoader loader = new DeploymentLoader();
- final AppModule appModule = loader.load(warFile);
+ final AppModule appModule = loader.load(warFile, null);
return appModule;
}
@@ -80,7 +80,7 @@ public class CheckDescriptorLocationTest {
final File warFile = WebArchives.warArchive(map, FILENAME_PREFIX, FooBean.class);
final DeploymentLoader loader = new DeploymentLoader();
- final AppModule appModule = loader.load(warFile);
+ final AppModule appModule = loader.load(warFile, null);
return appModule;
}