Index: /trunk/DataStore/lib/DataStore/File/Parser.pm
===================================================================
--- /trunk/DataStore/lib/DataStore/File/Parser.pm	(revision 15020)
+++ /trunk/DataStore/lib/DataStore/File/Parser.pm	(revision 15021)
@@ -1,5 +1,5 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.11 2006-07-22 01:17:33 smalle Exp $
+# $Id: Parser.pm,v 1.12 2007-09-25 23:50:34 jhoblitt Exp $
 
 package DataStore::File::Parser;
@@ -90,5 +90,7 @@
                     'is valid http uri' =>
                         sub { is_uri($_[0]) and $_[0] =~ /^http:/ },
-                     'uri ends with /'   => sub { $_[0] =~ m|/$| },
+                    'uri ends with /index.txt' =>
+                        sub { $_[0] =~ m|/index.txt$| },
+
                 },
                 default =>  'http://example.org/',
Index: /trunk/DataStore/lib/DataStore/FileSet.pm
===================================================================
--- /trunk/DataStore/lib/DataStore/FileSet.pm	(revision 15020)
+++ /trunk/DataStore/lib/DataStore/FileSet.pm	(revision 15021)
@@ -1,5 +1,5 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: FileSet.pm,v 1.12 2007-02-15 22:04:03 jhoblitt Exp $
+# $Id: FileSet.pm,v 1.13 2007-09-25 23:50:34 jhoblitt Exp $
 
 package DataStore::FileSet;
@@ -119,5 +119,6 @@
                 type        => SCALAR,
                 callbacks   => {
-                    'is valid uri dirname'   => sub { $_[0] =~ m|/$| },
+                    'uri ends with /index.txt'
+                        => sub { $_[0] =~ m|/index.txt$| },
                 }
             },
Index: /trunk/DataStore/lib/DataStore/FileSet/Parser.pm
===================================================================
--- /trunk/DataStore/lib/DataStore/FileSet/Parser.pm	(revision 15020)
+++ /trunk/DataStore/lib/DataStore/FileSet/Parser.pm	(revision 15021)
@@ -1,5 +1,5 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Parser.pm,v 1.14 2007-09-25 23:37:44 jhoblitt Exp $
+# $Id: Parser.pm,v 1.15 2007-09-25 23:50:34 jhoblitt Exp $
 
 package DataStore::FileSet::Parser;
@@ -193,5 +193,5 @@
             type        => $type,
             extra       => \@extra, 
-            uri         => $self->base_uri . $fileset . '/',
+            uri         => $self->base_uri . $fileset . '/index.txt',
         });
     } continue {
Index: /trunk/DataStore/lib/DataStore/Product.pm
===================================================================
--- /trunk/DataStore/lib/DataStore/Product.pm	(revision 15020)
+++ /trunk/DataStore/lib/DataStore/Product.pm	(revision 15021)
@@ -1,5 +1,5 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: Product.pm,v 1.9 2007-09-25 23:37:44 jhoblitt Exp $
+# $Id: Product.pm,v 1.10 2007-09-25 23:50:34 jhoblitt Exp $
 
 package DataStore::Product;
@@ -102,5 +102,6 @@
                 type        => SCALAR,
                 callbacks   => {
-                    'uri ends with /index.txt' => sub { $_[0] =~ m|/index.txt$| },
+                    'uri ends with /index.txt'
+                        => sub { $_[0] =~ m|/index.txt$| },
                 }
             },
Index: /trunk/DataStore/t/02_fileset_parse.t
===================================================================
--- /trunk/DataStore/t/02_fileset_parse.t	(revision 15020)
+++ /trunk/DataStore/t/02_fileset_parse.t	(revision 15021)
@@ -3,5 +3,5 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: 02_fileset_parse.t,v 1.9 2007-09-25 23:37:44 jhoblitt Exp $
+# $Id: 02_fileset_parse.t,v 1.10 2007-09-25 23:50:34 jhoblitt Exp $
 
 use strict;
@@ -143,5 +143,5 @@
     is(@$results[0]->datetime, '2006-01-01T00:03:04Z', 'correct datetime');
     is(@$results[0]->type, 'OBJECT', 'correct type');
-    is(@$results[0]->uri, 'http://foo.com/otis0123456/', 'correct uri');
+    is(@$results[0]->uri, 'http://foo.com/otis0123456/index.txt', 'correct uri');
 
     isa_ok(@$results[1], 'DataStore::FileSet');
