#82 A couple of fixes to work Paxton did on this ticket some time ago.

marklogic-community · May 17, 2013 · e270289 · e270289
1 parent e339b59
commit e270289
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deploy/lib/java/corb.jar b/deploy/lib/java/corb.jar
diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
@@ -581,7 +581,7 @@ def xqsync
   end
 
   def corb
-    connection_string = %Q{xcc://#{@properties['ml.app-name']}-user:#{@properties['ml.appuser-password']}@#{@properties['ml.server']}:#{@properties['ml.xcc-port']}/#{@properties['ml.content-db']}}
+    connection_string = %Q{xcc://#{@properties['ml.user']}:#{@properties['ml.password']}@#{@properties['ml.server']}:#{@properties['ml.xcc-port']}/#{@properties['ml.content-db']}}
     collection_name = find_arg(['--collection']) || '""'
     xquery_module = find_arg(['--modules'])
     uris_module = find_arg(['--uris']) || '""'
@@ -596,7 +596,7 @@ def corb
     thread_count = thread_count.to_i
     module_root = find_arg(['--root']) || '"/"'
     modules_database = @properties['ml.modules-db']
-    install = find_arg(['install']) == "true"
+    install = find_arg(['--install']) == "true"
 
     matches = Dir.glob(File.expand_path("../java/*xcc*.jar", __FILE__))
     raise "Missing XCC Jar." if matches.length == 0

diff --git a/deploy/lib/util.rb b/deploy/lib/util.rb
@@ -41,7 +41,7 @@ def pluralize(count, singular, plural = nil)
 end
 
 def is_windows?
-  (Config::CONFIG['host_os'] =~ /mswin|mingw/).nil? == false
+  (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/).nil? == false
 end
 
 def path_separator