--- trunk/lib/Frey/Server.pm	2008/10/31 23:07:46	220
+++ 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
@@ -69,13 +70,16 @@
 
 		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|request)/([^/]+)(.*)! ) {
+		} elsif ( $path =~ m!/($run_regexp)/([^/]+)(.*)! ) {
+			warn "# run $1 $2\n";
 			$f = Frey::Run->new( class => $2 );
 		} else {
 			$f = Frey::Run->new( class => 'Frey::ClassBrowser' );