geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r327089 - in /geronimo/trunk/modules: client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Date Fri, 21 Oct 2005 03:48:19 GMT
Author: hogstrom
Date: Thu Oct 20 20:48:13 2005
New Revision: 327089

URL: http://svn.apache.org/viewcvs?rev=327089&view=rev
Log:
GERONIMO-1089 - applied patch to correct problem with spaces in dir name

Modified:
    geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=327089&r1=327088&r2=327089&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Thu Oct 20 20:48:13 2005
@@ -22,6 +22,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,6 +38,7 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
+
 import org.apache.geronimo.client.AppClientContainer;
 import org.apache.geronimo.client.StaticJndiContextPlugin;
 import org.apache.geronimo.common.DeploymentException;
@@ -416,7 +418,7 @@
                                     throw new DeploymentException("Could not locate external
rar in repository", e);
                                 }
                                 try {
-                                    connectorFile = new JarFile(pathURL.getFile());
+                                    connectorFile = new JarFile(URLDecoder.decode(pathURL.getFile(),
"UTF-8"));
                                 } catch (IOException e) {
                                     throw new DeploymentException("Could not access rar contents",
e);
                                 }

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=327089&r1=327088&r2=327089&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
Thu Oct 20 20:48:13 2005
@@ -22,6 +22,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -616,7 +617,7 @@
                         throw new DeploymentException("Could not locate " + moduleTypeName
+ " in repository", e);
                     }
                     try {
-                        moduleFile = new JarFile(pathURL.getFile());
+                        moduleFile = new JarFile(URLDecoder.decode(pathURL.getFile(), "UTF-8"));
                     } catch (IOException e) {
                         throw new DeploymentException("Could not access contents of " + moduleTypeName,
e);
                     }



Mime
View raw message