geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shiv...@apache.org
Subject svn commit: r669130 - in /geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator: DeployStatusHandler.java GetArchiveHandler.java
Date Wed, 18 Jun 2008 10:15:34 GMT
Author: shivahr
Date: Wed Jun 18 03:15:28 2008
New Revision: 669130

URL: http://svn.apache.org/viewvc?rev=669130&view=rev
Log:
GERONIMO-3975 PlanCreator fails to deploy an application when Geronimo is installed into a
directory with white space. Thanks to Yun Feng Ma for the patch.

Modified:
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
    geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java?rev=669130&r1=669129&r2=669130&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
(original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DeployStatusHandler.java
Wed Jun 18 03:15:28 2008
@@ -19,8 +19,8 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.MalformedURLException;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -53,7 +53,7 @@
             throws PortletException, IOException {
         WARConfigData data = getSessionData(request);
         try {
-            File moduleFile = new File(new URI(data.getUploadedWarUri()));
+            File moduleFile = new File((new URL(data.getUploadedWarUri())).getPath());
 
             File planFile = File.createTempFile("console-deployment", ".xml");
             planFile.deleteOnExit();
@@ -64,7 +64,7 @@
             String[] status = JSR88_Util.deploy(request, moduleFile, planFile);
             request.setAttribute(DEPLOY_ABBR_STATUS_PARAMETER, status[0]);
             request.setAttribute(DEPLOY_FULL_STATUS_PARAMETER, status[1]);
-        } catch (URISyntaxException e) {
+        } catch (MalformedURLException e) {
             log.error(e.getMessage(), e);
         }
         request.setAttribute(DATA_PARAMETER, data);

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java?rev=669130&r1=669129&r2=669130&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
(original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/GetArchiveHandler.java
Wed Jun 18 03:15:28 2008
@@ -73,7 +73,7 @@
         }
 
         File uploadedFile = uploadFile(fileItem);
-        data.setUploadedWarUri(uploadedFile.toURI().toString());
+        data.setUploadedWarUri(uploadedFile.toURL().toString());
 
         String str = getBasename(fileItem.getName().trim());
         String warName = str.substring(0, str.length() - 4);



Mime
View raw message