svn commit: r156350 - geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java

[djencks]

Author: djencks
Date: Sun Mar  6 16:14:14 2005
New Revision: 156350

URL: http://svn.apache.org/viewcvs?view=rev&rev=156350
Log:
GERONIMO-290. Allow spaces in war file static content.  Thanks to John Sisson

Modified:
    
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java

Modified: 
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: 
http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?view=diff&r1=156349&r2=156350
==============================================================================
--- 
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
 (original)
+++ 
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
 Sun Mar  6 16:14:14 2005
@@ -317,7 +317,7 @@
             Enumeration entries = warFile.entries();
             while (entries.hasMoreElements()) {
                 ZipEntry entry = (ZipEntry) entries.nextElement();
-                URI targetPath = baseDir.resolve(entry.getName());
+                URI targetPath = baseDir.resolve(new URI(null, 
entry.getName(), null));
                 if (entry.getName().equals("WEB-INF/web.xml")) {
                     earContext.addFile(targetPath, module.getOriginalSpecDD());
                 } else {
@@ -336,6 +336,8 @@
             ServiceConfigBuilder.addDependencies(earContext, dependencies, 
repository);
         } catch (IOException e) {
             throw new DeploymentException("Problem deploying war", e);
+        } catch (URISyntaxException e) {
+            throw new DeploymentException("Could not construct URI for 
location of war entry", e);
         }
     }