Adjusted directory structure to fit for pydev.

.gitignore

@@ -0,0 +1 @@
+/settings.py

.pydevproject

@@ -2,36 +2,37 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
-<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
-<key>GOOGLE_APP_ENGINE</key>
-<value>/usr/local/google_appengine</value>
-</pydev_variables_property>
-<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
-<path>${GOOGLE_APP_ENGINE}</path>
-<path>${GOOGLE_APP_ENGINE}/lib/antlr3</path>
-<path>${GOOGLE_APP_ENGINE}/lib/django_1_3</path>
-<path>${GOOGLE_APP_ENGINE}/lib/enum</path>
-<path>${GOOGLE_APP_ENGINE}/lib/fancy_urllib</path>
-<path>${GOOGLE_APP_ENGINE}/lib/google-api-python-client</path>
-<path>${GOOGLE_APP_ENGINE}/lib/graphy</path>
-<path>${GOOGLE_APP_ENGINE}/lib/grizzled</path>
-<path>${GOOGLE_APP_ENGINE}/lib/httplib2</path>
-<path>${GOOGLE_APP_ENGINE}/lib/ipaddr</path>
-<path>${GOOGLE_APP_ENGINE}/lib/jinja2</path>
-<path>${GOOGLE_APP_ENGINE}/lib/markupsafe</path>
-<path>${GOOGLE_APP_ENGINE}/lib/oauth2</path>
-<path>${GOOGLE_APP_ENGINE}/lib/prettytable</path>
-<path>${GOOGLE_APP_ENGINE}/lib/protorpc</path>
-<path>${GOOGLE_APP_ENGINE}/lib/python-gflags/tests</path>
-<path>${GOOGLE_APP_ENGINE}/lib/simplejson</path>
-<path>${GOOGLE_APP_ENGINE}/lib/sqlcmd</path>
-<path>${GOOGLE_APP_ENGINE}/lib/webapp2</path>
-<path>${GOOGLE_APP_ENGINE}/lib/webob</path>
-<path>${GOOGLE_APP_ENGINE}/lib/yaml/lib</path>
-</pydev_pathproperty>
-<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/openalive/src</path>
-</pydev_pathproperty>
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
+    <pydev_variables_property
+        name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">
+        <key>GOOGLE_APP_ENGINE</key>
+        <value>/usr/local/google_appengine</value>
+    </pydev_variables_property>
+    <pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
+        <path>${GOOGLE_APP_ENGINE}</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/antlr3</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/django_1_3</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/enum</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/fancy_urllib</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/google-api-python-client</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/graphy</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/grizzled</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/httplib2</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/ipaddr</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/jinja2</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/markupsafe</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/oauth2</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/prettytable</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/protorpc</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/python-gflags/tests</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/simplejson</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/sqlcmd</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/webapp2</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/webob</path>
+        <path>${GOOGLE_APP_ENGINE}/lib/yaml/lib</path>
+    </pydev_pathproperty>
+    <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+        <path>/openalive</path>
+    </pydev_pathproperty>
 </pydev_project>

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,2 @@
-#Thu Feb 09 21:58:29 PST 2012
-eclipse.preferences.version=1
-encoding//src/lib/polib.py=utf-8
+#Wed Feb 15 17:13:02 PST 2012
+eclipse.preferences.version=1

app.yaml

@@ -16,11 +16,11 @@ handlers:
   login: admin
 
 - url: /static
-  static_dir: src/static
+  static_dir: static
 
 - url: /favicon.ico
-  static_files: src/static/favicon.ico
-  upload: src/static/favicon.ico
+  static_files: static/favicon.ico
+  upload: static/favicon.ico
 
 - url: /.*
   script: bootstrap.py

build.properties

@@ -0,0 +1 @@
+port=8080

build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- Base idea from http://www.ibm.com/developerworks/library/os-ecant/ -->
-<project name="openalive" basedir=".">
+<project name="openalive" basedir="." default="run">
 	<description>${ant.project.name} build file</description>
 
 	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
@@ -15,7 +15,10 @@
 		</classpath>
 	</typedef>
 
