--- trunk/lib/Transports/Bootstrap.pm	2006/06/05 09:36:12	50
+++ trunk/lib/Transports/Bootstrap.pm	2006/06/05 14:06:58	51
@@ -15,46 +15,57 @@
 
 	my $system_user = Transports::CurrentUser->superuser( _bootstrap => 1 );
 
-	my $u1 = Transports::Model::User->new(current_user => $system_user);
-	$u1->create(
+	my $u_admin = Transports::Model::User->new(current_user => $system_user);
+	$u_admin->create(
 		name => 'System administrator',
 		email => 'admin@example.com',
 		password => 'admin',
 		admin => 1,
 	);
 
-	my $u2 = Transports::Model::User->new(current_user => $system_user);
-	$u2->create(
-		name => 'Normal User',
-		email => 'user@example.com',
-		password => 'user',
-	);
-
-	my $u3 = Transports::Model::User->new(current_user => $system_user);
-	$u3->create(
+	my $u_import = Transports::Model::User->new(current_user => $system_user);
+	$u_import->create(
 		name => 'Import operator',
 		email => 'import@example.com',
 		password => 'import',
 		can_import => 1,
 	);
 
+	my $u;
+	foreach my $i ( 0 ... 2 ) {
+		$u->{$i} = Transports::Model::User->new(current_user => $system_user);
+		my $nr = $i + 1;
+		$u->{$i}->create(
+			name => "Normal User $nr",
+			email => "user${nr}\@example.com",
+			password => 'user',
+		);
+	}
+
+	my $l;
+	foreach my $i ( 0 ... 2 ) {
+		$l->{$i} = Transports::Model::Landscape->new(current_user => $system_user);
+		$l->{$i}->create(
+			name => 'Landscape ' . ( $i + 1 ),
+		);
+
+		Transports::Model::UserOnLandscape->new(current_user => $system_user)->create(
+			user_on => $u->{$i},
+			landscape => $l->{$i},
+		);
+			
+	}
+
 	my $s;
 
 	foreach my $i ( 0 ... 5 ) {
 		$s->{$i} = Transports::Model::Source->new(current_user => $system_user);
+
 		$s->{$i}->create(
 			name => 'SRC/' . ($i + 1),
+			landscape => $l->{ ( $i % 3 ) },
 		);
 
-		Transports::Model::UserOnSource->new(current_user => $system_user)->create(
-			user_on => $u1,
-			source => $s->{$i},
-		);
-
-		Transports::Model::UserOnSource->new(current_user => $system_user)->create(
-			user_on => $u2,
-			source => $s->{$i},
-		) if ($i % 2 == 0);
 	}
 
 	my $d;
@@ -63,6 +74,7 @@
 		$d->{$i} = Transports::Model::Destination->new(current_user => $system_user);
 		$d->{$i}->create(
 			name => 'DEST/' . ($i + 1),
+			landscape => $l->{ ( $i % 3 ) },
 		);
 	}
 
@@ -97,7 +109,7 @@
 			destination => $d->{ $i % 2 },
 			request_nr => $i,
 			client_dependent => $i % 3 == 0 ? 0 : 1,
-			created_by => $i % 2 == 0 ? $u1 : $u2,
+			created_by => $u->{ $i % 3 },
 			return_code => $rc,
 		);
 	}