set port in windows bundle, open browser accordingly

tabulapdf · Nov 30, 2013 · 96c1240 · 96c1240
1 parent d052e06
commit 96c1240
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -71,7 +71,8 @@
           <cp>tabula.jar</cp>
         </classPath>
         <jre minVersion="1.6.0" jdkPreference="preferJre" initialHeapSize="256" maxHeapSize="1024">
-          <opt>-Xms256M -Xmx1024M -Dfile.encoding=utf-8</opt>
+          <opt>-Dfile.encoding=utf-8</opt>
+          <opt>-Djetty.port=%TABULA_PORT%</opt>
         </jre>
         <versionInfo
             fileVersion="${full_version}"

diff --git a/config.ru b/config.ru
@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require_relative './webapp/tabula_settings.rb'
 require_relative './webapp/tabula_web.rb'
 run Cuba
@@ -13,8 +14,8 @@ if "#{$PROGRAM_NAME}".include?("tabula.jar") && java.awt.Desktop.isDesktopSuppor
   # 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.
-
-  url = "http://127.0.0.1:8080"
+  port = java.lang.Integer.getInteger('jetty.port', 8080)
+  url = "http://127.0.0.1:#{port}"
 
   puts "\n======================================================"
   puts "Launching web browser to #{url}\n\n"