-	<property name="src.dir" location="src" />
+	<property file="build.properties" />
+
+	<property name="src.dir" location="." />
+	<property name="test.dir" location="test" />
 	<property name="pydoc.dir" value="pydoc" />
 
 	<target name="init">
@@ -24,10 +27,38 @@
 		<property name="appengine.dir" location="${pydev_project.pydev_variables_property.value}" />
 		<propertyregex property="tmp.pythonpath" input="${pydev_project.pydev_pathproperty.path}" regexp="," replace=":" />
 		<propertyregex property="pythonpath" input="${tmp.pythonpath}" regexp="..GOOGLE_APP_ENGINE." replace="${appengine.dir}" />
-		<propertyregex property="pythonpath" input="${pythonpath}" regexp="\/${ant.project.name}\/" replace="" override="true" />
+		<propertyregex property="pythonpath" input="${pythonpath}" regexp="\/${ant.project.name}" replace="${src.dir}" override="true" />
 		<property name="django-admin" location="${appengine.dir}/lib/django_1_3/django/bin/django-admin.py" />
 	</target>
 
+	<target name="run" depends="init">
+		<py-run script="${appengine.dir}/dev_appserver.py" pythonpath="${pythonpath}" optimize="0">
+			<arg value="${src.dir}" />
+			<arg value="--port=${port}" />
+			<arg value="--debug" />
+			<arg value="--disable_static_caching" />
+		</py-run>
+	</target>
+
+	<target name="deploy" depends="init">
+		<py-run script="${appengine.dir}/appcfg.py">
+			<arg value="update" />
+			<arg value="${src.dir}" />
+		</py-run>
+	</target>
+
+	<target name="compile" depends="init">
+		<py-compile dir="${src.dir}" pythonpath="${pythonpath}" optimize="0" />
+	</target>
+
+	<target name="tests" depends="init">
+		<py-test pythonpath="${pythonpath}:${test.dir}" dir=".">
+			<fileset dir="${test.dir}">
+				<include name="**/*_test.py" />
+			</fileset>
+		</py-test>
+	</target>
+
 	<target name="i18n" depends="init">
 		<py-run script="${django-admin}" pythonpath="${pythonpath}" dir="${src.dir}" failonerror="no">
 			<arg value="makemessages" />

src/conf/locale/en/LC_MESSAGES/django.po → conf/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-10 14:53-0800\n"
+"POT-Creation-Date: 2012-02-15 17:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,22 +25,20 @@ msgstr "Do not specify."
 msgid "Korean"
 msgstr "Korean"
 
-#: templates/index.html:8
+#: templates/index.html:78
 msgid "Welcome."
 msgstr "Welcome."
 
-#: templates/index.html:11
+#: templates/_snippets/nav.html:19
 msgid "Login"
 msgstr "Login"
 
-#: templates/index.html:13
+#: templates/_snippets/nav.html:21
 msgid "Logout"
 msgstr "Logout"
 
-#: templates/index.html:17
-msgid "Create New Quiz"
-msgstr "Create New Quiz"
+#~ msgid "Create New Quiz"
+#~ msgstr "Create New Quiz"
 
-#: templates/index.html:18
-msgid "My Page"
-msgstr "My Page"
+#~ msgid "My Page"
+#~ msgstr "My Page"

src/conf/locale/es/LC_MESSAGES/django.po → conf/locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-10 14:53-0800\n"
+"POT-Creation-Date: 2012-02-15 17:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,22 +25,20 @@ msgstr "No se especifica."
 msgid "Korean"
 msgstr "Coreano"
 
-#: templates/index.html:8
+#: templates/index.html:78
 msgid "Welcome."
 msgstr "Bienvenido."
 
-#: templates/index.html:11
+#: templates/_snippets/nav.html:19
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: templates/index.html:13
+#: templates/_snippets/nav.html:21
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#: templates/index.html:17
-msgid "Create New Quiz"
-msgstr "Crear New Quiz"
+#~ msgid "Create New Quiz"
+#~ msgstr "Crear New Quiz"
 
-#: templates/index.html:18
-msgid "My Page"
-msgstr "Mi página"
+#~ msgid "My Page"
+#~ msgstr "Mi página"

