Author: rmannibucau
Date: Thu Oct 9 11:45:57 2014
New Revision: 1630374
URL: http://svn.apache.org/r1630374
Log:
tomee embedded needs to respect webdescriptors as well
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1630374&r1=1630373&r2=1630374&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Thu Oct 9 11:45:57 2014
@@ -1678,7 +1678,7 @@ public class DeploymentLoader implements
return map;
}
- protected Map<String, URL> getWebDescriptors(final File warFile) throws
IOException {
+ public static Map<String, URL> getWebDescriptors(final File warFile)
throws IOException {
final Map<String, URL> descriptors = new TreeMap<String, URL>();
// xbean resource finder has a bug when you use any uri but "META-INF"
Modified:
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1630374&r1=1630373&r2=1630374&view=diff
==============================================================================
---
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
(original)
+++
tomee/tomee/trunk/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Thu Oct 9 11:45:57 2014
@@ -157,7 +157,8 @@ public class Container implements AutoCl
contextRoot = "/" + context;
}
- final WebModule webModule = new WebModule(new WebApp(), contextRoot,
loader, docBase == null ? fakeRootDir().getAbsolutePath() :
docBase.getAbsolutePath(), contextRoot);
+ final File jarLocation = docBase == null ? fakeRootDir() : docBase;
+ final WebModule webModule = new WebModule(new WebApp(), contextRoot,
loader, jarLocation.getAbsolutePath(), contextRoot);
if (docBase == null) {
webModule.getProperties().put("fakeJarLocation", "true");
}
@@ -176,6 +177,7 @@ public class Container implements AutoCl
final AppModule app = new AppModule(loader, null);
app.setStandloneWebModule();
try {
+
webModule.getAltDDs().putAll(DeploymentLoader.getWebDescriptors(jarLocation));
DeploymentLoader.addWebModule(webModule, app);
DeploymentLoader.addWebModuleDescriptors(new
File(webModule.getJarLocation()).toURI().toURL(), webModule, app);
} catch (final Exception e) {
