port several commits from 1.0.x re: warbler & port number

d866da0
Roll back to using port 8080, because of inconsistencies in our ability to override port number. #376

10a9101
document flag change for #376

cae739c
for #376, use warbler.port (warbler 1.4.9)

d233fe6
newer bundler versions break warbler

Gemfile

@@ -10,8 +10,8 @@ platform :jruby do
 
   group :development do
     gem "rake"
-    gem "warbler"
-    gem "jruby-jars", "1.7.15" ##1.7.16.1 doesn't work, see issue #203
+    gem "warbler", "~> 1.4.9"
+    gem "jruby-jars", "1.7.22" ##1.7.16.1 doesn't work, see issue #203
     gem "compass"
     gem "bootstrap-sass"
   end

Gemfile.lock

@@ -25,7 +25,7 @@ GEM
     execjs (2.5.2)
     ffi (1.9.8-java)
     jruby-jars (1.7.15)
-    jruby-rack (1.1.18)
+    jruby-rack (1.1.19)
     json (1.8.2-java)
     multi_json (1.11.0)
     rack (1.6.0)
@@ -36,7 +36,7 @@ GEM
     rubyzip (1.1.7)
     sass (3.4.13)
     tilt (2.0.1)
-    warbler (1.4.7)
+    warbler (1.4.9)
       jruby-jars (>= 1.5.6, < 2.0)
       jruby-rack (>= 1.1.1, < 1.3)
       rake (>= 0.9.6)
@@ -53,4 +53,7 @@ DEPENDENCIES
   rack
   rake
   tilt
-  warbler
+  warbler (~> 1.4.9)
+
+BUNDLED WITH
+   1.10.6

README.md

@@ -66,9 +66,9 @@ and then try again.
 [jre_download]: https://www.java.com/download/
 [tabula_dl]: http://tabula.technology
 
-Tabula binds to port 8080 by default. You can change it with the `jetty.port` property:
+Tabula binds to port 8080 by default. You can change it with the `warbler.port` property:
 
-`java -Dfile.encoding=utf-8 -Xms256M -Xmx1024M -Djetty.port=9999 -jar tabula.jar`
+`java -Dfile.encoding=utf-8 -Xms256M -Xmx1024M -Dwarbler.port=9999 -jar tabula.jar`
 
 
 ## <a name="knownissues">Known issues</a>
@@ -99,9 +99,9 @@ There are some bugs that we're aware of that we haven't managed to fix yet. If t
   4. Run Tabula by typing `tabula.exe`
 
 * <a name='portproblems'>**A browser tab opens, but something other than Tabula loads there. Or Tabula doesn't start.**</a>
-  It's possible another program is using port 8080, whichh Tabula binds to by default. You can try closing the other program, or change the port Tabula uses by running Tabula from the terminal with the `jetty.port` property:
+  It's possible another program is using port 8080, whichh Tabula binds to by default. You can try closing the other program, or change the port Tabula uses by running Tabula from the terminal with the `warbler.port` property:
 
-  `java -Dfile.encoding=utf-8 -Xms256M -Xmx1024M -Djetty.port=9999 -jar tabula.jar`
+  `java -Dfile.encoding=utf-8 -Xms256M -Xmx1024M -Dwarbler.port=9999 -jar tabula.jar`
 
 
 ## Running Tabula from source (for developers)

build.xml

@@ -37,7 +37,7 @@
         <runtime dir="${java_home}" />
         <classpath file="${build.dir}/tabula.jar" />
         <option value="-Dapple.laf.useScreenMenuBar=true"/>
-        <option value="-Djetty.port=8080"/>
+        <option value="-Dwarbler.port=8080"/>
     </bundleapp>
     <!--
     To allow OSX to use this, you'll need to code sign.
@@ -83,7 +83,7 @@
         </classPath>
         <jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024">
           <opt>-Dfile.encoding=utf-8</opt>
-          <opt>-Djetty.port=8080</opt>
+          <opt>-Dwarbler.port=8080</opt>
         </jre>
         <versionInfo
             fileVersion="${full_version}"

build/dist-README.txt

@@ -22,13 +22,13 @@ a Java Runtime Environment compatible with Java 6 or Java 7.
 ### Windows (tabula-win.zip)
 
 Open tabula.exe and a browser should automatically open to
-http://127.0.0.1:34555/ . If not, open your web browser of choice and visit
+http://127.0.0.1:8080/ . If not, open your web browser of choice and visit
 that URL.
 
 ### Mac OS X (tabula-mac.zip)
 
 Open the Tabula app and a browser should automatically open to
-http://127.0.0.1:34555/ . If not, open your web browser of choice and visit
+http://127.0.0.1:8080/ . If not, open your web browser of choice and visit
 that URL.
 
 ### JAR file for Linux/Other (tabula-jar.zip)
@@ -37,3 +37,10 @@ Open a terminal window, and `cd` to inside this `tabula` directory,
 then run the following command
 
   java -Dfile.encoding=utf-8 -Xms256M -Xmx1024M -jar tabula.jar
+
+Tabula binds to port 8080 by default. You can change it with the
+`warbler.port` option:
+
+  java -Dfile.encoding=utf-8 -Xms256M -Xmx1024M -Dwarbler.port=9999 -jar tabula.jar
+
+(Known bug: If using this flag, the browser may open to the wrong port number.)

config.ru

@@ -15,7 +15,7 @@ if "#{$PROGRAM_NAME}".include?("tabula.jar")
   # 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)
+  port = java.lang.Integer.getInteger('warbler.port', 8080)
   url = "http://127.0.0.1:#{port}"
 
   puts "============================================================"