svn commit: r796345 - in /incubator/cassandra/trunk: bin/cassandra.bat src/java/org/apache/cassandra/utils/XMLUtils.java

[ee...@apache.org]

Author: eevans
Date: Tue Jul 21 15:21:59 2009
New Revision: 796345

URL: http://svn.apache.org/viewvc?rev=796345&view=rev
Log:
better handling of file names with spaces on windows

- Quote path names in startup bat file
- Pass File object instead of URI when parsing storage-conf.xml

Patch by Michael Greene; reviewed by eevans for CASSANDRA-307

Modified:
    incubator/cassandra/trunk/bin/cassandra.bat
    incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/XMLUtils.java

Modified: incubator/cassandra/trunk/bin/cassandra.bat
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/bin/cassandra.bat?rev=796345&r1=796344&r2=796345&view=diff
==============================================================================
--- incubator/cassandra/trunk/bin/cassandra.bat (original)
+++ incubator/cassandra/trunk/bin/cassandra.bat Tue Jul 21 15:21:59 2009
@@ -45,7 +45,7 @@
 REM ***** CLASSPATH library setting *****
 
 REM Shorten lib path for old platforms
-subst P: %CASSANDRA_HOME%\lib
+subst P: "%CASSANDRA_HOME%\lib"
 P:
 set CLASSPATH=P:\
 
@@ -58,7 +58,7 @@
 
 :okClasspath
 set CASSANDRA_CLASSPATH=%CASSANDRA_HOME%;%CASSANDRA_CONF%;%CLASSPATH%;%CASSANDRA_HOME%\build\classes
-set CASSANDRA_PARAMS=-Dcassandra -Dstorage-config=%CASSANDRA_CONF%
+set CASSANDRA_PARAMS=-Dcassandra -Dstorage-config="%CASSANDRA_CONF%"
 goto runDaemon
 
 :runDaemon

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/XMLUtils.java?rev=796345&r1=796344&r2=796345&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/XMLUtils.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/XMLUtils.java Tue Jul 21 15:21:59 2009
@@ -43,7 +43,8 @@
     {        
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         DocumentBuilder db = dbf.newDocumentBuilder();
-        document_ = db.parse(xmlSrc);
+        File xmlFile = new File(xmlSrc);
+        document_ = db.parse(xmlFile);
         
         XPathFactory xpathFactory = XPathFactory.newInstance();
         xpath_ = xpathFactory.newXPath();