You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2017/01/11 20:29:00 UTC
[4/5] cassandra git commit: Removes SetJsr223Env from
cassandra-env.ps1 (Follow up CASSANDRA-12883)
Removes SetJsr223Env from cassandra-env.ps1 (Follow up CASSANDRA-12883)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5774d8e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5774d8e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5774d8e2
Branch: refs/heads/cassandra-3.11
Commit: 5774d8e23556b09b11f9f756d93a619ae41a3630
Parents: 219f6ee
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed Jan 11 21:23:48 2017 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Jan 11 21:23:48 2017 +0100
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5774d8e2/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index f037b56..d3a0a87 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -198,42 +198,6 @@ Function CalculateHeapSizes
}
#-----------------------------------------------------------------------------
-Function SetJsr223Env
-{
- $cp = $env:CLASSPATH
- foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
- {
- foreach ($file in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
- {
- $file = $file -replace "\\", "/"
- $cp = $cp + ";" + """$file"""
- }
- }
- $env:CLASSPATH=$cp
-
- # JSR223/JRuby - set ruby lib directory
- if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\jruby\ruby")
- {
- $env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Djruby.lib=$env:CASSANDRA_HOME\lib\jsr223\jruby"
- }
- # JSR223/JRuby - set ruby JNI libraries root directory
- if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\jruby\jni")
- {
- $env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Djffi.boot.library.path=$env:CASSANDRA_HOME\lib\jsr223\jruby\jni"
- }
- # JSR223/Jython - set python.home system property
- if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\jython\jython.jar")
- {
- $env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Dpython.home=$env:CASSANDRA_HOME\lib\jsr223\jython"
- }
- # JSR223/Scala - necessary system property
- if (Test-Path "$env:CASSANDRA_HOME\lib\jsr223\scala\scala-compiler.jar")
- {
- $env:CASSANDRA_PARAMS=$env:CASSANDRA_PARAMS + " -Dscala.usejavacp=true"
- }
-}
-
-#-----------------------------------------------------------------------------
Function ParseJVMInfo
{
# grab info about the JVM
@@ -317,7 +281,6 @@ Function SetCassandraEnvironment
SetCassandraMain
BuildClassPath
- SetJsr223Env
# Override these to set the amount of memory to allocate to the JVM at
# start-up. For production use you may wish to adjust this for your