From 2bb255e0d44026fcb80bfe05d46e42e2e74af26c Mon Sep 17 00:00:00 2001
From: zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Wed, 22 Mar 2006 02:17:44 +0000
Subject: Updated examples to use the new Configurator.  Camping blog can't
 test since only have 1.3 camping.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@119 19e92222-5c0b-0410-8929-a290d50e31e9
---
 examples/builder.rb      | 18 ++++++++++++++++++
 examples/camping/blog.rb | 13 +++++++++++--
 examples/simpletest.rb   | 18 ++++++++++--------
 3 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 examples/builder.rb

(limited to 'examples')

diff --git a/examples/builder.rb b/examples/builder.rb
new file mode 100644
index 0000000..0319377
--- /dev/null
+++ b/examples/builder.rb
@@ -0,0 +1,18 @@
+require 'mongrel'
+
+config = Mongrel::Configurator.new :host => "127.0.0.1" do
+  load_plugins :includes => ["mongrel"], :excludes => ["rails"]
+  daemonize :cwd => Dir.pwd, :log_file => "mongrel.log", :pid_file => "mongrel.pid"
+  
+  listener :port => 3000 do
+    uri "/app", :handler => Mongrel::DirHandler.new(".", load_mime_map("mime.yaml"))
+    load_plugins :includes => ["mongrel", "rails"]
+  end
+
+  trap("INT") { stop }
+  run
+end
+
+config.join
+
+
diff --git a/examples/camping/blog.rb b/examples/camping/blog.rb
index c3a7ad6..18732a4 100755
--- a/examples/camping/blog.rb
+++ b/examples/camping/blog.rb
@@ -277,9 +277,18 @@ if __FILE__ == $0
   Blog::Models::Base.logger = Logger.new('camping.log')
   Blog::Models::Base.threaded_connections=false
   Blog.create
+  
+  # Use the Configurator as an example rather than Mongrel::Camping.start
+  config = Mongrel::Configurator.new :host => "0.0.0.0" do
+    listener :port => 3002 do
+      uri "/blog", :handler => CampingHandler.new(Blog)
+      uri "/favicon", :handler => Mongrel::Error404Handler.new("")
+      trap("INT") { stop }
+      run
+    end
+  end
 
-  server = Mongrel::Camping::start("0.0.0.0",3002,"/blog",Blog)
   puts "** Blog example is running at http://localhost:3002/blog"
   puts "** Default username is `admin', password is `camping'"
-  server.acceptor.join
+  config.join
 end
diff --git a/examples/simpletest.rb b/examples/simpletest.rb
index 0d471b4..fbad8f4 100644
--- a/examples/simpletest.rb
+++ b/examples/simpletest.rb
@@ -34,14 +34,16 @@ if ARGV.length != 3
   exit(1)
 end
 
-h = Mongrel::HttpServer.new(ARGV[0], ARGV[1].to_i)
-h.register("/", SimpleHandler.new)
-h.register("/dumb", DumbHandler.new)
-h.register("/files", Mongrel::DirHandler.new(ARGV[2]))
-h.run
+config = Mongrel::Configurator.new :host => ARGV[0], :port => ARGV[1] do
+  listener do
+    uri "/", :handler => SimpleHandler.new
+    uri "/dumb", :handler => DumbHandler.new
+    uri "/files", :handler => Mongrel::DirHandler.new(ARGV[2])
+  end
 
-trap("INT") { h.stop }
+  trap("INT") { stop }
+  run
+end
 
 puts "Mongrel running on #{ARGV[0]}:#{ARGV[1]} with docroot #{ARGV[2]}"
-
-h.acceptor.join
+config.join
-- 
cgit v1.2.3-24-ge0c7