src/conf/locale/fr/LC_MESSAGES/django.po → conf/locale/fr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-10 14:53-0800\n"
+"POT-Creation-Date: 2012-02-15 17:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,22 +25,20 @@ msgstr "Ne spécifiez pas."
 msgid "Korean"
 msgstr "Coréen"
 
-#: templates/index.html:8
+#: templates/index.html:78
 msgid "Welcome."
 msgstr "Bienvenue."
 
-#: templates/index.html:11
+#: templates/_snippets/nav.html:19
 msgid "Login"
 msgstr "Login"
 
-#: templates/index.html:13
+#: templates/_snippets/nav.html:21
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: templates/index.html:17
-msgid "Create New Quiz"
-msgstr "Créer New Quiz"
+#~ msgid "Create New Quiz"
+#~ msgstr "Créer New Quiz"
 
-#: templates/index.html:18
-msgid "My Page"
-msgstr "Ma Page"
+#~ msgid "My Page"
+#~ msgstr "Ma Page"

src/conf/locale/it/LC_MESSAGES/django.po → conf/locale/it/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-10 14:53-0800\n"
+"POT-Creation-Date: 2012-02-15 17:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,22 +25,20 @@ msgstr "Non specificato."
 msgid "Korean"
 msgstr "Coreano"
 
-#: templates/index.html:8
+#: templates/index.html:78
 msgid "Welcome."
 msgstr "Benvenuto."
 
-#: templates/index.html:11
+#: templates/_snippets/nav.html:19
 msgid "Login"
 msgstr "Accesso"
 
-#: templates/index.html:13
+#: templates/_snippets/nav.html:21
 msgid "Logout"
 msgstr "Logout"
 
-#: templates/index.html:17
-msgid "Create New Quiz"
-msgstr "Crea nuovo Quiz"
+#~ msgid "Create New Quiz"
+#~ msgstr "Crea nuovo Quiz"
 
-#: templates/index.html:18
-msgid "My Page"
-msgstr "My Page"
+#~ msgid "My Page"
+#~ msgstr "My Page"

src/conf/locale/ja/LC_MESSAGES/django.po → conf/locale/ja/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-10 14:53-0800\n"
+"POT-Creation-Date: 2012-02-15 17:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,22 +25,20 @@ msgstr "指定しないでください。"
 msgid "Korean"
 msgstr "韓国語"
 
-#: templates/index.html:8
+#: templates/index.html:78
 msgid "Welcome."
 msgstr "ようこそ。"
 
-#: templates/index.html:11
+#: templates/_snippets/nav.html:19
 msgid "Login"
 msgstr "ログイン"
 
-#: templates/index.html:13
+#: templates/_snippets/nav.html:21
 msgid "Logout"
 msgstr "ログアウト"
 
-#: templates/index.html:17
-msgid "Create New Quiz"
-msgstr "新しいクイズを作成します。"
+#~ msgid "Create New Quiz"
+#~ msgstr "新しいクイズを作成します。"
 
-#: templates/index.html:18
-msgid "My Page"
-msgstr "マイページ"
+#~ msgid "My Page"
+#~ msgstr "マイページ"

src/conf/locale/ko/LC_MESSAGES/django.po → conf/locale/ko/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-10 14:53-0800\n"
+"POT-Creation-Date: 2012-02-15 17:30-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,22 +25,20 @@ msgstr "지정하지 마십시오."
 msgid "Korean"
 msgstr "한국의"
 
-#: templates/index.html:8
+#: templates/index.html:78
 msgid "Welcome."
 msgstr "환영합니다."
 
-#: templates/index.html:11
+#: templates/_snippets/nav.html:19
 msgid "Login"
 msgstr "로그인"
 
-#: templates/index.html:13
+#: templates/_snippets/nav.html:21
 msgid "Logout"
 msgstr "로그아웃"
 
-#: templates/index.html:17
-msgid "Create New Quiz"
-msgstr "새로운 퀴즈 만들기"
+#~ msgid "Create New Quiz"
+#~ msgstr "새로운 퀴즈 만들기"
 
-#: templates/index.html:18
-msgid "My Page"
-msgstr "마이 페이지"
+#~ msgid "My Page"
+#~ msgstr "마이 페이지"