From d89732b476d05c76fb305982f3ac2ab3d614e409 Mon Sep 17 00:00:00 2001
From: Mike Tigas <mike@tig.as>
Date: Mon, 12 May 2014 23:37:29 -0400
Subject: [PATCH] back out part of changes to app startup since that gets the
 wrong port number under "rackup"

---
 config.ru | 81 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/config.ru b/config.ru
index 4e8a237e..0d241877 100644
--- a/config.ru
+++ b/config.ru
@@ -1,48 +1,53 @@
 # encoding: UTF-8
 require_relative './webapp/tabula_settings.rb'
 require_relative './webapp/tabula_web.rb'
-require 'java'
 run Cuba
 
-# don't do "java_import java.net.URI" -- it conflicts with Ruby URI and
-# makes Cuba/Rack really really upset. just call "java.*" classes
-# directly.
-port = java.lang.Integer.getInteger('jetty.port', 8080)
-url = "http://127.0.0.1:#{port}"
+if "#{$PROGRAM_NAME}".include?("tabula.jar")
+  # only do this if running as jar or app. (if "rackup", we don't
+  # actually use 8080 by default.)
 
-# Open browser after slight delay. (The server may take a while to actually
-# serve HTTP, so we are trying to avoid a "Could Not Connect To Server".)
-uri = java.net.URI.new(url)
-sleep 0.5
+  require 'java'
 
-have_desktop = false
-if java.awt.Desktop.isDesktopSupported
-  begin
-    desktop = java.awt.Desktop.getDesktop()
-  rescue
-    desktop = nil
-  else
-    have_desktop = true
+  # don't do "java_import java.net.URI" -- it conflicts with Ruby URI and
+  # makes Cuba/Rack really really upset. just call "java.*" classes
+  # directly.
+  port = java.lang.Integer.getInteger('jetty.port', 8080)
+  url = "http://127.0.0.1:#{port}"
+
+  # Open browser after slight delay. (The server may take a while to actually
+  # serve HTTP, so we are trying to avoid a "Could Not Connect To Server".)
+  uri = java.net.URI.new(url)
+  sleep 0.5
+
+  have_desktop = false
+  if java.awt.Desktop.isDesktopSupported
+    begin
+      desktop = java.awt.Desktop.getDesktop()
+    rescue
+      desktop = nil
+    else
+      have_desktop = true
+    end
   end
-end
 
-# if running as a jar or app, automatically open the user's web browser if
-# the system supports it. (if running "rackup" or running headless, just
-# tell the user how to get to it.)
-if have_desktop && "#{$PROGRAM_NAME}".include?("tabula.jar")
-  puts "\n======================================================"
-  puts "Launching web browser to #{url}\n\n"
-  puts "If it does not open in 10 seconds, you may manually open"
-  puts "a web browser to the above URL."
-  puts "When you're done using the Tabula interface, you may"
-  puts "return to this window and press \"Control-C\" to close it."
-  puts "======================================================\n\n"
-  desktop.browse(uri)
-else
-  puts "\n======================================================"
-  puts "Server now listening at: #{url}\n\n"
-  puts "You may now open a web browser to the above URL."
-  puts "When you're done using the Tabula interface, you may"
-  puts "return to this window and press \"Control-C\" to close it."
-  puts "======================================================\n\n"
+  # if running as a jar or app, automatically open the user's web browser if
+  # the system supports it.
+  if have_desktop
+    puts "\n======================================================"
+    puts "Launching web browser to #{url}\n\n"
+    puts "If it does not open in 10 seconds, you may manually open"
+    puts "a web browser to the above URL."
+    puts "When you're done using the Tabula interface, you may"
+    puts "return to this window and press \"Control-C\" to close it."
+    puts "======================================================\n\n"
+    desktop.browse(uri)
+  else
+    puts "\n======================================================"
+    puts "Server now listening at: #{url}\n\n"
+    puts "You may now open a web browser to the above URL."
+    puts "When you're done using the Tabula interface, you may"
+    puts "return to this window and press \"Control-C\" to close it."
+    puts "======================================================\n\n"
+  end
 end