--- trunk/lib/Frey/Server.pm	2008/07/11 19:19:42	100
+++ trunk/lib/Frey/Server.pm	2008/07/13 12:22:14	106
@@ -8,9 +8,7 @@
 #use Continuity::REPL;
 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
@@ -20,14 +18,16 @@
 #$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?)$/ },
 	);
+	Frey::ClassLoader->new->load_all_classes();
 	$server->loop;
 }
 
@@ -51,7 +51,7 @@
 		}
 
 		if ( $path =~ m!/ob/([^/]+)(?:/([^/]*))?! ) {
-			my $f = Frey::ObjectBrowser->new;
+			my $f = Frey::ObjectBrowser->new( fey_class => $1 );
 			$f->html( $req );
 		}
 
@@ -69,14 +69,14 @@
 			ul => [
 				map {
 					warn dump( $_ );
-					my ( $package, $path ) = %$_;
+					my $package = $_;
 					( li => [
 						a => { href => '/~/' . $package . '/' } => [ $package ],
-						' ',
-						a => { href => '/ob/' . $package } => [ 'browse' ],
-						" <tt>$path</tt>"
+						' <tt>', $f->package_path( $package ), '</tt> ',
+						$package->can('collection') ?
+							( a => { href => '/ob/' . $package } => [ 'collection' ] ) : '',
 					] )
-				} @{ $f->classes }
+				} $f->classes
 			],
 		);
 		$req->print( $classes );