geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: rev 47216 - geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment
Date Sat, 25 Sep 2004 21:19:32 GMT
Author: jboynes
Date: Sat Sep 25 14:19:31 2004
New Revision: 47216

Modified:
   geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Log:
Handle configId generation correctly on Windows

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
Sat Sep 25 14:19:31 2004
@@ -222,17 +222,14 @@
         String id = application.getId();
         if (id == null) {
             // TODO this name is not necessairly the original name specified on the command
line which is what we want
-            id = module.getName();
-            if (id.endsWith("!/")) {
-                id = id.substring(0, id.length() - 2);
-            }
+            File fileName = new File(module.getName());
+            id = fileName.getName();
             if (id.endsWith(".ear")) {
                 id = id.substring(0, id.length() - 4);
             }
             if (id.endsWith("/")) {
                 id = id.substring(0, id.length() - 1);
             }
-            id = id.substring(id.lastIndexOf('/') + 1);
         }
 
         gerApplication.setConfigId(id);

Mime
View raw message