Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5674)

Unified Diff: chrome/common/extensions/docs/server2/cron_servlet.py

Issue 68873003: Docserver: Serve docs out of src/ not src/chrome/common/extensions. This allows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/docs/server2/cron_servlet.py
diff --git a/chrome/common/extensions/docs/server2/cron_servlet.py b/chrome/common/extensions/docs/server2/cron_servlet.py
index 54c2af7efd9bc6e64887440da58ad6fc872ee925..fe4a9a5cc3e80b2ba5919128b1680ce2458f7385 100644
--- a/chrome/common/extensions/docs/server2/cron_servlet.py
+++ b/chrome/common/extensions/docs/server2/cron_servlet.py
@@ -13,6 +13,7 @@ from compiled_file_system import CompiledFileSystem
from data_source_registry import CreateDataSources
from empty_dir_file_system import EmptyDirFileSystem
from environment import IsDevServer
+from extensions_paths import EXAMPLES, PUBLIC_TEMPLATES, SERVER2, STATIC_DOCS
from file_system_util import CreateURLsFromPaths
from future import Gettable, Future
from github_file_system_provider import GithubFileSystemProvider
@@ -21,9 +22,9 @@ from object_store_creator import ObjectStoreCreator
from render_servlet import RenderServlet
from server_instance import ServerInstance
from servlet import Servlet, Request, Response
-import svn_constants
from timer import Timer, TimerClosure
+
class _SingletonRenderServletDelegate(RenderServlet.Delegate):
def __init__(self, server_instance):
self._server_instance = server_instance
@@ -188,25 +189,24 @@ class CronServlet(Servlet):
# Rendering the public templates will also pull in all of the private
# templates.
- results.append(request_files_in_dir(svn_constants.PUBLIC_TEMPLATE_PATH))
+ results.append(request_files_in_dir(PUBLIC_TEMPLATES))
# Rendering the public templates will have pulled in the .js and
# manifest.json files (for listing examples on the API reference pages),
# but there are still images, CSS, etc.
- results.append(request_files_in_dir(svn_constants.STATIC_PATH,
- prefix='static/'))
+ results.append(request_files_in_dir(STATIC_DOCS, prefix='static'))
# Samples are too expensive to run on the dev server, where there is no
# parallel fetch.
if not IsDevServer():
# Fetch each individual sample file.
- results.append(request_files_in_dir(svn_constants.EXAMPLES_PATH,
- prefix='extensions/examples/'))
+ results.append(request_files_in_dir(EXAMPLES,
+ prefix='extensions/examples'))
# Fetch the zip file of each example (contains all the individual
# files).
example_zips = []
- for root, _, files in trunk_fs.Walk(svn_constants.EXAMPLES_PATH):
+ for root, _, files in trunk_fs.Walk(EXAMPLES):
example_zips.extend(
root + '.zip' for name in files if name == 'manifest.json')
results.append(_RequestEachItem(
@@ -252,7 +252,6 @@ class CronServlet(Servlet):
self._GetMostRecentRevision())
app_yaml_handler = AppYamlHelper(
- svn_constants.APP_YAML_PATH,
server_instance_near_head.object_store_creator,
server_instance_near_head.host_file_system_provider)
@@ -276,7 +275,7 @@ class CronServlet(Servlet):
'''
head_fs = (
self._CreateServerInstance(None).host_file_system_provider.GetTrunk())
- return head_fs.Stat('/').version
+ return head_fs.Stat('').version
def _CreateServerInstance(self, revision):
'''Creates a ServerInstance pinned to |revision|, or HEAD if None.

Powered by Google App Engine
This is Rietveld 408576698