--- trunk/lib/Frey/Server.pm	2008/07/09 12:08:07	66
+++ trunk/lib/Frey/Server.pm	2008/07/11 22:54:42	101
@@ -2,14 +2,13 @@
 
 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 Frey::ClassLoader;
 
 my @messages;    # Global (shared) list of messages
 my $got_message; # Flag to indicate that there is a new message to display
@@ -27,6 +26,7 @@
 		debug_level => 1,
 		staticp => sub { $_[0]->url =~ m/\.(jpg|jpeg|gif|png|css|ico|js|html?)$/ },
 	);
+	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
@@ -50,7 +50,7 @@
 		}
 
 		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::ObjectBrowser->new;
+			my $f = Frey::ObjectBrowser->new( fey_class => $1 );
 			$f->html( $req );
 		}
 
@@ -60,7 +60,26 @@
 		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;
+
+	} else {
+
+		my $f = Frey::ClassLoader->new;
+		my $classes = dom2html(
+			ul => [
+				map {
+					warn dump( $_ );
+					my $package = $_;
+					( li => [
+						a => { href => '/~/' . $package . '/' } => [ $package ],
+						' <tt>', $f->package_path( $package ), '</tt> ',
+						$package->can('rows') ?
+							( a => { href => '/ob/' . $package } => [ 'browse' ] ) : '',
+					] )
+				} $f->classes
+			],
+		);
+		$req->print( $classes );
+
 	}
 
 	# If this is a request for the pushtream, then give them that
@@ -73,22 +92,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