geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: rev 47244 - geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment
Date Sun, 26 Sep 2004 10:59:03 GMT
Author: djencks
Date: Sun Sep 26 03:59:01 2004
New Revision: 47244

Modified:
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Log:
doh, put the if where it might work

Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Sun Sep 26 03:59:01 2004
@@ -138,8 +138,7 @@
         // config id, which may be derived from the module file name set above
         module.setName(module.getConfigId().toString());
 
-        return new ApplicationInfo(
-                module.getType(),
+        return new ApplicationInfo(module.getType(),
                 module.getConfigId(),
                 module.getParentId(),
                 "null",
@@ -154,7 +153,7 @@
         ApplicationType application;
         try {
             XmlObject xmlObject = SchemaConversionUtils.parse(applicationXmlUrl);
-            application =  SchemaConversionUtils.convertToApplicationSchema(xmlObject).getApplication();
+            application = SchemaConversionUtils.convertToApplicationSchema(xmlObject).getApplication();
         } catch (Exception e) {
             return null;
         }
@@ -213,8 +212,7 @@
             throw new DeploymentException(e);
         }
 
-        return new ApplicationInfo(
-                ConfigurationModuleType.EAR,
+        return new ApplicationInfo(ConfigurationModuleType.EAR,
                 configId,
                 parentId,
                 configId.toString(),
@@ -247,7 +245,7 @@
     }
 
     public void buildConfiguration(File outfile, Manifest manifest, Object plan, JarFile
earFile) throws IOException, DeploymentException {
-        ApplicationInfo applicationInfo = (ApplicationInfo)plan;
+        ApplicationInfo applicationInfo = (ApplicationInfo) plan;
         FileOutputStream fos = new FileOutputStream(outfile);
         try {
             // Create the output ear context
@@ -346,18 +344,18 @@
         for (int i = 0; i < gerModuleTypes.length; i++) {
             GerModuleType gerModule = gerModuleTypes[i];
             String path = null;
+            if (gerModule.isSetEjb()) {
+                path = gerModule.getEjb().getStringValue();
+            } else if (gerModule.isSetWeb()) {
+                path = gerModule.getWeb().getStringValue();
+            } else if (gerModule.isSetConnector()) {
+                path = gerModule.getConnector().getStringValue();
+            } else if (gerModule.isSetJava()) {
+                path = gerModule.getJava().getStringValue();
+            }
+
             if (gerModule.isSetAltDd()) {
                 // the the url of the alt dd
-                if (gerModule.isSetEjb()) {
-                    path = gerModule.getEjb().getStringValue();
-                } else if (gerModule.isSetWeb()) {
-                    path = gerModule.getWeb().getStringValue();
-                } else if (gerModule.isSetConnector()) {
-                    path = gerModule.getConnector().getStringValue();
-                } else if (gerModule.isSetJava()) {
-                    path = gerModule.getJava().getStringValue();
-                }
-
                 altVendorDDs.put(path, JarUtil.toFile(earFile, gerModule.getAltDd().getStringValue()));
             } else {
                 //dd is included explicitly
@@ -418,8 +416,7 @@
                 altSpecDD = JarUtil.createJarURL(earFile, moduleXml.getAltDd().getStringValue());
             }
 
-            Module module = builder.createModule(
-                    modulePath,
+            Module module = builder.createModule(modulePath,
                     altVendorDDs.get(modulePath),
                     new NestedJarFile(earFile, modulePath),
                     altSpecDD,

Mime
View raw message