You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/07/24 10:52:54 UTC
svn commit: r797371 -
/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Author: xuhaihong
Date: Fri Jul 24 08:52:54 2009
New Revision: 797371
URL: http://svn.apache.org/viewvc?rev=797371&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/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=797371&r1=797370&r2=797371&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Jul 24 08:52:54 2009
@@ -901,8 +901,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