You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/01/21 10:38:50 UTC
svn commit: r370997 -
/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Author: djencks
Date: Sat Jan 21 01:38:49 2006
New Revision: 370997
URL: http://svn.apache.org/viewcvs?rev=370997&view=rev
Log:
forward port fix so synthetic ears appear to have a dd
Modified:
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=370997&r1=370996&r2=370997&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Sat Jan 21 01:38:49 2006
@@ -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");
}