Commit 7aa1b732 authored by Daniele Venzano's avatar Daniele Venzano

Cleanups and refactoring

parent dd9226c8
......@@ -43,6 +43,7 @@
<column name="cluster_id" sqlType="INT" precision="10" scale="0" nullable="false" jdbcType="4"/>
<column name="service_name" sqlType="VARCHAR" precision="64" scale="0" nullable="true" jdbcType="12"/>
<column name="container_id" sqlType="INT" precision="10" scale="0" nullable="false" jdbcType="4"/>
<column name="last_access" sqlType="TIMESTAMP" precision="19" scale="0" nullable="true" jdbcType="93"/>
<primary-key name="PRIMARY" columns="id"/>
</table>
<table name="users" schema="" catalog="caaas" type="TABLE">
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" hash="730622038">
<component name="DataSourceManagerImpl" format="xml" hash="779648770">
<data-source source="LOCAL" name="MySQL - @m1" uuid="a32fd6de-3ffa-40c0-9ec8-8953a89c53e0">
<driver-ref>mysql</driver-ref>
<synchronize>true</synchronize>
......
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoredPackages">
<value>
<list size="1">
<item index="0" class="java.lang.String" itemvalue="mysql" />
</list>
</value>
</option>
</inspection_tool>
<inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
<option name="processCode" value="false" />
<option name="processLiterals" value="true" />
......
<
......@@ -2,15 +2,28 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="75bc5abc-acc8-44ff-9d8a-85151a0cbca1" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/requirements.txt" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/images/swarm_pull.sh" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/caaas/utils.py" />
<change type="DELETED" beforePath="E:\User Data\vcs\caaas\utils\__init__.py" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.ids" afterPath="$PROJECT_DIR$/.idea/dataSources.ids" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/__init__.py" afterPath="$PROJECT_DIR$/caaas/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/apache-proxy.py" afterPath="$PROJECT_DIR$/apache-proxy.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/api.py" afterPath="$PROJECT_DIR$/caaas/api.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/base.html" afterPath="$PROJECT_DIR$/caaas/templates/base.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/home.html" afterPath="$PROJECT_DIR$/caaas/templates/home.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas.ini.template" afterPath="$PROJECT_DIR$/caaas.ini.template" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/cleanup_thread.py" afterPath="$PROJECT_DIR$/caaas/cleanup_thread.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/main.py" afterPath="$PROJECT_DIR$/main.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/notebook.html" afterPath="$PROJECT_DIR$/caaas/templates/notebook.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/proxy_manager.py" afterPath="$PROJECT_DIR$/caaas/proxy_manager.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/spark_app_execution.py" afterPath="$PROJECT_DIR$/caaas/spark_app_execution.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/sql.py" afterPath="$PROJECT_DIR$/caaas/sql.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/status.html" afterPath="$PROJECT_DIR$/caaas/templates/status.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/templates/submit.html" afterPath="$PROJECT_DIR$/caaas/templates/submit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/swarm_manager.py" afterPath="$PROJECT_DIR$/caaas/swarm_manager.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/caaas/web.py" afterPath="$PROJECT_DIR$/caaas/web.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MOVED" beforePath="E:\User Data\vcs\caaas\caaas\templates\user-status.html" afterPath="$PROJECT_DIR$/caaas/templates/apps.html" />
<change type="MOVED" beforePath="E:\User Data\vcs\caaas\utils\config.py" afterPath="$PROJECT_DIR$/caaas/config_parser.py" />
</list>
<ignored path="caaas.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -24,7 +37,7 @@
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/caaas$main.coverage" NAME="main Coverage Results" MODIFIED="1439385370179" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
<SUITE FILE_PATH="coverage/caaas$main.coverage" NAME="main Coverage Results" MODIFIED="1439466994264" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/" />
<SUITE FILE_PATH="coverage/caaas$apache_proxy.coverage" NAME="apache-proxy Coverage Results" MODIFIED="1439272960154" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="CreatePatchCommitExecutor">
......@@ -128,88 +141,104 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="api.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/api.py">
<file leaf-file-name="swarm_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/swarm_manager.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="78" column="27" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="27" />
<caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding>
<element signature="e#0#45#0" expanded="true" />
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="swarm_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/swarm_manager.py">
<file leaf-file-name="utils.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/utils.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="177" column="41" selection-start-line="177" selection-start-column="41" selection-end-line="177" selection-end-column="41" />
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="web.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/web.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.41278064">
<caret line="54" column="0" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="proxy_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/proxy_manager.py">
<file leaf-file-name="caaas.ini" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas.ini">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<caret line="16" column="28" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="web.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/web.py">
<file leaf-file-name="cleanup_thread.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/cleanup_thread.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<caret line="109" column="0" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
<folding>
<element signature="e#0#33#0" expanded="true" />
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="home.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<file leaf-file-name="notebook.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/notebook.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.8461537">
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
<state vertical-scroll-proportion="-5.8846154">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/caaas/templates/base.html">
<file leaf-file-name="config_parser.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/config_parser.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7093863">
<caret line="31" column="142" selection-start-line="31" selection-start-column="142" selection-end-line="31" selection-end-column="142" />
<folding />
<state vertical-scroll-proportion="0.0">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#0#37#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="status.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/status.html">
<file leaf-file-name="proxy_manager.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/proxy_manager.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-8.5">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
<folding />
<state vertical-scroll-proportion="0.0">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="terminate.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/terminate.html">
<file leaf-file-name="spark_app_execution.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/spark_app_execution.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0">
<caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
<folding />
<state vertical-scroll-proportion="0.0">
<caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding>
<element signature="e#0#27#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -218,69 +247,61 @@
<entry file="file://$PROJECT_DIR$/caaas/sql.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="365" column="0" selection-start-line="365" selection-start-column="0" selection-end-line="365" selection-end-column="0" />
<caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
<folding>
<marker date="1439387843385" expanded="true" signature="920:956" placeholder="SELECT id FR..users..." />
<marker date="1439387843385" expanded="true" signature="1325:1365" placeholder="INSERT INTO ..." />
<marker date="1439387843385" expanded="true" signature="1668:1704" placeholder="SELECT usern..users..." />
<marker date="1439387843385" expanded="true" signature="1914:1944" placeholder="SELECT id, u..users..." />
<marker date="1439387843385" expanded="true" signature="2248:2313" placeholder="SELECT COUNT..applications..." />
<marker date="1439387843385" expanded="true" signature="2376:2456" placeholder="SELECT COUNT..applications..." />
<marker date="1439387843385" expanded="true" signature="2715:2744" placeholder="SELECT COUNT..clusters..." />
<marker date="1439387843385" expanded="true" signature="2807:2851" placeholder="SELECT COUNT..clusters..." />
<marker date="1439387843385" expanded="true" signature="3154:3185" placeholder="SELECT COUNT..containers..." />
<marker date="1439387843385" expanded="true" signature="3291:3337" placeholder="SELECT COUNT..containers..." />
<marker date="1439387843385" expanded="true" signature="3457:3506" placeholder="SELECT COUNT..containers..." />
<marker date="1439387843385" expanded="true" signature="3633:3697" placeholder="SELECT COUNT..containers..." />
<marker date="1439387843385" expanded="true" signature="3946:4006" placeholder="SELECT id FR..clusters..." />
<marker date="1439387843385" expanded="true" signature="4459:4505" placeholder="SELECT inter..proxy..." />
<marker date="1439387843385" expanded="true" signature="4872:4936" placeholder="SELECT proxy..proxy..." />
<marker date="1439387843385" expanded="true" signature="5297:5349" placeholder="INSERT INTO ..." />
<marker date="1439387843385" expanded="true" signature="5598:5654" placeholder="UPDATE clust..." />
<marker date="1439387843385" expanded="true" signature="5884:5989" placeholder="INSERT INTO ..." />
<marker date="1439387843385" expanded="true" signature="6306:6417" placeholder="INSERT INTO ..." />
<marker date="1439387843385" expanded="true" signature="6721:6775" placeholder="SELECT id, u..clusters..." />
<marker date="1439387843385" expanded="true" signature="6838:6907" placeholder="SELECT id, u..clusters..." />
<marker date="1439387843385" expanded="true" signature="7324:7398" placeholder="SELECT user_..clusters..." />
<marker date="1439387843385" expanded="true" signature="7926:8005" placeholder="SELECT id, d..containers..." />
<marker date="1439387843385" expanded="true" signature="8111:8205" placeholder="SELECT id, d..containers..." />
<marker date="1439387843385" expanded="true" signature="8325:8422" placeholder="SELECT id, d..containers..." />
<marker date="1439387843385" expanded="true" signature="8549:8661" placeholder="SELECT id, d..containers..." />
<marker date="1439387843385" expanded="true" signature="9208:9297" placeholder="SELECT id, d..containers..." />
<marker date="1439387843385" expanded="true" signature="9859:9926" placeholder="SELECT id, c..containers..." />
<marker date="1439387843385" expanded="true" signature="10263:10331" placeholder="SELECT proxy..proxy..." />
<marker date="1439387843385" expanded="true" signature="10419:10507" placeholder="SELECT proxy..proxy..." />
<marker date="1439387843385" expanded="true" signature="10589:10675" placeholder="SELECT proxy..proxy..." />
<marker date="1439387843385" expanded="true" signature="11179:11216" placeholder="DELETE FROM ..." />
<marker date="1439387843385" expanded="true" signature="11394:11426" placeholder="DELETE FROM ..." />
<marker date="1439387843385" expanded="true" signature="11600:11630" placeholder="DELETE FROM ..." />
<marker date="1439387843385" expanded="true" signature="11871:11965" placeholder="INSERT INTO ..." />
<marker date="1439387843385" expanded="true" signature="12246:12355" placeholder="SELECT id FR..applications..." />
<marker date="1439387843385" expanded="true" signature="12446:12480" placeholder="DELETE FROM ..." />
<marker date="1439387843385" expanded="true" signature="12669:12717" placeholder="UPDATE appli..." />
<marker date="1439387843385" expanded="true" signature="12898:12995" placeholder="UPDATE appli..." />
<marker date="1439387843385" expanded="true" signature="13174:13256" placeholder="UPDATE appli..." />
<marker date="1439387843385" expanded="true" signature="13426:13510" placeholder="UPDATE appli..." />
<marker date="1439387843385" expanded="true" signature="13737:13763" placeholder="SELECT * FRO..applications..." />
<marker date="1439387843385" expanded="true" signature="13826:13852" placeholder="SELECT * FRO..applications..." />
<marker date="1439387843385" expanded="true" signature="13826:13867" placeholder="SELECT * FRO..applications..." />
<marker date="1439387843385" expanded="true" signature="14164:14200" placeholder="SELECT * FRO..applications..." />
<marker date="1439387843385" expanded="true" signature="14437:14482" placeholder="SELECT id FR..applications..." />
<element signature="e#0#22#0" expanded="true" />
<marker date="1439465965403" expanded="true" signature="1085:1121" placeholder="SELECT id FR..users..." />
<marker date="1439465965403" expanded="true" signature="1490:1530" placeholder="INSERT INTO ..." />
<marker date="1439465965403" expanded="true" signature="1833:1869" placeholder="SELECT usern..users..." />
<marker date="1439465965403" expanded="true" signature="2079:2109" placeholder="SELECT id, u..users..." />
<marker date="1439465965403" expanded="true" signature="2413:2478" placeholder="SELECT COUNT..applications..." />
<marker date="1439465965403" expanded="true" signature="2541:2621" placeholder="SELECT COUNT..applications..." />
<marker date="1439465965403" expanded="true" signature="2880:2909" placeholder="SELECT COUNT..clusters..." />
<marker date="1439465965403" expanded="true" signature="2972:3016" placeholder="SELECT COUNT..clusters..." />
<marker date="1439465965403" expanded="true" signature="3319:3350" placeholder="SELECT COUNT..containers..." />
<marker date="1439465965403" expanded="true" signature="3456:3502" placeholder="SELECT COUNT..containers..." />
<marker date="1439465965403" expanded="true" signature="3622:3671" placeholder="SELECT COUNT..containers..." />
<marker date="1439465965403" expanded="true" signature="3798:3862" placeholder="SELECT COUNT..containers..." />
<marker date="1439465965403" expanded="true" signature="4111:4171" placeholder="SELECT id FR..clusters..." />
<marker date="1439465965403" expanded="true" signature="4624:4670" placeholder="SELECT inter..proxy..." />
<marker date="1439465965403" expanded="true" signature="5037:5101" placeholder="SELECT proxy..proxy..." />
<marker date="1439465965403" expanded="true" signature="5462:5514" placeholder="INSERT INTO ..." />
<marker date="1439465965403" expanded="true" signature="5763:5810" placeholder="UPDATE clust..." />
<marker date="1439465965403" expanded="true" signature="6054:6159" placeholder="INSERT INTO ..." />
<marker date="1439465965403" expanded="true" signature="6476:6587" placeholder="INSERT INTO ..." />
<marker date="1439465965403" expanded="true" signature="6891:6945" placeholder="SELECT id, u..clusters..." />
<marker date="1439465965403" expanded="true" signature="7008:7077" placeholder="SELECT id, u..clusters..." />
<marker date="1439465965403" expanded="true" signature="7494:7526" placeholder="SELECT * FRO..clusters..." />
<marker date="1439465965403" expanded="true" signature="7879:7958" placeholder="SELECT id, d..containers..." />
<marker date="1439465965403" expanded="true" signature="8064:8158" placeholder="SELECT id, d..containers..." />
<marker date="1439465965403" expanded="true" signature="8278:8375" placeholder="SELECT id, d..containers..." />
<marker date="1439465965403" expanded="true" signature="8502:8614" placeholder="SELECT id, d..containers..." />
<marker date="1439465965403" expanded="true" signature="9161:9250" placeholder="SELECT id, d..containers..." />
<marker date="1439465965403" expanded="true" signature="9812:9879" placeholder="SELECT id, c..containers..." />
<marker date="1439465965403" expanded="true" signature="10231:10250" placeholder="SELECT * FRO..proxy..." />
<marker date="1439465965403" expanded="true" signature="10338:10377" placeholder="SELECT * FRO..proxy..." />
<marker date="1439465965403" expanded="true" signature="10459:10496" placeholder="SELECT * FRO..proxy..." />
<marker date="1439465965403" expanded="true" signature="10790:10827" placeholder="DELETE FROM ..." />
<marker date="1439465965403" expanded="true" signature="11005:11037" placeholder="DELETE FROM ..." />
<marker date="1439465965403" expanded="true" signature="11211:11241" placeholder="DELETE FROM ..." />
<marker date="1439465965403" expanded="true" signature="11482:11576" placeholder="INSERT INTO ..." />
<marker date="1439465965403" expanded="true" signature="11857:11966" placeholder="SELECT id FR..applications..." />
<marker date="1439465965403" expanded="true" signature="12057:12091" placeholder="DELETE FROM ..." />
<marker date="1439465965403" expanded="true" signature="12280:12328" placeholder="UPDATE appli..." />
<marker date="1439465965403" expanded="true" signature="12509:12606" placeholder="UPDATE appli..." />
<marker date="1439465965403" expanded="true" signature="12785:12867" placeholder="UPDATE appli..." />
<marker date="1439465965403" expanded="true" signature="13037:13121" placeholder="UPDATE appli..." />
<marker date="1439465965403" expanded="true" signature="13348:13374" placeholder="SELECT * FRO..applications..." />
<marker date="1439465965403" expanded="true" signature="13437:13478" placeholder="SELECT * FRO..applications..." />
<marker date="1439465965403" expanded="true" signature="13775:13811" placeholder="SELECT * FRO..applications..." />
<marker date="1439465965403" expanded="true" signature="14048:14093" placeholder="SELECT id FR..applications..." />
<marker date="1439465965403" expanded="true" signature="14406:14453" placeholder="UPDATE proxy..." />
<marker date="1439465965403" expanded="true" signature="14642:14719" placeholder="SELECT clust..proxy..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="apps.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/caaas/templates/apps.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-7.1923075">
<caret line="11" column="90" selection-start-line="11" selection-start-column="90" selection-end-line="11" selection-end-column="90" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -314,36 +335,40 @@
<option value="$PROJECT_DIR$/images/notebook/files/application.conf" />
<option value="$PROJECT_DIR$/images/notebook/files/start-notebook.sh" />
<option value="$PROJECT_DIR$/caaas/swarm.py" />
<option value="$PROJECT_DIR$/caaas/proxy_manager.py" />
<option value="$PROJECT_DIR$/caaas/templates/notebook.html" />
<option value="$PROJECT_DIR$/caaas/templates/terminate.html" />
<option value="$PROJECT_DIR$/caaas/templates/base_user.html" />
<option value="$PROJECT_DIR$/caaas/templates/inspect.html" />
<option value="$PROJECT_DIR$/images/submit/files/submit.sh" />
<option value="$PROJECT_DIR$/caaas/templates/logs.html" />
<option value="$PROJECT_DIR$/utils/__init__.py" />
<option value="$PROJECT_DIR$/caaas/spark_application.py" />
<option value="$PROJECT_DIR$/caaas/templates/user-status.html" />
<option value="$PROJECT_DIR$/caaas/templates/index.html" />
<option value="$PROJECT_DIR$/caaas/cluster_description.py" />
<option value="$PROJECT_DIR$/images/files/submit.sh" />
<option value="$PROJECT_DIR$/caaas/templates/status.html" />
<option value="$PROJECT_DIR$/caaas/templates/apps.html" />
<option value="$PROJECT_DIR$/caaas/templates/home.html" />
<option value="$PROJECT_DIR$/caaas/templates/base.html" />
<option value="$PROJECT_DIR$/images/swarm_pull.sh" />
<option value="$PROJECT_DIR$/caaas/templates/submit.html" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/apache-proxy.py" />
<option value="$PROJECT_DIR$/caaas/__init__.py" />
<option value="$PROJECT_DIR$/caaas.ini" />
<option value="$PROJECT_DIR$/caaas.ini.template" />
<option value="$PROJECT_DIR$/caaas/spark_app_execution.py" />
<option value="$PROJECT_DIR$/utils/config.py" />
<option value="$PROJECT_DIR$/caaas/cleanup_thread.py" />
<option value="$PROJECT_DIR$/caaas/templates/status.html" />
<option value="$PROJECT_DIR$/caaas/swarm_manager.py" />
<option value="$PROJECT_DIR$/utils/__init__.py" />
<option value="$PROJECT_DIR$/caaas.ini" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/caaas/config_parser.py" />
<option value="$PROJECT_DIR$/caaas/proxy_manager.py" />
<option value="$PROJECT_DIR$/apache-proxy.py" />
<option value="$PROJECT_DIR$/main.py" />
<option value="$PROJECT_DIR$/caaas/__init__.py" />
<option value="$PROJECT_DIR$/caaas/utils.py" />
<option value="$PROJECT_DIR$/caaas/api.py" />
<option value="$PROJECT_DIR$/caaas/swarm_manager.py" />
<option value="$PROJECT_DIR$/caaas/sql.py" />
<option value="$PROJECT_DIR$/caaas/spark_app_execution.py" />
<option value="$PROJECT_DIR$/caaas/cleanup_thread.py" />
<option value="$PROJECT_DIR$/caaas/templates/notebook.html" />
<option value="$PROJECT_DIR$/caaas/web.py" />
<option value="$PROJECT_DIR$/caaas/templates/apps.html" />
<option value="$PROJECT_DIR$/caaas/templates/home.html" />
<option value="$PROJECT_DIR$/caaas/templates/base.html" />
</list>
</option>
</component>
......@@ -463,20 +488,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="utils" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="caaas" />
......@@ -525,12 +536,12 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="E:/User Software/WinPython-64bit-2.7.9.3/python-2.7.9.amd64/python.exe" />
......@@ -550,11 +561,13 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\User Data\vcs\caaas\images" />
<recent name="E:\User Data\vcs\caaas\caaas\templates" />
<recent name="E:\User Data\vcs\caaas\images\notebook" />
<recent name="E:\User Data\vcs\caaas" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\User Data\vcs\caaas\caaas" />
<recent name="E:\User Data\vcs\caaas\images\notebook\files" />
<recent name="E:\User Data\vcs\caaas" />
</key>
......@@ -824,21 +837,22 @@
</component>
<component name="ToolWindowManager">
<frame x="255" y="36" width="1606" height="998" extended-state="0" />
<editor active="true" />
<editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298731" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" sideWeight="0.5059701" order="13" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" 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="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718894" sideWeight="0.49402985" order="14" side_tool="false" content_ui="tabs" />
<window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756633" sideWeight="0.49402985" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32873562" sideWeight="0.5" order="8" 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="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19723183" sideWeight="0.49402985" order="2" 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.33" sideWeight="0.5" order="12" 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.1507115" sideWeight="0.5" 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.1545925" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.12742561" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32871974" sideWeight="0.5" order="1" 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.24967659" sideWeight="0.5" order="1" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29953918" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29988465" sideWeight="0.5" order="3" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32911393" sideWeight="0.49552238" order="9" 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" />
......@@ -847,7 +861,6 @@
<window_info id="REST Client" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32911393" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32871974" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32871974" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
......@@ -899,7 +912,7 @@
</properties>
</breakpoint>
</default-breakpoints>
<option name="time" value="41" />
<option name="time" value="43" />
</breakpoint-manager>
<watches-manager>
<configuration name="PythonConfigurationType">
......@@ -908,20 +921,6 @@
</watches-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.34273624">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://E:/User Software/WinPython-64bit-2.7.9.3/python-2.7.9.amd64/Lib/site-packages/flask/app.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33333334">
<caret line="1460" column="0" selection-start-line="1460" selection-start-column="0" selection-end-line="1460" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/templates/master.tmpl">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -969,13 +968,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/build_images.sh">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/notebook/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
......@@ -1046,14 +1038,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.3076923">
<caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="22" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
</state>
</provider>
</entry>
......@@ -1061,7 +1045,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="1476" column="0" selection-start-line="1476" selection-start-column="0" selection-end-line="1476" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1077,7 +1060,7 @@
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..proxy">
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..containers">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
......@@ -1089,7 +1072,7 @@
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..containers">
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..clusters">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
......@@ -1101,7 +1084,7 @@
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..clusters">
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..applications">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
......@@ -1113,166 +1096,176 @@
</state>
</provider>
</entry>
<entry file="dbDummy://dbtable:/6d22a4bb/a32fd6de-3ffa-40c0-9ec8-8953a89c53e0/caaas..applications">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
<entry file="file://$PROJECT_DIR$/images/files/submit.sh">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
<provider editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</entry>
<entry file="file://$PROJECT_DIR$/caaas/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.769231">
<caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/cluster_description.py">
<entry file="file://$PROJECT_DIR$/caaas/templates/inspect.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="30" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="30" />
<folding />
<state vertical-scroll-proportion="-11.769231">
<caret line="18" column="14" selection-start-line="18" selection-start-column="14" selection-end-line="18" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/files/submit.sh">
<entry file="file://$PROJECT_DIR$/caaas/templates/logs.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<state vertical-scroll-proportion="-2.6153846">
<caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/apache-proxy.py">
<entry file="file://$PROJECT_DIR$/caaas/templates/terminate.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding>
<element signature="e#0#27#0" expanded="false" />
</folding>
<state vertical-scroll-proportion="-0.0">
<caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.py">
<entry file="file://$PROJECT_DIR$/caaas/templates/status.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state vertical-scroll-proportion="-8.5">
<caret line="13" column="43" selection-start-line="13" selection-start-column="43" selection-end-line="13" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/__init__.py">
<entry file="file://$PROJECT_DIR$/caaas/templates/apps.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
<state vertical-scroll-proportion="-7.1923075">
<caret line="11" column="90" selection-start-line="11" selection-start-column="90" selection-end-line="11" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas.ini.template">
<entry file="file://$PROJECT_DIR$/caaas/templates/home.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas.ini">
<entry file="file://$PROJECT_DIR$/caaas/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="17" column="14" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="14" />
<caret line="31" column="142" selection-start-line="31" selection-start-column="142" selection-end-line="31" selection-end-column="142" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/caaas/spark_app_execution.py">
<entry file="file://$PROJECT_DIR$/images/build_images.sh">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
<folding>
<element signature="e#0#27#0" expanded="false" />
</folding>
<caret line="2" column="15" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/utils/config.py">
<entry file="file://$PROJECT_DIR$/images/swarm_pull.sh">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>