--- trunk/lib/Frey/Server.pm	2008/07/09 12:08:07	66
+++ trunk/lib/Frey/Server.pm	2008/07/13 18:14:07	118
@@ -2,14 +2,14 @@
 
 use Moose;
 
+with 'Frey::Web';
+
 use Continuity;
 #use Continuity::REPL;
-use Continuity::Widget::DomNode;
 use Data::Dump qw/dump/;
 
-use Frey;
-use Frey::Introspect;
-use Frey::ObjectBrowser;
+#use Carp::REPL;
+use Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -19,14 +19,17 @@
 #$repl = Continuity::REPL->new;
 
 sub run {
+	my ( $self, $port ) = @_;
 	$server = Continuity->new(
-		port => 16001,
+		port => $port || 16001,
 		path_session => 1,
 		cookie_session => 'sid',
 		callback => \&main,
 		debug_level => 1,
 		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
 	);
+	$Module::Reload::Debug = 1;
+	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
@@ -44,15 +47,16 @@
 
 	eval {
 
-		if ( $path =~ m!/~/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::Introspect->new( package => $1 );
-			$f->html( $req );
-		}
+		my $f;
 
-		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::ObjectBrowser->new;
-			$f->html( $req );
+		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 );
 		}
+		$f->html( $req ) if $f;
 
 	};
 
@@ -60,7 +64,29 @@
 		warn $@;
 		#$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>} );
-		$req->next;
+#		Carp::REPL::repl;	# FIXME if $self->debug
+	} else {
+
+		my $f = Frey::ClassLoader->new;
+		my $classes = dom2html(
+			table => [
+				map {
+					my $package = $_;
+					( tr => [
+						td => [ a => { href => '/~/' . $package, title => $f->package_path( $package ) } => [ $package ] ],
+						td => [
+							$package->can('meta') ?
+								$package->meta->isa('Moose::Meta::Role') ? 'role' :
+								( a => { href => '/od/' . $package } => [ 'design' ] ) :
+							''
+						],
+						td => [ $package->can('collection_table') ? ( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '' ],
+					] )
+				} $f->classes
+			],
+		);
+		$req->print( "<h1>Classes</h1>$classes" );
+
 	}
 
 	# If this is a request for the pushtream, then give them that
@@ -73,22 +99,6 @@
 		send_message($req);
 	}
 
-	my $f = Frey->new;
-	my $classes = Continuity::Widget::DomNode->create(
-		ul => [
-			map {
-				warn dump( $_ );
-				my ( $package, $path ) = %$_;
-				( li => [
-					a => { href => '/~/' . $package . '/' } => [ $package ],
-					' ',
-					a => { href => '/ob/' . $package } => [ 'browse' ],
-					" <tt>$path</tt>"
-				] )
-			} @{ $f->classes }
-		],
-	)->to_string;
-	$req->print( $classes );
 }
 
 # Here we accept a connection to the browser, and keep it open. Meanwhile we