geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r496776 - /geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Tue, 16 Jan 2007 17:17:10 GMT
Author: sppatel
Date: Tue Jan 16 09:17:09 2007
New Revision: 496776

URL: http://svn.apache.org/viewvc?view=rev&rev=496776
Log:
fix specified group/artifact/version elements being ignored on standalone module deployments

Modified:
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=496776&r1=496775&r2=496776
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Tue Jan 16 09:17:09 2007
@@ -357,6 +357,10 @@
         LinkedHashSet modules = new LinkedHashSet();
         try {
             addModules(earFile, application, gerApplication, moduleLocations, modules, environment,
earName, idBuilder);
+            if(application == null && modules.isEmpty()) {
+            	//if no application.xml and no modules detected, return null for stand-alone
module processing
+            	return null;
+            }
         } catch (Throwable e) {
             // close all the modules
             for (Iterator iterator = modules.iterator(); iterator.hasNext();) {



Mime
View raw message