geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r797369 - /geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Fri, 24 Jul 2009 08:51:06 GMT
Author: xuhaihong
Date: Fri Jul 24 08:51:05 2009
New Revision: 797369

URL: http://svn.apache.org/viewvc?rev=797369&view=rev
Log:
GERONIMO-4661 Meaningless message displays while Geronimo ear plan contains modules that aren't
in the ear (Patch from viola.lu)

Modified:
    geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=797369&r1=797368&r2=797369&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Fri Jul 24 08:51:05 2009
@@ -890,8 +890,8 @@
 
             //all the modules in the geronimo plan should have been found by now.
             if (!moduleLocations.containsAll(altVendorDDs.keySet())) {
-                HashSet<String> missingModules = new HashSet<String>(moduleLocations);
-                missingModules.removeAll(altVendorDDs.keySet());
+                HashSet<String> missingModules = new HashSet<String>(altVendorDDs.keySet());
+                missingModules.removeAll(moduleLocations);
                 throw new DeploymentException("Geronimo ear plan contains modules that are
not in the ear: " + missingModules);
             }
             //deploy the extension modules



Mime
View raw message