@@ -149,5 +149,5 @@
     is(@$results[1]->datetime, '2006-01-01T00:03:04Z', 'correct datetime');
     is(@$results[1]->type, 'OBJECT', 'correct type');
-    is(@$results[1]->uri, 'http://foo.com/otis0123456/', 'correct uri');
+    is(@$results[1]->uri, 'http://foo.com/otis0123456/index.txt', 'correct uri');
 
     isa_ok(@$results[2], 'DataStore::FileSet');
@@ -155,5 +155,5 @@
     is(@$results[2]->datetime, '2006-01-01T00:03:04Z', 'correct datetime');
     is(@$results[2]->type, 'OBJECT', 'correct type');
-    is(@$results[2]->uri, 'http://foo.com/otis0123456/', 'correct uri');
+    is(@$results[2]->uri, 'http://foo.com/otis0123456/index.txt', 'correct uri');
 
     isa_ok(@$results[3], 'DataStore::FileSet');
@@ -161,5 +161,5 @@
     is(@$results[3]->datetime, '2006-01-01T00:03:04Z', 'correct datetime');
     is(@$results[3]->type, 'OBJECT', 'correct type');
-    is(@$results[3]->uri, 'http://foo.com/otis0123456/', 'correct uri');
+    is(@$results[3]->uri, 'http://foo.com/otis0123456/index.txt', 'correct uri');
 }
 
Index: /trunk/DataStore/t/06_fileset.t
===================================================================
--- /trunk/DataStore/t/06_fileset.t	(revision 15020)
+++ /trunk/DataStore/t/06_fileset.t	(revision 15021)
@@ -3,5 +3,5 @@
 # Copyright (C) 2006  Joshua Hoblitt
 #
-# $Id: 06_fileset.t,v 1.8 2006-08-31 22:58:34 jhoblitt Exp $
+# $Id: 06_fileset.t,v 1.9 2007-09-25 23:50:34 jhoblitt Exp $
 
 use strict;
@@ -10,5 +10,5 @@
 use lib qw( ./lib ./t );
 
-use Test::More tests => 18;
+use Test::More tests => 19;
 
 =head1 NAME
@@ -33,5 +33,5 @@
 {
     my $dsf = DataStore::FileSet->new(
-        uri         => 'http://example.org/',
+        uri         => 'http://example.org/index.txt',
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
@@ -44,5 +44,5 @@
 eval {
     my $dsf = DataStore::FileSet->new(
-        uri         => 'http://example.org/',
+        uri         => 'http://example.org/index.txt',
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
@@ -57,9 +57,15 @@
     my $dsf = DataStore::FileSet->new( uri => 'http://example.org' );
 };
-like($@, qr/is valid uri dirname/,
+like($@, qr/uri ends with \/index.txt/,
     '->new() fails when uri param does not end with /');
 
 eval {
-    my $dsf = DataStore::FileSet->new( uri => '://example.org' );
+    my $dsf = DataStore::FileSet->new( uri => 'http://example.org/index.html' );
+};
+like($@, qr/uri ends with \/index.txt/,
+    '->new() fails when uri param does not end with /');
+
+eval {
+    my $dsf = DataStore::FileSet->new( uri => '://example.org/index.txt' );
 };
 like($@, qr/is valid http uri/,
@@ -105,5 +111,5 @@
     print $server->Start(), "\n";
 
-    $server->RegisterURL('/', \&bar);
+    $server->RegisterURL('/index.txt', \&bar);
     $server->Process();  # Run forever
 
@@ -116,5 +122,5 @@
 {
     my $dsp = DataStore::FileSet->new(
-        uri         => "http://localhost:$port/",
+        uri         => "http://localhost:$port/index.txt",
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
@@ -127,5 +133,5 @@
 {
     my $dsp = DataStore::FileSet->new(
-        uri         => "http://localhost:$port/",
+        uri         => "http://localhost:$port/index.txt",
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',
@@ -154,5 +160,5 @@
 eval {
     my $dsf = DataStore::FileSet->new(
-        uri         => 'http://example.org/',
+        uri         => 'http://example.org/index.txt',
         fileset     => '12buckelyourshoe',
         datetime    => '2042-01-01T00:00:00Z',