From 096e31d713193de9b84b348d88df3bdcfd5dde9c Mon Sep 17 00:00:00 2001
From: Shane Frischkorn <shanef@gmail.com>
Date: Mon, 3 Mar 2014 13:01:40 +1000
Subject: [PATCH] Updating wsgi file for deployment

---
 .idea/workspace.xml | 73 +++++++++++++++------------------------------
 rockviewer.wsgi     |  2 +-
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7391340..510fdcb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="56ba8ed1-8d88-44b6-a1d9-9818bc65c9ae" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/three_d_viewer/views.py" afterPath="$PROJECT_DIR$/three_d_viewer/views.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rockviewer.wsgi" afterPath="$PROJECT_DIR$/rockviewer.wsgi" />
     </list>
     <ignored path="rockviewer.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -28,15 +27,6 @@
     <splitter split-orientation="horizontal" split-proportion="0.5">
       <split-first>
         <leaf>
-          <file leaf-file-name="rock_practice.html" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/rock_practice.html">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="2" column="51" selection-start="104" selection-end="104" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="136">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file leaf-file-name="base.html" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/three_d_viewer/templates/three_d_viewer/base.html">
               <provider selected="true" editor-type-id="text-editor">
@@ -64,10 +54,19 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="views.py" pinned="false" current="true" current-in-tab="true">
+          <file leaf-file-name="views.py" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="127" column="0" selection-start="4083" selection-end="4083" vertical-scroll-proportion="0.66630554" vertical-offset="1459" max-vertical-offset="2856">
+                <state line="127" column="0" selection-start="4083" selection-end="4083" vertical-scroll-proportion="0.0" vertical-offset="1459" max-vertical-offset="2856">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="rockviewer.wsgi" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.11050921" vertical-offset="0" max-vertical-offset="923">
                   <folding />
                 </state>
               </provider>
@@ -177,6 +176,7 @@
         <option value="$PROJECT_DIR$/three_d_viewer/models.py" />
         <option value="$PROJECT_DIR$/three_d_viewer/urls.py" />
         <option value="$PROJECT_DIR$/three_d_viewer/views.py" />
+        <option value="$PROJECT_DIR$/rockviewer.wsgi" />
       </list>
     </option>
   </component>
@@ -230,38 +230,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="rockviewer" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="rockviewer" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="three_d_viewer" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="rockviewer" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="rockviewer" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="three_d_viewer" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="templates" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="rockviewer" />
@@ -594,18 +562,18 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="2576" height="1576" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32944608" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2609375" sideWeight="0.6705539" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39889196" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32825485" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -952,7 +920,14 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/three_d_viewer/views.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="127" column="0" selection-start="4083" selection-end="4083" vertical-scroll-proportion="0.66630554" vertical-offset="1459" max-vertical-offset="2856">
+        <state line="127" column="0" selection-start="4083" selection-end="4083" vertical-scroll-proportion="0.0" vertical-offset="1459" max-vertical-offset="2856">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/rockviewer.wsgi">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="27" selection-start="280" selection-end="280" vertical-scroll-proportion="0.11050921" vertical-offset="0" max-vertical-offset="923">
           <folding />
         </state>
       </provider>
diff --git a/rockviewer.wsgi b/rockviewer.wsgi
index 8fa48ea..9585c11 100644
--- a/rockviewer.wsgi
+++ b/rockviewer.wsgi
@@ -2,6 +2,6 @@ import os
 import sys
 # put the Django project on sys.path
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../")))
-os.environ["DJANGO_SETTINGS_MODULE"] = "three_d_viewer.settings"
+os.environ["DJANGO_SETTINGS_MODULE"] = "rockviewer.settings"
 from django.core.handlers.wsgi import WSGIHandler
 application = WSGIHandler()
\ No newline at end of file