Doc server manifest page generation

chrome/common/extensions/docs/server2/server_instance.py

Index: chrome/common/extensions/docs/server2/server_instance.py
diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py
index 379cf98594999e13fd8381b6c252fbc8709c6076..f14103ad0dc6583318cded4c8d6750a5cb38699a 100644
--- a/chrome/common/extensions/docs/server2/server_instance.py
+++ b/chrome/common/extensions/docs/server2/server_instance.py
@@ -17,12 +17,12 @@ from caching_file_system import CachingFileSystem
 from compiled_file_system import CompiledFileSystem
 from empty_dir_file_system import EmptyDirFileSystem
 from example_zipper import ExampleZipper
+from manifest_data_source import ManifestDataSource
 from file_system import FileNotFoundError
 from github_file_system import GithubFileSystem
 from host_file_system_creator import HostFileSystemCreator
 from intro_data_source import IntroDataSource
 from object_store_creator import ObjectStoreCreator
-from offline_file_system import OfflineFileSystem
 from path_canonicalizer import PathCanonicalizer
 from redirector import Redirector
 from reference_resolver import ReferenceResolver
@@ -32,8 +32,6 @@ import svn_constants
 from template_data_source import TemplateDataSource
 from test_branch_utility import TestBranchUtility
 from test_object_store import TestObjectStore
-from third_party.json_schema_compiler.model import UnixName
-import url_constants
 
 class ServerInstance(object):
   def __init__(self,
@@ -106,14 +104,22 @@ class ServerInstance(object):
         self.compiled_host_fs_factory,
         svn_constants.JSON_PATH)
 
+    self.manifest_data_source = ManifestDataSource(
+        self.compiled_host_fs_factory,
+        host_file_system,
+        '/'.join((svn_constants.JSON_PATH, 'manifest.json')),
+        '/'.join((svn_constants.API_PATH, '_manifest_features.json')))
+
     self.template_data_source_factory = TemplateDataSource.Factory(
         self.api_data_source_factory,
+

[not at google - send to devlin, 2013/07/20 02:49:03]

where did this empty line come from?

[jshumway, 2013/07/22 17:16:27]

I think something strange happened in the conflict resolution stage. Removed.

         self.api_list_data_source_factory,
         self.intro_data_source_factory,
         self.samples_data_source_factory,
         self.sidenav_data_source_factory,
         self.compiled_host_fs_factory,
         self.ref_resolver_factory,
+        self.manifest_data_source,
         svn_constants.PUBLIC_TEMPLATE_PATH,
         svn_constants.PRIVATE_TEMPLATE_PATH,
         base_path)