Switch to trinidad

.gitignore

@@ -10,4 +10,6 @@ build/*
 vendor/
 tags
 .rvmrc
-.rbenv-version
+.rbenv-version
+log/
+tmp/

Gemfile

@@ -4,6 +4,6 @@ gem "sequel"
 gem "zip"
 gem "rmagick4j"
 gem "json"
-gem "mongrel"
 gem "jdbc-sqlite3"
 gem "jruby-openssl"
+gem "trinidad"

Gemfile.lock

@@ -2,20 +2,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     bouncy-castle-java (1.5.0146.1)
-    gem_plugin (0.2.3)
     jdbc-sqlite3 (3.7.2)
     jruby-openssl (0.7.4)
       bouncy-castle-java
+    jruby-rack (1.1.6)
+    json (1.5.3)
     json (1.5.3-java)
-    mongrel (1.1.5-java)
-      gem_plugin (>= 0.2.3)
     rack (1.3.2)
     rmagick4j (0.3.7)
     sequel (3.25.0)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
     tilt (1.3.2)
+    trinidad (1.3.5)
+      jruby-rack (>= 1.1.5)
+      trinidad_jars (>= 1.0.2)
+    trinidad_jars (1.0.3)
     zip (2.0.2)
 
 PLATFORMS
@@ -25,8 +28,8 @@ DEPENDENCIES
   jdbc-sqlite3
   jruby-openssl
   json
-  mongrel
   rmagick4j
   sequel
   sinatra
+  trinidad
   zip

config.ru

@@ -0,0 +1,23 @@
+#\ -p 4567
+
+require 'src/main'
+require 'src/streamroller'
+
+m = StreamRoller::StreamRoller.new
+
+r = Rack::Builder.new do
+  map '/get' do
+    run m
+  end
+
+  map '/pic' do
+    run m
+  end
+
+  map '/' do
+    use Rack::Deflater
+    run m
+  end
+end
+
+run r

src/main.rb

@@ -33,24 +33,3 @@
 =end
 $imgformat = "png"
 
-m = StreamRoller::StreamRoller.new
-
-r = Rack::Builder.new do
-  map '/get' do
-    run m
-  end
-
-  map '/pic' do
-    run m
-  end
-
-  map '/' do
-    use Rack::Deflater
-    run m
-  end
-
-end
-
-puts "Starting server; http://localhost:4567"
-Rack::Handler::Mongrel.run r, :Port => 4567
-