summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 22:51:45 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-27 22:51:45 +0000
commitb61a5d8a9a3eb306079743e73f592a6ac6c8c8b3 (patch)
treed3a1100f17b76b5400c27544a676ded12d9996b3
parentcfbb64d6dc82c1aca04096009bc7baac4e4c5dfa (diff)
downloadchromium_src-b61a5d8a9a3eb306079743e73f592a6ac6c8c8b3.zip
chromium_src-b61a5d8a9a3eb306079743e73f592a6ac6c8c8b3.tar.gz
chromium_src-b61a5d8a9a3eb306079743e73f592a6ac6c8c8b3.tar.bz2
More tweaks to doc server.
TBR=yoz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10697012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144594 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/docs/server/README8
-rw-r--r--chrome/common/extensions/docs/server/app.yaml6
-rwxr-xr-xchrome/common/extensions/docs/server/main.py (renamed from chrome/common/extensions/docs/server/chromeextensionsdocs.py)17
3 files changed, 25 insertions, 6 deletions
diff --git a/chrome/common/extensions/docs/server/README b/chrome/common/extensions/docs/server/README
index 1c4fa85..c45e7d9 100644
--- a/chrome/common/extensions/docs/server/README
+++ b/chrome/common/extensions/docs/server/README
@@ -1,5 +1,6 @@
This directory contains the App Engine server code that hosts the Chrome
-Extensions documentation at http://code.google.com/chrome/extensions
+Extensions and Apps documentation at http://code.google.com/chrome/extensions
+and http://developer.chrome.com/
--------------------------------------------------------------------------------
Running the server locally
@@ -19,8 +20,9 @@ Running the server locally
--------------------------------------------------------------------------------
Deploying the server to code.google.com:
-You will need to have access to the appropriate appspot.com app. Contact
-aa@chromium.org or kurrik@chromium.org to obtain access.
+You will need to have access to the http://chrome-apps-doc.appspot.com app.
+Contact aa@chromium.org, erikkay@chromium.org, mihaip@chromium.org, or
+miket@chromium.org to obtain access.
Once you have access:
diff --git a/chrome/common/extensions/docs/server/app.yaml b/chrome/common/extensions/docs/server/app.yaml
index 4a79f95..a910b47 100644
--- a/chrome/common/extensions/docs/server/app.yaml
+++ b/chrome/common/extensions/docs/server/app.yaml
@@ -1,8 +1,8 @@
-application: chromeextensionsdocs
-version: 1-2-2
+application: chrome-apps-doc
+version: 1-2-4
runtime: python
api_version: 1
handlers:
- url: /.*
- script: chromeextensionsdocs.py
+ script: main.py
diff --git a/chrome/common/extensions/docs/server/chromeextensionsdocs.py b/chrome/common/extensions/docs/server/main.py
index 7886d97..2f7d2a8 100755
--- a/chrome/common/extensions/docs/server/chromeextensionsdocs.py
+++ b/chrome/common/extensions/docs/server/main.py
@@ -138,6 +138,23 @@ class MainPage(webapp.RequestHandler):
if len(self.path) > 0 and self.path[-1] == '':
self.path.pop()
+ # Temporary hacks for apps.
+ # TODO(aa): Remove once the apps content percolates through Chrome's release
+ # process more.
+ if self.path == ['apps'] or self.path == ['trunk', 'apps']:
+ self.redirect('/trunk/apps/about_apps.html')
+ return False
+
+ # TODO(aa): Remove once we have a homepage for developer.chrome.com.
+ if (self.path == [] and
+ self.request.url.startswith('http://developer.chrome.com')):
+ self.redirect('http://developers.google.com/chrome')
+ return False
+
+ # TODO(aa): Remove this soon.
+ if len(self.path) > 1 and self.path[1] == 'apps':
+ return False
+
return self.redirectToIndexIfNecessary()