tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1076113 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Date Wed, 02 Mar 2011 06:30:49 GMT
Author: dblevins
Date: Wed Mar  2 06:30:49 2011
New Revision: 1076113

URL: http://svn.apache.org/viewvc?rev=1076113&view=rev
Log:
Clearly mark standalone web modules as such and ensure their jars are listed in the "fake"
appmodule libraries list

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1076113&r1=1076112&r2=1076113&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Wed Mar  2 06:30:49 2011
@@ -224,7 +224,9 @@ public class DeploymentLoader implements
                     && (loadingRequiredModuleTypes.contains(WebModule.class) || loadingRequiredModuleTypes.contains(EjbModule.class)
|| loadingRequiredModuleTypes.contains(PersistenceModule.class))) {
                 final File file = toFile(baseUrl);
 
-                AppModule appModule = new AppModule(OpenEJB.class.getClassLoader(), file.getAbsolutePath());
+                // Standalone Web Module
+                
+                AppModule appModule = new AppModule(OpenEJB.class.getClassLoader(), file.getAbsolutePath(),
new Application(), true);
                 addWebModule(appModule, baseUrl, OpenEJB.class.getClassLoader(), getContextRoot(),
getModuleName());
                 return appModule;
             } else if (PersistenceModule.class.equals(moduleClass) && loadingRequiredModuleTypes.contains(PersistenceModule.class))
{
@@ -590,12 +592,14 @@ public class DeploymentLoader implements
     }
 
     protected void addWebModule(AppModule appModule, URL warUrl, ClassLoader parentClassLoader,
String contextRoot, String moduleName) throws OpenEJBException {
-
         // create and add the WebModule
         String warPath = URLs.toFilePath(warUrl);
         WebModule webModule = createWebModule(appModule.getJarLocation(), warPath, parentClassLoader,
contextRoot, moduleName);
         if (loadingRequiredModuleTypes.contains(WebModule.class)) {
             appModule.getWebModules().add(webModule);
+            if (appModule.isStandaloneModule()) {
+                appModule.getAdditionalLibraries().addAll(webModule.getUrls());
+            }
         }
 
         // Per the Spec version of the Collapsed EAR there



Mime
View raw message