| Index: trunk/src/chrome/common/extensions/docs/server2/server_instance.py
|
| ===================================================================
|
| --- trunk/src/chrome/common/extensions/docs/server2/server_instance.py (revision 199633)
|
| +++ trunk/src/chrome/common/extensions/docs/server2/server_instance.py (working copy)
|
| @@ -2,24 +2,37 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +from fnmatch import fnmatch
|
| +import logging
|
| +import mimetypes
|
| +import traceback
|
| +import os
|
| +
|
| from api_data_source import APIDataSource
|
| from api_list_data_source import APIListDataSource
|
| -from appengine_wrappers import IsDevServer
|
| +from appengine_url_fetcher import AppEngineUrlFetcher
|
| +from appengine_wrappers import GetAppVersion, IsDevServer
|
| +from branch_utility import BranchUtility
|
| 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 file_system import FileNotFoundError
|
| +from github_file_system import GithubFileSystem
|
| from intro_data_source import IntroDataSource
|
| from local_file_system import LocalFileSystem
|
| -from manifest_data_source import ManifestDataSource
|
| from object_store_creator import ObjectStoreCreator
|
| +from offline_file_system import OfflineFileSystem
|
| from path_canonicalizer import PathCanonicalizer
|
| from reference_resolver import ReferenceResolver
|
| from samples_data_source import SamplesDataSource
|
| from sidenav_data_source import SidenavDataSource
|
| +from subversion_file_system import SubversionFileSystem
|
| import svn_constants
|
| from template_data_source import TemplateDataSource
|
| from test_object_store import TestObjectStore
|
| +from third_party.json_schema_compiler.model import UnixName
|
| +import url_constants
|
|
|
| class ServerInstance(object):
|
| def __init__(self,
|
| @@ -84,12 +97,6 @@
|
| self.compiled_host_fs_factory,
|
| svn_constants.JSON_PATH)
|
|
|
| - self.manifest_data_source = ManifestDataSource(
|
| - self.compiled_host_fs_factory,
|
| - LocalFileSystem.Create(),
|
| - '/'.join((svn_constants.JSON_PATH, 'manifest.json')),
|
| - '/'.join((svn_constants.API_PATH, '_manifest_features.json')))
|
| -
|
| self.template_data_source_factory = TemplateDataSource.Factory(
|
| channel,
|
| self.api_data_source_factory,
|
| @@ -99,7 +106,6 @@
|
| 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)
|
|
|
|
|