You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/06/11 18:03:58 UTC
svn commit: r783823 -
/geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Author: gawor
Date: Thu Jun 11 16:03:58 2009
New Revision: 783823
URL: http://svn.apache.org/viewvc?rev=783823&view=rev
Log:
fix error message when plan contains modules which are not in the ear. Based on patch from Ivan (GERONIMO-4661)
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=783823&r1=783822&r2=783823&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 Thu Jun 11 16:03:58 2009
@@ -890,7 +890,9 @@
//all the modules in the geronimo plan should have been found by now.
if (!moduleLocations.containsAll(altVendorDDs.keySet())) {
- throw new DeploymentException("Geronimo ear plan contains modules that aren't in the ear: " + new HashSet<String>(moduleLocations).removeAll(altVendorDDs.keySet()));
+ HashSet<String> missingModules = new HashSet<String>(moduleLocations);
+ missingModules.removeAll(altVendorDDs.keySet());
+ throw new DeploymentException("Geronimo ear plan contains modules that are not in the ear: " + missingModules);
}
//deploy the extension modules
for (GerExtModuleType gerExtModule : gerApplication.getExtModuleArray()) {