geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r356393 - /geronimo/branches/1.0/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Mon, 12 Dec 2005 22:14:07 GMT
Author: dain
Date: Mon Dec 12 14:14:04 2005
New Revision: 356393

URL: http://svn.apache.org/viewcvs?rev=356393&view=rev
Log:
The deploymentDescriptor must always return a String result, so for synthetic ears set a string
value.

Modified:
    geronimo/branches/1.0/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/branches/1.0/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=356393&r1=356392&r2=356393&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/branches/1.0/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Mon Dec 12 14:14:04 2005
@@ -357,7 +357,11 @@
             if (ConfigurationModuleType.EAR == applicationType) {
                 GBeanData gbeanData = new GBeanData(earContext.getApplicationObjectName(),
J2EEApplicationImpl.GBEAN_INFO);
                 try {
-                    gbeanData.setAttribute("deploymentDescriptor", applicationInfo.getOriginalSpecDD());
+                    String originalSpecDD = applicationInfo.getOriginalSpecDD();
+                    if (originalSpecDD == null) {
+                        originalSpecDD = "Synthetic EAR";
+                    }
+                    gbeanData.setAttribute("deploymentDescriptor", originalSpecDD);
                 } catch (Exception e) {
                     throw new DeploymentException("Error initializing J2EEApplication managed
object");
                 }



Mime
View raw message