Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c148e2ada -> e7dbdd894 refs/heads/cassandra-2.1.0 bd6a766f9 -> b8ee9da1e refs/heads/trunk 0494e8f27 -> 8e7ed6175
(Windows) handle spaces in path names patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8ee9da1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8ee9da1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8ee9da1 Branch: refs/heads/cassandra-2.1 Commit: b8ee9da1e87eaff5905323b04b71a4547845b5f5 Parents: bd6a766 Author: Jonathan Ellis <[email protected]> Authored: Fri Jun 27 11:07:47 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jun 27 11:07:47 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra.bat | 2 +- bin/cassandra.ps1 | 2 +- conf/cassandra-env.ps1 | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8ee9da1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 47a5992..9a3ac17 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0 + * (Windows) handle spaces in path names (CASSANDRA-7451) Merged from 2.0: * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) * Support DISTINCT for static columns and fix behaviour when DISTINC is http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8ee9da1/bin/cassandra.bat ---------------------------------------------------------------------- diff --git a/bin/cassandra.bat b/bin/cassandra.bat index e4e07aa..8f645f2 100644 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@ -35,7 +35,7 @@ goto runLegacy REM ----------------------------------------------------------------------------- :runPowerShell echo Detected powershell execution permissions. Running with enhanced startup scripts. -powershell /file %CASSANDRA_HOME%\bin\cassandra.ps1 %* +powershell /file "%CASSANDRA_HOME%\bin\cassandra.ps1" %* goto finally REM ----------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8ee9da1/bin/cassandra.ps1 ---------------------------------------------------------------------- diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1 index 98b5b27..5225e32 100644 --- a/bin/cassandra.ps1 +++ b/bin/cassandra.ps1 @@ -79,7 +79,7 @@ Function Main $logdir = "$env:CASSANDRA_HOME/logs" $storagedir = "$env:CASSANDRA_HOME/data" - $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=$logdir -Dcassandra.storagedir=$storagedir" + $env:CASSANDRA_PARAMS = $env:CASSANDRA_PARAMS + " -Dcassandra.logdir=""$logdir"" -Dcassandra.storagedir=""$storagedir""" # Other command line params if ($H) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8ee9da1/conf/cassandra-env.ps1 ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1 index efef415..87a5cfe 100644 --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@ -39,7 +39,7 @@ Function SetCassandraMain() #----------------------------------------------------------------------------- Function BuildClassPath { - $cp = "$env:CASSANDRA_HOME\conf" + $cp = """$env:CASSANDRA_HOME\conf""" foreach ($file in Get-ChildItem "$env:CASSANDRA_HOME\lib\*.jar") { $file = $file -replace "\\", "/" @@ -47,7 +47,7 @@ Function BuildClassPath } # Add build/classes/main so it works in development - $cp = $cp + ";" + "$env:CASSANDRA_HOME\build\classes\main;$env:CASSANDRA_HOME\build\classes\thrift" + $cp = $cp + ";" + """$env:CASSANDRA_HOME\build\classes\main"";""$env:CASSANDRA_HOME\build\classes\thrift""" $env:CLASSPATH=$cp }
