geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r372334 - in /geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console: databasemanager/wizard/DatabasePoolPortlet.java jmsmanager/wizard/AbstractHandler.java
Date Wed, 25 Jan 2006 22:08:50 GMT
Author: ammulder
Date: Wed Jan 25 14:08:47 2006
New Revision: 372334

URL: http://svn.apache.org/viewcvs?rev=372334&view=rev
Log:
Merge potential fix for GERONIMO-1426 from branch

Modified:
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=372334&r1=372333&r2=372334&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Wed Jan 25 14:08:47 2006
@@ -828,6 +828,10 @@
             DeploymentManager mgr = PortletManager.getDeploymentManager(request);
             try {
                 URL url = getRAR(request, data.getRarPath());
+                String str = url.toString();
+                if(str.indexOf(' ') > -1) {
+                    url = new URL(str.replaceAll(" ", "%20")); // try to avoid problems with
spaces in path on Windows
+                }
                 ConnectorDeployable deployable = new ConnectorDeployable(url);
                 DeploymentConfiguration config = mgr.createConfiguration(deployable);
                 final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=372334&r1=372333&r2=372334&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
Wed Jan 25 14:08:47 2006
@@ -514,6 +514,10 @@
             DeploymentManager mgr = PortletManager.getDeploymentManager(request);
             try {
                 URL url = PortletManager.getRepositoryEntry(request, data.getRarURI());
+                String str = url.toString();
+                if(str.indexOf(' ') > -1) {
+                    url = new URL(str.replaceAll(" ", "%20")); // try to avoid problems with
spaces in path on Windows
+                }
                 ConnectorDeployable deployable = new ConnectorDeployable(url);
                 DeploymentConfiguration config = mgr.createConfiguration(deployable);
                 final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();



Mime
View raw message