--- trunk/lib/Frey/Server.pm	2008/10/30 22:34:40	205
+++ trunk/lib/Frey/Server.pm	2008/11/01 00:14:05	223
@@ -10,6 +10,7 @@
 
 #use Carp::REPL; ## XXX it would be nice, but it breaks error reporting too much
 use Frey::ClassLoader;
+use Frey::Run;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -58,7 +59,7 @@
 	my ($req) = @_;
 
 	my $path = $req->request->url->path;
-	warn "REQUEST: $path ",dump( $req->params ),"\n";
+	#warn "REQUEST: $path ",dump( $req->params );
 
 	Module::Reload->check if $path =~ m!reload! || $req->param('reload');
 
@@ -69,18 +70,21 @@
 
 		my $f;
 
+		my $run_regexp = join('|', Frey::Run->execute );
+
 		if ( $path =~ m!/~/([^/]+)(.*)! ) {
 			$f = Frey::Introspect->new( package => $1 );
 		} elsif ( $path =~ m!/ob/([^/]+)(.*)! ) {
 			$f = Frey::ObjectBrowser->new( fey_class => $1 );
 		} elsif ( $path =~ m!/od/([^/]+)(.*)! ) {
 			$f = Frey::ObjectDesigner->new( fey_class => $1 );
-		} elsif ( $path =~ m!/(markup|html)/([^/]+)(.*)! ) {
+		} elsif ( $path =~ m!/($run_regexp)/([^/]+)(.*)! ) {
+			warn "# run $1 $2\n";
 			$f = Frey::Run->new( class => $2 );
 		} else {
-			$f = Frey::ClassBrowser->new;
+			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );
 		}
-		$f->html( $req ) if $f;
+		$f->request( $req ) if $f;
 
 	};
 
@@ -88,7 +92,7 @@
 
 	if ( $@ ) {
 		warn $@;
-		#$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
+		$req->conn->send_error( 404 );	# FIXME this should probably be 500, but we can't ship page with it
 		$req->print( qq{<pre class="error">$@<pre>} );
 #		Carp::REPL::repl;