stratos-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Pradeep Fernando <pradee...@gmail.com>
Subject Re: [3/4] git commit: commiting changes provided by Chanaka Jayasena, STRATOS-359
Date Thu, 16 Jan 2014 09:41:00 GMT
noted. but at times git signoff fails, but apply works alwasys


On Thu, Jan 16, 2014 at 3:08 PM, Nirmal Fernando <nirmal070125@gmail.com>wrote:

> Hi Pradeep,
>
> I think in this case, it's better to set the original author of the code
> as the Author before committing.
>
>
> On Thu, Jan 16, 2014 at 3:04 PM, <pradeepfn@apache.org> wrote:
>
>> commiting changes provided by Chanaka Jayasena, STRATOS-359
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f3a94af9
>> Tree:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f3a94af9
>> Diff:
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f3a94af9
>>
>> Branch: refs/heads/master
>> Commit: f3a94af9cf408a3929f28446f15ab5d75e0923a3
>> Parents: 47f406d
>> Author: Pradeep Fernando <pradeepfn@gmail.com>
>> Authored: Thu Jan 16 15:03:39 2014 +0530
>> Committer: Pradeep Fernando <pradeepfn@gmail.com>
>> Committed: Thu Jan 16 15:03:39 2014 +0530
>>
>> ----------------------------------------------------------------------
>>  .../console/configure_stratos_wizard.jag        |   28 +
>>  .../console/console.ipr                         |   59 +
>>  .../console/console.iws                         |  719 ++++++
>>  .../console/data/config_status.json             |    2 +-
>>  .../console/data/tenants.json                   |   19 +
>>  .../console/tenant_management.jag               |   11 +
>>  .../console/tenant_new.jag                      |   11 +
>>  .../partials/configure_stratos_wizard.hbs       |   87 +
>>  .../console/themes/theme1/partials/header.hbs   |  212 +-
>>  .../themes/theme1/partials/mycartridges.hbs     |   30 +
>>  .../theme1/partials/tenant_management.hbs       |   92 +
>>  .../themes/theme1/partials/tenant_new.hbs       |   67 +
>>  .../renderers/configure_stratos_wizard.js       |   75 +
>>  .../console/themes/theme1/renderers/index.js    |   66 +-
>>  .../theme1/renderers/tenant_management.js       |   42 +
>>  .../themes/theme1/renderers/tenant_new.js       |   42 +
>>  .../console/themes/theme1/theme.js              |   37 +-
>>  .../console/themes/theme1/ui/css/bootstrap.css  | 2337 ++++++++++--------
>>  .../console/themes/theme1/ui/css/main.css       |  116 +-
>>  .../themes/theme1/ui/js/tenant_management.js    |   30 +
>>  .../console/themes/theme1/ui/js/wizard.js       |   18 +
>>  21 files changed, 3007 insertions(+), 1093 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> new file mode 100644
>> index 0000000..a4e7730
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag
>> @@ -0,0 +1,28 @@
>> +<%
>> +var caramel = require('caramel');
>> +var step = request.getParameter('step');
>> +if(step == null){
>> +    step = 1;
>> +}
>> +
>> +var step_data = {};
>> +
>> +var wizard = {
>> +        "step":step
>> +}
>> +if(wizard.step == 1){
>> +    step_data = require('data/partition_deployments.json');
>> +}else if(wizard.step == 2){
>> +    step_data = require('data/policy_deployments.json');
>> +}else if(wizard.step == 3){
>> +    step_data = require('data/lbs.json');
>> +}else if(wizard.step == 4){
>> +    step_data = require('data/cartridge_deployments.json');
>> +}else if(wizard.step == 5){
>> +    step_data = require('data/mt_service_deployments.json');
>> +}
>> +caramel.render({
>> +    step_data:step_data,
>> +    wizard:wizard
>> +});
>> +%>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.ipr
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/console.ipr
>> b/components/org.apache.stratos.manager.console/console/console.ipr
>> new file mode 100644
>> index 0000000..e157c0c
>> --- /dev/null
>> +++ b/components/org.apache.stratos.manager.console/console/console.ipr
>> @@ -0,0 +1,59 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project version="4">
>> +  <component name="CompilerConfiguration">
>> +    <option name="DEFAULT_COMPILER" value="Javac" />
>> +    <resourceExtensions />
>> +    <wildcardResourcePatterns>
>> +      <entry name="?*.properties" />
>> +      <entry name="?*.xml" />
>> +      <entry name="?*.gif" />
>> +      <entry name="?*.png" />
>> +      <entry name="?*.jpeg" />
>> +      <entry name="?*.jpg" />
>> +      <entry name="?*.html" />
>> +      <entry name="?*.dtd" />
>> +      <entry name="?*.tld" />
>> +      <entry name="?*.ftl" />
>> +    </wildcardResourcePatterns>
>> +    <annotationProcessing>
>> +      <profile default="true" name="Default" enabled="false">
>> +        <processorPath useClasspath="true" />
>> +      </profile>
>> +    </annotationProcessing>
>> +  </component>
>> +  <component name="CopyrightManager" default="">
>> +    <module2copyright />
>> +  </component>
>> +  <component name="DependencyValidationManager">
>> +    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
>> +  </component>
>> +  <component name="Encoding" useUTFGuessing="true"
>> native2AsciiForPropertiesFiles="false" />
>> +  <component name="ProjectModuleManager">
>> +    <modules>
>> +      <module fileurl="file://$PROJECT_DIR$/console.iml"
>> filepath="$PROJECT_DIR$/console.iml" />
>> +    </modules>
>> +  </component>
>> +  <component name="ProjectRootManager" version="2"
>> languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
>> +    <output url="file://$PROJECT_DIR$/out" />
>> +  </component>
>> +  <component name="VcsDirectoryMappings">
>> +    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
>> +  </component>
>> +  <component name="masterDetails">
>> +    <states>
>> +      <state key="ProjectJDKs.UI">
>> +        <settings>
>> +          <last-edited>1.6</last-edited>
>> +          <splitter-proportions>
>> +            <option name="proportions">
>> +              <list>
>> +                <option value="0.2" />
>> +              </list>
>> +            </option>
>> +          </splitter-proportions>
>> +        </settings>
>> +      </state>
>> +    </states>
>> +  </component>
>> +</project>
>> +
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/console.iws
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/console.iws
>> b/components/org.apache.stratos.manager.console/console/console.iws
>> new file mode 100644
>> index 0000000..d75ecf7
>> --- /dev/null
>> +++ b/components/org.apache.stratos.manager.console/console/console.iws
>> @@ -0,0 +1,719 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project version="4">
>> +  <component name="ChangeListManager">
>> +    <list default="true" id="2a216222-994f-4b4b-8241-afb5024e6741"
>> name="Default" comment="" />
>> +    <ignored path="console.iws" />
>> +    <ignored path=".idea/workspace.xml" />
>> +    <option name="TRACKING_ENABLED" value="true" />
>> +    <option name="SHOW_DIALOG" value="false" />
>> +    <option name="HIGHLIGHT_CONFLICTS" value="true" />
>> +    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
>> +    <option name="LAST_RESOLUTION" value="IGNORE" />
>> +  </component>
>> +  <component name="ChangesViewManager" flattened_view="true"
>> show_ignored="false" />
>> +  <component name="CreatePatchCommitExecutor">
>> +    <option name="PATCH_PATH" value="" />
>> +  </component>
>> +  <component name="DaemonCodeAnalyzer">
>> +    <disable_hints />
>> +  </component>
>> +  <component name="DebuggerManager">
>> +    <breakpoint_any default_suspend_policy="SuspendAll"
>> default_condition_enabled="true">
>> +      <breakpoint>
>> +        <option name="NOTIFY_CAUGHT" value="true" />
>> +        <option name="NOTIFY_UNCAUGHT" value="true" />
>> +        <option name="ENABLED" value="false" />
>> +        <option name="LOG_ENABLED" value="false" />
>> +        <option name="LOG_EXPRESSION_ENABLED" value="false" />
>> +        <option name="REMOVE_AFTER_HIT" value="false" />
>> +        <option name="SUSPEND_POLICY" value="SuspendAll" />
>> +        <option name="SUSPEND" value="true" />
>> +        <option name="COUNT_FILTER_ENABLED" value="false" />
>> +        <option name="COUNT_FILTER" value="0" />
>> +        <option name="CONDITION_ENABLED" value="true" />
>> +        <option name="CLASS_FILTERS_ENABLED" value="false" />
>> +        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
>> +        <option name="CONDITION" value="" />
>> +        <option name="LOG_MESSAGE" value="" />
>> +      </breakpoint>
>> +      <breakpoint>
>> +        <option name="NOTIFY_CAUGHT" value="true" />
>> +        <option name="NOTIFY_UNCAUGHT" value="true" />
>> +        <option name="ENABLED" value="false" />
>> +        <option name="LOG_ENABLED" value="false" />
>> +        <option name="LOG_EXPRESSION_ENABLED" value="false" />
>> +        <option name="REMOVE_AFTER_HIT" value="false" />
>> +        <option name="SUSPEND_POLICY" value="SuspendAll" />
>> +        <option name="SUSPEND" value="true" />
>> +        <option name="COUNT_FILTER_ENABLED" value="false" />
>> +        <option name="COUNT_FILTER" value="0" />
>> +        <option name="CONDITION_ENABLED" value="true" />
>> +        <option name="CLASS_FILTERS_ENABLED" value="false" />
>> +        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
>> +        <option name="CONDITION" value="" />
>> +        <option name="LOG_MESSAGE" value="" />
>> +      </breakpoint>
>> +    </breakpoint_any>
>> +    <ui_properties default_suspend_policy="SuspendAll"
>> default_condition_enabled="true" />
>> +    <breakpoint_rules />
>> +    <ui_properties />
>> +  </component>
>> +  <component name="ExecutionTargetManager"
>> SELECTED_TARGET="default_target" />
>> +  <component name="FavoritesManager">
>> +    <favorites_list name="console" />
>> +  </component>
>> +  <component name="FileEditorManager">
>> +    <leaf>
>> +      <file leaf-file-name="utility.jag" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/util/utility.jag">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="96" column="50" selection-start="2566"
>> selection-end="2595" vertical-scroll-proportion="-18.208334"
>> vertical-offset="1003" max-vertical-offset="2385">
>> +              <folding />
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="acl.jag" pinned="false" current="true"
>> current-in-tab="true">
>> +        <entry file="file://$PROJECT_DIR$/util/acl.jag">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="74" column="86" selection-start="2685"
>> selection-end="2714" vertical-scroll-proportion="0.686907"
>> vertical-offset="748" max-vertical-offset="1275">
>> +              <folding />
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="security.manager.js" pinned="false"
>> current="false" current-in-tab="false">
>> +        <entry
>> file="file://$PROJECT_DIR$/modules/security/security.manager.js">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="0" column="0" selection-start="0"
>> selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="634"
>> max-vertical-offset="1185">
>> +              <folding>
>> +                <element signature="n#!!doc" expanded="true" />
>> +              </folding>
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="acs.jag" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="41" column="103" selection-start="2059"
>> selection-end="2059" vertical-scroll-proportion="-14.375"
>> vertical-offset="270" max-vertical-offset="1530">
>> +              <folding>
>> +                <marker date="1389674842353" expanded="true"
>> signature="16:4412" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="550:818" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="997:1105" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="1137:3910" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="1314:3804" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="1422:3793" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="1503:3779" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="2686:3761" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="3505:3738" placeholder="//..." />
>> +                <marker date="1389674842353" expanded="true"
>> signature="3810:3904" placeholder="{...}" />
>> +                <marker date="1389674842353" expanded="true"
>> signature="4011:4410" placeholder="{...}" />
>> +              </folding>
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="acl.json" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/config/acl.json">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="9" column="22" selection-start="0"
>> selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0"
>> max-vertical-offset="225">
>> +              <folding />
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="router.jag" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/controllers/router.jag">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="88" column="45" selection-start="2371"
>> selection-end="2371" vertical-scroll-proportion="-17.5"
>> vertical-offset="900" max-vertical-offset="1515">
>> +              <folding />
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="index.jag" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/index.jag">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="4" column="30" selection-start="170"
>> selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0"
>> max-vertical-offset="195">
>> +              <folding>
>> +                <marker date="1389333163237" expanded="true"
>> signature="169:210" placeholder="{...}" />
>> +              </folding>
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="jaggery.conf" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/jaggery.conf">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="13" column="1" selection-start="344"
>> selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="285">
>> +              <folding />
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="login.jag" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/controllers/login.jag">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="11" column="67" selection-start="555"
>> selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0"
>> max-vertical-offset="630">
>> +              <folding>
>> +                <marker date="1389516957973" expanded="true"
>> signature="14:1581" placeholder="{...}" />
>> +                <marker date="1389516957973" expanded="true"
>> signature="625:1579" placeholder="{...}" />
>> +              </folding>
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +      <file leaf-file-name="console.json" pinned="false" current="false"
>> current-in-tab="false">
>> +        <entry file="file://$PROJECT_DIR$/config/console.json">
>> +          <provider selected="true" editor-type-id="text-editor">
>> +            <state line="21" column="26" selection-start="529"
>> selection-end="529" vertical-scroll-proportion="-13.125"
>> vertical-offset="0" max-vertical-offset="585">
>> +              <folding>
>> +                <marker date="1389783850689" expanded="true"
>> signature="0:957" placeholder="{...}" />
>> +                <marker date="1389783850689" expanded="true"
>> signature="499:528" placeholder="{&quot;MGT&quot;: &quot;/mgt&quot;...}" />
>> +              </folding>
>> +            </state>
>> +          </provider>
>> +        </entry>
>> +      </file>
>> +    </leaf>
>> +  </component>
>> +  <component name="FindManager">
>> +    <FindUsagesManager>
>> +      <setting name="OPEN_NEW_TAB" value="false" />
>> +    </FindUsagesManager>
>> +  </component>
>> +  <component name="Git.Settings">
>> +    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
>> +  </component>
>> +  <component name="IdeDocumentHistory">
>> +    <option name="changedFiles">
>> +      <list>
>> +        <option value="$PROJECT_DIR$/cartridges.jag" />
>> +        <option
>> value="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" />
>> +        <option value="$PROJECT_DIR$/util/utility.jag" />
>> +        <option
>> value="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" />
>> +        <option value="$PROJECT_DIR$/README.md" />
>> +        <option value="$PROJECT_DIR$/controllers/login.jag" />
>> +        <option value="$PROJECT_DIR$/util/authUtils.jag" />
>> +        <option value="$PROJECT_DIR$/controllers/acs.jag" />
>> +        <option value="$PROJECT_DIR$/jaggery.conf" />
>> +        <option value="$PROJECT_DIR$/config/console.json" />
>> +        <option value="$PROJECT_DIR$/index.jag" />
>> +        <option value="$PROJECT_DIR$/config/acl.json" />
>> +        <option value="$PROJECT_DIR$/util/acl.jag" />
>> +        <option value="$PROJECT_DIR$/controllers/router.jag" />
>> +      </list>
>> +    </option>
>> +  </component>
>> +  <component name="ProjectFrameBounds">
>> +    <option name="y" value="24" />
>> +    <option name="width" value="1366" />
>> +    <option name="height" value="720" />
>> +  </component>
>> +  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
>> +    <OptionsSetting value="true" id="Add" />
>> +    <OptionsSetting value="true" id="Remove" />
>> +    <OptionsSetting value="true" id="Checkout" />
>> +    <OptionsSetting value="true" id="Update" />
>> +    <OptionsSetting value="true" id="Status" />
>> +    <OptionsSetting value="true" id="Edit" />
>> +    <ConfirmationsSetting value="0" id="Add" />
>> +    <ConfirmationsSetting value="0" id="Remove" />
>> +  </component>
>> +  <component name="ProjectReloadState">
>> +    <option name="STATE" value="0" />
>> +  </component>
>> +  <component name="ProjectView">
>> +    <navigator currentView="ProjectPane" proportions="" version="1"
>> splitterProportion="0.5">
>> +      <flattenPackages />
>> +      <showMembers />
>> +      <showModules />
>> +      <showLibraryContents />
>> +      <hideEmptyPackages />
>> +      <abbreviatePackageNames />
>> +      <autoscrollToSource />
>> +      <autoscrollFromSource />
>> +      <sortByType />
>> +    </navigator>
>> +    <panes>
>> +      <pane id="ProjectPane">
>> +        <subPane>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="util" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="themes" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="themes" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="theme1" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="themes" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="theme1" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="partials" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="modules" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="modules" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="security" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="controllers" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +          <PATH>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="console" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +            <PATH_ELEMENT>
>> +              <option name="myItemId" value="config" />
>> +              <option name="myItemType"
>> value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
>> +            </PATH_ELEMENT>
>> +          </PATH>
>> +        </subPane>
>> +      </pane>
>> +      <pane id="PackagesPane" />
>> +      <pane id="Scope" />
>> +    </panes>
>> +  </component>
>> +  <component name="PropertiesComponent">
>> +    <property name="GoToFile.includeJavaFiles" value="false" />
>> +    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
>> +    <property name="MemberChooser.sorted" value="false" />
>> +    <property name="MemberChooser.showClasses" value="true" />
>> +    <property name="GoToClass.includeLibraries" value="false" />
>> +    <property name="MemberChooser.copyJavadoc" value="false" />
>> +    <property name="LayoutCode.rearrangeEntriesHTML" value="false" />
>> +    <property name="LayoutCode.rearrangeEntriesPlain text" value="false"
>> />
>> +    <property name="LayoutCode.rearrangeEntriesJSON" value="false" />
>> +  </component>
>> +  <component name="RunManager">
>> +    <configuration default="true" type="Remote" factoryName="Remote">
>> +      <option name="USE_SOCKET_TRANSPORT" value="true" />
>> +      <option name="SERVER_MODE" value="false" />
>> +      <option name="SHMEM_ADDRESS" value="javadebug" />
>> +      <option name="HOST" value="localhost" />
>> +      <option name="PORT" value="5005" />
>> +      <method />
>> +    </configuration>
>> +    <configuration default="true" type="JavascriptDebugType"
>> factoryName="JavaScript Debug" singleton="true">
>> +      <method />
>> +    </configuration>
>> +    <configuration default="true" type="FlexUnitRunConfigurationType"
>> factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name=""
>> emulatorAdlOptions="" method_name="" output_log_level="null"
>> package_name="" scope="Class">
>> +      <option name="BCName" value="" />
>> +      <option name="launcherParameters">
>> +        <LauncherParameters>
>> +          <option name="browserFamily" value="FIREFOX" />
>> +          <option name="launcherType" value="OSDefault" />
>> +          <option name="newPlayerInstance" value="false" />
>> +          <option name="playerPath" value="/usr/bin/flashplayerdebugger"
>> />
>> +        </LauncherParameters>
>> +      </option>
>> +      <option name="moduleName" value="" />
>> +      <option name="trusted" value="true" />
>> +      <method />
>> +    </configuration>
>> +    <configuration default="true" type="Applet" factoryName="Applet">
>> +      <module name="" />
>> +      <option name="MAIN_CLASS_NAME" />
>> +      <option name="HTML_FILE_NAME" />
>> +      <option name="HTML_USED" value="false" />
>> +      <option name="WIDTH" value="400" />
>> +      <option name="HEIGHT" value="300" />
>> +      <option name="POLICY_FILE"
>> value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
>> +      <option name="VM_PARAMETERS" />
>> +      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
>> +      <option name="ALTERNATIVE_JRE_PATH" />
>> +      <method />
>> +    </configuration>
>> +    <configuration default="true" type="Application"
>> factoryName="Application">
>> +      <extension name="coverage" enabled="false" merge="false"
>> sample_coverage="true" runner="idea" />
>> +      <option name="MAIN_CLASS_NAME" />
>> +      <option name="VM_PARAMETERS" />
>> +      <option name="PROGRAM_PARAMETERS" />
>> +      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
>> +      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
>> +      <option name="ALTERNATIVE_JRE_PATH" />
>> +      <option name="ENABLE_SWING_INSPECTOR" value="false" />
>> +      <option name="ENV_VARIABLES" />
>> +      <option name="PASS_PARENT_ENVS" value="true" />
>> +      <module name="" />
>> +      <envs />
>> +      <method />
>> +    </configuration>
>> +    <configuration default="true" type="JUnit" factoryName="JUnit">
>> +      <extension name="coverage" enabled="false" merge="false"
>> sample_coverage="true" runner="idea" />
>> +      <module name="" />
>> +      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
>> +      <option name="ALTERNATIVE_JRE_PATH" />
>> +      <option name="PACKAGE_NAME" />
>> +      <option name="MAIN_CLASS_NAME" />
>> +      <option name="METHOD_NAME" />
>> +      <option name="TEST_OBJECT" value="class" />
>> +      <option name="VM_PARAMETERS" value="-ea" />
>> +      <option name="PARAMETERS" />
>> +      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
>> +      <option name="ENV_VARIABLES" />
>> +      <option name="PASS_PARENT_ENVS" value="true" />
>> +      <option name="TEST_SEARCH_SCOPE">
>> +        <value defaultName="moduleWithDependencies" />
>> +      </option>
>> +      <envs />
>> +      <patterns />
>> +      <method />
>> +    </configuration>
>> +    <configuration default="true" type="FlashRunConfigurationType"
>> factoryName="Flash App">
>> +      <option name="BCName" value="" />
>> +      <option name="IOSSimulatorSdkPath" value="" />
>> +      <option name="adlOptions" value="" />
>> +      <option name="airProgramParameters" value="" />
>> +      <option name="appDescriptorForEmulator" value="Android" />
>> +      <option name="debugTransport" value="USB" />
>> +      <option name="debuggerSdkRaw" value="BC SDK" />
>> +      <option name="emulator" value="NexusOne" />
>> +      <option name="emulatorAdlOptions" value="" />
>> +      <option name="fastPackaging" value="true" />
>> +      <option name="fullScreenHeight" value="0" />
>> +      <option name="fullScreenWidth" value="0" />
>> +      <option name="launchUrl" value="false" />
>> +      <option name="launcherParameters">
>> +        <LauncherParameters>
>> +          <option name="browserFamily" value="FIREFOX" />
>> +          <option name="launcherType" value="OSDefault" />
>> +          <option name="newPlayerInstance" value="false" />
>> +          <option name="playerPath" value="/usr/bin/flashplayerdebugger"
>> />
>> +        </LauncherParameters>
>> +      </option>
>> +      <option name="mobileRunTarget" value="Emulator" />
>> +      <option name="moduleName" value="" />
>> +      <option name="overriddenMainClass" value="" />
>> +      <option name="overriddenOutputFileName" value="" />
>> +      <option name="overrideMainClass" value="false" />
>> +      <option name="runTrusted" value="true" />
>> +      <option name="screenDpi" value="0" />
>> +      <option name="screenHeight" value="0" />
>> +      <option name="screenWidth" value="0" />
>> +      <option name="url" value="http://" />
>> +      <option name="usbDebugPort" value="7936" />
>> +      <method />
>> +    </configuration>
>> +    <list size="0" />
>> +    <configuration name="&lt;template&gt;" type="WebApp" default="true"
>> selected="false">
>> +      <Host>localhost</Host>
>> +      <Port>5050</Port>
>> +    </configuration>
>> +  </component>
>> +  <component name="ShelveChangesManager" show_recycled="false" />
>> +  <component name="SvnConfiguration" maxAnnotateRevisions="500"
>> myUseAcceleration="nothing" myAutoUpdateAfterCommit="false"
>> cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
>> +    <option name="USER" value="" />
>> +    <option name="PASSWORD" value="" />
>> +    <option name="mySSHConnectionTimeout" value="30000" />
>> +    <option name="mySSHReadTimeout" value="30000" />
>> +    <option name="LAST_MERGED_REVISION" />
>> +    <option name="MERGE_DRY_RUN" value="false" />
>> +    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
>> +    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
>> +    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
>> +    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
>> +    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
>> +    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
>> +    <option name="FORCE_UPDATE" value="false" />
>> +    <option name="IGNORE_EXTERNALS" value="false" />
>> +    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
>> +  </component>
>> +  <component name="ToolWindowManager">
>> +    <frame x="0" y="24" width="1366" height="720" extended-state="1" />
>> +    <editor active="true" />
>> +    <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="-1" side_tool="false"
>> content_ui="tabs" />
>> +      <window_info id="Palette" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" 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="-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" />
>> +      <window_info id="Debug" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.4" sideWeight="0.5" order="3" 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.33" sideWeight="0.5" order="-1" side_tool="true"
>> 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="-1" side_tool="true"
>> 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="-1" 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="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="Maven Projects" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="-1" side_tool="false"
>> 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="-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.24962178" sideWeight="0.5" order="0" side_tool="false"
>> content_ui="combo" />
>> +      <window_info id="Run" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="2" 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" />
>> +      <window_info id="Find" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.33" sideWeight="0.5" order="1" side_tool="false"
>> content_ui="tabs" />
>> +      <window_info id="Commander" active="false" anchor="right"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs"
>> />
>> +      <window_info id="Inspection" active="false" anchor="bottom"
>> auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
>> weight="0.4" sideWeight="0.5" order="5" 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" />
>> +    </layout>
>> +  </component>
>> +  <component name="UnknownFeatures">
>> +    <option featureType="com.intellij.fileTypeFactory"
>> implementationName="*.conf" />
>> +  </component>
>> +  <component name="Vcs.Log.UiProperties">
>> +    <option name="RECENTLY_FILTERED_USERS">
>> +      <collection />
>> +    </option>
>> +  </component>
>> +  <component name="VcsContentAnnotationSettings">
>> +    <option name="myLimit" value="2678400000" />
>> +  </component>
>> +  <component name="VcsManagerConfiguration">
>> +    <option name="myTodoPanelSettings">
>> +      <TodoPanelSettings />
>> +    </option>
>> +  </component>
>> +  <component name="XDebuggerManager">
>> +    <breakpoint-manager />
>> +  </component>
>> +  <component name="editorHistoryManager">
>> +    <entry file="file://$PROJECT_DIR$/cartridges.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="7" column="2" selection-start="245"
>> selection-end="245" vertical-scroll-proportion="-4.375" vertical-offset="0"
>> max-vertical-offset="195">
>> +          <folding>
>> +            <marker date="1389332136797" expanded="true"
>> signature="-1:-1" placeholder="{...}" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry
>> file="file://$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="6" column="5" selection-start="248"
>> selection-end="248" vertical-scroll-proportion="-3.75" vertical-offset="0"
>> max-vertical-offset="195">
>> +          <folding>
>> +            <marker date="1389355612584" expanded="true"
>> signature="-1:-1" placeholder="{...}" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry
>> file="file://$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="22" column="43" selection-start="1032"
>> selection-end="1032" vertical-scroll-proportion="-11.875"
>> vertical-offset="45" max-vertical-offset="1470">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/README.md">
>> +      <provider
>> editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider">
>> +        <state />
>> +      </provider>
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="11" column="0" selection-start="292"
>> selection-end="292" vertical-scroll-proportion="-3.235294"
>> vertical-offset="0" max-vertical-offset="255">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/controllers/acs.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="41" column="103" selection-start="2059"
>> selection-end="2059" vertical-scroll-proportion="-14.375"
>> vertical-offset="270" max-vertical-offset="1530">
>> +          <folding>
>> +            <marker date="1389674842353" expanded="true"
>> signature="16:4412" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="550:818" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="997:1105" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="1137:3910" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="1314:3804" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="1422:3793" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="1503:3779" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="2686:3761" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="3505:3738" placeholder="//..." />
>> +            <marker date="1389674842353" expanded="true"
>> signature="3810:3904" placeholder="{...}" />
>> +            <marker date="1389674842353" expanded="true"
>> signature="4011:4410" placeholder="{...}" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/controllers/login.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="11" column="67" selection-start="555"
>> selection-end="555" vertical-scroll-proportion="-6.875" vertical-offset="0"
>> max-vertical-offset="630">
>> +          <folding>
>> +            <marker date="1389516957973" expanded="true"
>> signature="14:1581" placeholder="{...}" />
>> +            <marker date="1389516957973" expanded="true"
>> signature="625:1579" placeholder="{...}" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/jaggery.conf">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="13" column="1" selection-start="344"
>> selection-end="344" vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="285">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/config/console.json">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="21" column="26" selection-start="529"
>> selection-end="529" vertical-scroll-proportion="-13.125"
>> vertical-offset="0" max-vertical-offset="585">
>> +          <folding>
>> +            <marker date="1389783850689" expanded="true"
>> signature="0:957" placeholder="{...}" />
>> +            <marker date="1389783850689" expanded="true"
>> signature="499:528" placeholder="{&quot;MGT&quot;: &quot;/mgt&quot;...}" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/themes/theme1/theme.js">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="0" column="0" selection-start="0" selection-end="0"
>> vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="551">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/util/utility.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="96" column="50" selection-start="2566"
>> selection-end="2595" vertical-scroll-proportion="-18.208334"
>> vertical-offset="1003" max-vertical-offset="2385">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry
>> file="file://$PROJECT_DIR$/modules/security/security.manager.js">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="0" column="0" selection-start="0" selection-end="0"
>> vertical-scroll-proportion="0.0" vertical-offset="0"
>> max-vertical-offset="1185">
>> +          <folding>
>> +            <element signature="n#!!doc" expanded="true" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/index.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="4" column="30" selection-start="170"
>> selection-end="170" vertical-scroll-proportion="-2.5" vertical-offset="0"
>> max-vertical-offset="195">
>> +          <folding>
>> +            <marker date="1389333163237" expanded="true"
>> signature="169:210" placeholder="{...}" />
>> +          </folding>
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/controllers/router.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="88" column="45" selection-start="2371"
>> selection-end="2371" vertical-scroll-proportion="-17.5"
>> vertical-offset="900" max-vertical-offset="1515">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/config/acl.json">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="9" column="22" selection-start="0"
>> selection-end="253" vertical-scroll-proportion="-5.625" vertical-offset="0"
>> max-vertical-offset="225">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +    <entry file="file://$PROJECT_DIR$/util/acl.jag">
>> +      <provider selected="true" editor-type-id="text-editor">
>> +        <state line="74" column="86" selection-start="2685"
>> selection-end="2714" vertical-scroll-proportion="0.686907"
>> vertical-offset="748" max-vertical-offset="1275">
>> +          <folding />
>> +        </state>
>> +      </provider>
>> +    </entry>
>> +  </component>
>> +</project>
>> +
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/config_status.json
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/data/config_status.json
>> b/components/org.apache.stratos.manager.console/console/data/config_status.json
>> index 1c73caa..163aa03 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/data/config_status.json
>> +++
>> b/components/org.apache.stratos.manager.console/console/data/config_status.json
>> @@ -1,4 +1,4 @@
>>  {
>>      "first_use":false,
>> -    "not_complete":true
>> +    "not_complete":false
>>  }
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/data/tenants.json
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/data/tenants.json
>> b/components/org.apache.stratos.manager.console/console/data/tenants.json
>> new file mode 100644
>> index 0000000..11caa11
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/data/tenants.json
>> @@ -0,0 +1,19 @@
>> +[
>> +    {
>> +        "active":true,
>> +        "domain":"mysite.com",
>> +        "email":"admin@mysite.com",
>> +        "created":"16th Dec 13 - 23:55"
>> +    },{
>> +        "active":false,
>> +        "domain":"yoursite.com",
>> +        "email":"chanaka@yoursite.com",
>> +        "created":"15th Jan 14 - 13:45"
>> +    },{
>> +        "active":true,
>> +        "domain":"mysite2.com",
>> +        "email":"admin@mysite2.com",
>> +        "created":"16th Dec 13 - 23:55"
>> +    },
>> +
>> +]
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> b/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> new file mode 100644
>> index 0000000..cfaa805
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/tenant_management.jag
>> @@ -0,0 +1,11 @@
>> +<%
>> +var caramel = require('caramel');
>> +var tenants = require('data/tenants.json');
>> +var config_status = require('/data/config_status.json');
>> +var log = new Log();
>> +log.info(tenants);
>> +caramel.render({
>> +    tenants:tenants,
>> +    config_status:config_status
>> +});
>> +%>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> b/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> new file mode 100644
>> index 0000000..cfaa805
>> --- /dev/null
>> +++ b/components/org.apache.stratos.manager.console/console/tenant_new.jag
>> @@ -0,0 +1,11 @@
>> +<%
>> +var caramel = require('caramel');
>> +var tenants = require('data/tenants.json');
>> +var config_status = require('/data/config_status.json');
>> +var log = new Log();
>> +log.info(tenants);
>> +caramel.render({
>> +    tenants:tenants,
>> +    config_status:config_status
>> +});
>> +%>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> new file mode 100644
>> index 0000000..125d1a4
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
>> @@ -0,0 +1,87 @@
>> +<div class="container content-starter">
>> +    <div class="row">
>> +        <div class="col-lg-12">
>> +            <h1>Configure Stratos - {{title}}</h1>
>> +        </div>
>> +    </div>
>> +</div>
>> +<div class="container" id="addItemSection">
>> +        <div class="row">
>> +              <div class="col-md-12">
>> +                  <form role="form">
>> +                        <i class="icons-help icons-small-size"></i> Add
>> at least one {{title}}.
>> +                        <div style="clear: both"></div>
>> +                        <label for="policy" class="required"
>> style="margin-top:10px;">Policy Configuration</label>
>> +                        <div class="container">
>> +                            <div class="row">
>> +                                <div class="col-md-6
>> padding-remover-left">
>> +                                    <textarea class="form-control"
>> rows="11" id="policy"></textarea>
>> +                                    <button data-step="{{step}}"
>> type="button" class="btn btn-default" {{#unless wizard_on_2}}
>> disabled="disabled" {{/unless}} id="wizardBack" id="wizardBack"><<
>> Back</button>
>> +                                    <button data-step="{{step}}"
>> type="button" class="btn {{#unless
>> wizard_on_5}}btn-primary{{else}}btn-default{{/unless}}" id="wizardNext"
>> {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button>
>> +                                    <button data-step="{{step}}"
>> type="button" class="btn {{#if
>> wizard_on_5}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish"
>> {{#unless wizard_on_5}} disabled="disabled" {{/unless}}>Finish</button>
>> +                                </div>
>> +                                <div class="col-md-6">
>> +                                    <i class="icons-help"></i>
>> +                                    Example configuration:
>> +                                    <pre>
>> +                                    {
>> +                                    "partition":{
>> +                                          "id": "P1",
>> +                                          "provider": "ec2",
>> +                                          "property": [
>> +                                              {
>> +                                                "name": "region",
>> +                                                "value": "ap-southeast-1"
>> +                                              }
>> +                                          ],
>> +                                          "partitionMin": "1",
>> +                                          "partitionMax": "3"
>> +                                       }
>> +                                    }
>> +                                    </pre>
>> +                                </div>
>> +                            </div>
>> +
>> +                    </div>
>> +
>> +
>> +                  </form>
>> +
>> +              </div>
>> +        </div>
>> +    </div>
>> +
>> +<div class="container">
>> +
>> +    <div class="row">
>> +        <div class="col-md-12">
>> +
>> +
>> +            <div class="panel-group" id="accordion">
>> +
>> +
>> +                {{#each step_data}}
>> +                <div class="panel panel-default">
>> +                    <div class="panel-heading">
>> +                        <h4 class="panel-title">
>> +                            <a data-toggle="collapse"
>> data-parent="#accordion" href="#collapse{{key}}">
>> +                                {{name}}
>> +                            </a>
>> +                        </h4>
>> +                    </div>
>> +                    <div id="collapse{{key}}" class="panel-collapse
>> collapse">
>> +                        <div class="panel-body">
>> +                            <pre>{{policy}}</pre>
>> +                        </div>
>> +                    </div>
>> +                </div>
>> +                {{/each}}
>> +
>> +
>> +
>> +            </div>
>> +        </div>
>> +    </div>
>> +</div>
>> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
>> +<script src="{{url "/themes/theme1/ui/js/wizard.js"}}"></script>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> index 673070f..3ad7353 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
>> @@ -19,13 +19,21 @@
>>                   </div>
>>                   <div class="col-lg-9 custom-nav">
>>                      <ul class="pull-left">
>> -                        <li {{#if dashboard}} class="active" {{/if}}><a
>> href="{{url "/"}}"><i class="fa fa-dashboard"></i>
>> <span><br>Dashboard</span></a></li>
>> -                        <li {{#if partition_deployments}} class="active"
>> {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa
>> fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
>> -                        <li {{#if tenant_mgt}} class="active" {{/if}}><a
>> href="{{url "/"}}"><i class="fa fa-user"></i> <span><br>Tenant
>> Mgt</span></a></li>
>> -                        <li {{#if my_cartridges}} class="active"
>> {{/if}}><a href="{{url "/"}}"><i class="icons-cartridge"></i> <span><br>My
>> Cartridges</span></a></li>
>> +                        <!-- li {{#if dashboard}} class="active"
>> {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i>
>> <span><br>Dashboard</span></a></li -->
>> +                        <li {{#if my_cartridges}} class="active"
>> {{/if}}><a href="{{url "/"}}"><i class="fa fa-tasks"></i>  <span><br>My
>> Cartridges</span></a></li>
>> +                        <li {{#if configure_stratos}} class="active"
>> {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa
>> fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
>> +                        <li {{#if tenant_mgt}} class="active" {{/if}}><a
>> href="{{url "/tenant_management.jag"}}"><i class="fa fa-user"></i>
>> <span><br>Tenant Mgt</span></a></li>
>>                       </ul>
>>                       <ul class="pull-right">
>> -                         <li><a><i class="icon-user"></i><br> logout
>> section</a></li>
>> +                     <li class="dropdown">
>> +                             <a href="#" class="dropdown-toggle"
>> data-toggle="dropdown"><i class="fa fa-user"></i><br /> Username <b
>> class="caret"></b></a>
>> +                             <ul class="dropdown-menu">
>> +                                 <li><a><i class="fa
>> fa-file-text-o"></i> View Profile</a></li>
>> +                                <li>
>> +                                    <a><i class="fa fa-sign-out"></i>
>> logout</a>
>> +                                </li>
>> +                             </ul>
>> +                           </li>
>>                       </ul>
>>                   </div>
>>              </div>
>> @@ -35,55 +43,164 @@
>>      <div class="breadcrumb-strip">
>>          <div class="container">
>>              <div class="row">
>> -
>> -                <div class="col-lg-3">
>> -                    <a class="btn {{button.class_name}}" href="{{url
>> button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
>> -                </div>
>> -                <div class="col-lg-9 help-section">
>> -                    {{#if has_help}}
>> -                        <i class="icons-help"></i>
>> -                        <p>{{help}}</p>
>> +                {{#unless wizard_on}}
>> +                    <div class="col-lg-3">
>> +                        <a class="btn {{button.class_name}}" href="{{url
>> button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
>> +                    </div>
>> +                    {{#if has_action_buttons}}
>> +                    <div class="col-lg-3">
>> +                        <button class="btn btn-default"
>> onclick="manage_selected('activate')" type="button">Activate</button>
>> +                        <button class="btn btn-default"
>> onclick="manage_selected('deactivate')">Deactivate</button>
>> +                        <button class="btn btn-default"
>> onclick="manage_selected('delete')">Delete</button>
>> +                    </div>
>> +                    <div class="col-lg-6 help-section">
>> +                        {{#if has_help}}
>> +                            <i class="icons-help"></i>
>> +                            <p>{{help}}</p>
>> +                        {{/if}}
>> +                    </div>
>> +                    {{else}}
>> +                    <div class="col-lg-9 help-section">
>> +                        {{#if has_help}}
>> +                            <i class="icons-help"></i>
>> +                            <p>{{help}}</p>
>> +                        {{/if}}
>> +                        {{#unless has_help}}
>> +                            <ul class="sub-menu">
>> +                                <li {{#if partition_deployments}}
>> class="active" {{/if}}>
>> +                                    {{#if config_status.first_use}}
>> +                                        <span>Partition
>> Deployments</span>
>> +                                    {{else}}
>> +                                        <a href="{{url
>> "/partition_deployments.jag" }}">Partition Deployments</a>
>> +                                    {{/if}}
>> +                                </li>
>> +                                <li {{#if policy_deployments}}
>> class="active" {{/if}}>
>> +                                    {{#if config_status.first_use}}
>> +                                        <span>Policy Deployments</span>
>> +                                    {{else}}
>> +                                        <a href="{{url
>> "/policy_deployments.jag" }}">Policy Deployments</a>
>> +                                    {{/if}}
>> +                                </li>
>> +                                <li {{#if lbs}} class="active" {{/if}}>
>> +                                    {{#if config_status.first_use}}
>> +                                        <span>LBs</span>
>> +                                    {{else}}
>> +                                        <a href="{{url "/lbs.jag"
>> }}">LBs</a>
>> +                                    {{/if}}
>> +                                </li>
>> +                                <li {{#if cartridge_deployments}}
>> class="active" {{/if}}>
>> +                                    {{#if config_status.first_use}}
>> +                                        <span>Cartridge
>> Deployments</span>
>> +                                    {{else}}
>> +                                        <a href="{{url
>> "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
>> +                                    {{/if}}
>> +                                </li>
>> +                                <li {{#if mt_service_deployments}}
>> class="active" {{/if}}>
>> +                                    {{#if config_status.first_use}}
>> +                                        <span>Multi-Tenant Service
>> Deployments</span>
>> +                                    {{else}}
>> +                                        <a href="{{url
>> "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
>> +                                    {{/if}}
>> +                                </li>
>> +                            </ul>
>> +                        {{/unless}} <!-- hasHelp -->
>> +                    </div>
>>                      {{/if}}
>> -                    {{#unless has_help}}
>> -                    <ul class="sub-menu">
>> -                        <li {{#if partition_deployments}} class="active"
>> {{/if}}>
>> -                            {{#if config_status.first_use}}
>> -                                <span>Partition Deployments</span>
>> -                            {{else}}
>> -                                <a href="{{url
>> "/partition_deployments.jag" }}">Partition Deployments</a>
>> -                            {{/if}}
>> +                {{/unless}}  <!-- wizardon -->
>> +
>> +                {{#if wizard_on}}
>> +                <div class="col-lg-12">
>> +
>> +                    <ul class="sub-menu-wizard">
>> +                        <li class="active">
>> +                            <a href="{{url
>> "/configure_stratos_wizard.jag?step=1" }}">
>> +                                <div class="wizard-number">1</div>
>> +                                <div>Partition Deployments</div>
>> +                            </a>
>>                          </li>
>> -                        <li {{#if policy_deployments}} class="active"
>> {{/if}}>
>> -                            {{#if config_status.first_use}}
>> -                                <span>Policy Deployments</span>
>> -                            {{else}}
>> -                                <a href="{{url "/policy_deployments.jag"
>> }}">Policy Deployments</a>
>> -                            {{/if}}
>> +                        <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_2}}active-no-background{{/unless}}"></li>
>> +
>> +
>> +
>> +                        {{#if wizard_on_2}}
>> +                        <li class="active">
>> +                            <a href="{{url
>> "/configure_stratos_wizard.jag?step=2" }}">
>> +                                <div class="wizard-number">2</div>
>> +                                <div>Policy Deployments</div>
>> +                            </a>
>>                          </li>
>> -                        <li {{#if lbs}} class="active" {{/if}}>
>> -                            {{#if config_status.first_use}}
>> -                                <span>LBs</span>
>> -                            {{else}}
>> -                                <a href="{{url "/lbs.jag" }}">LBs</a>
>> -                            {{/if}}
>> +                        <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_3}}active-no-background{{/unless}}"></li>
>> +                        {{else}}
>> +                        <li>
>> +                            <div class="in-active-wizard-item">
>> +                                <div class="wizard-number">2</div>
>> +                                <div>Policy Deployments</div>
>> +                            </div>
>>                          </li>
>> -                        <li {{#if cartridge_deployments}} class="active"
>> {{/if}}>
>> -                            {{#if config_status.first_use}}
>> -                                <span>Cartridge Deployments</span>
>> -                            {{else}}
>> -                                <a href="{{url
>> "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
>> -                            {{/if}}
>> +                        <li class="sub-menu-wizard-pointer"></li>
>> +                        {{/if}}
>> +
>> +
>> +                        {{#if wizard_on_3}}
>> +                        <li class="active">
>> +                            <a href="{{url
>> "/configure_stratos_wizard.jag?step=3" }}">
>> +                                <div class="wizard-number">3</div>
>> +                                <div>LBs</div>
>> +                            </a>
>>                          </li>
>> -                        <li {{#if mt_service_deployments}}
>> class="active" {{/if}}>
>> -                            {{#if config_status.first_use}}
>> -                                <span>Multi-Tenant Service
>> Deployments</span>
>> -                            {{else}}
>> -                                <a href="{{url
>> "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
>> -                            {{/if}}
>> +                        <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_4}}active-no-background{{/unless}}"></li>
>> +                        {{else}}
>> +                        <li>
>> +                            <div class="in-active-wizard-item">
>> +                                <div class="wizard-number">3</div>
>> +                                <div>LBs</div>
>> +                            </div>
>>                          </li>
>> +                        <li class="sub-menu-wizard-pointer"></li>
>> +                        {{/if}}
>> +
>> +
>> +                        {{#if wizard_on_4}}
>> +                        <li class="active">
>> +                            <a href="{{url
>> "/configure_stratos_wizard.jag?step=4" }}">
>> +                                <div class="wizard-number">4</div>
>> +                                <div>Cartridge Deployments</div>
>> +                            </a>
>> +                        </li>
>> +                        <li class="sub-menu-wizard-pointer
>> active-pointer {{#unless wizard_on_5}}active-no-background{{/unless}}"></li>
>> +                        {{else}}
>> +                        <li>
>> +                            <div class="in-active-wizard-item">
>> +                                <div class="wizard-number">4</div>
>> +                                <div>Cartridge Deployments</div>
>> +                            </div>
>> +                        </li>
>> +                        <li class="sub-menu-wizard-pointer"></li>
>> +                        {{/if}}
>> +
>> +
>> +                        {{#if wizard_on_5}}
>> +                        <li class="active">
>> +                            <a href="{{url
>> "/configure_stratos_wizard.jag?step=5" }}">
>> +                                <div class="wizard-number">5</div>
>> +                                <div>Multi-Tenant Service
>> Deployments</div>
>> +                            </a>
>> +                        </li>
>> +                        <li class="sub-menu-wizard-pointer
>> active-pointer no-background"></li>
>> +                        {{else}}
>> +                        <li>
>> +                            <div class="in-active-wizard-item">
>> +                                <div class="wizard-number">5</div>
>> +                                <div>Multi-Tenant Service
>> Deployments</div>
>> +                            </div>
>> +                        </li>
>> +                        <li class="sub-menu-wizard-pointer
>> no-background"></li>
>> +                        {{/if}}
>> +
>>                      </ul>
>> -                    {{/unless}}
>> +
>>                  </div>
>> +                {{/if}}
>>              </div>
>>          </div>
>>      </div>
>> @@ -102,4 +219,5 @@
>>      {{/if}}
>>  </div>
>>
>> -{{/unless}}
>> \ No newline at end of file
>> +{{/unless}}
>> +
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> index 0964be9..2e5d831 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
>> @@ -5,3 +5,33 @@
>>          </div>
>>      </div>
>>  </div>
>> +{{#each cartridges}}
>> +<div class="container">
>> +    <div class="row">
>> +        <div class="col-lg-12">
>> +            <div class="h2-wrapper"><h2>{{kind}}</h2></div>
>> +        </div>
>> +    </div>
>> +    <div class="row">
>> +        {{#each cartridges}}
>> +        <div class="col-md-6">
>> +            <div class="box-container">
>> +                <div class="container">
>> +                    <div class="row">
>> +                        <div class="col-lg-3">
>> +                            <div class="box-left"><i
>> class="icons-{{cartridgeType}} big-pro-icons"></i></div>
>> +                            <div
>> class="big-pro-icons-title">{{version}}</div>
>> +                        </div>
>> +                        <div class="col-lg-9">
>> +                            <a href="{{url
>> "/subscribe_cartridge.jag"}}"><h3>{{displayName}} - {{version}}</h3></a>
>> +                            <div
>> class="cartridge-description">{{description}}</div>
>> +
>> +                        </div>
>> +                    </div>
>> +                </div>
>> +            </div>
>> +        </div>
>> +        {{/each}}
>> +    </div>
>> +</div>
>> +{{/each}}
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> new file mode 100644
>> index 0000000..ee1a41f
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
>> @@ -0,0 +1,92 @@
>> +<div class="container content-starter">
>> +    <div class="row">
>> +        <div class="col-lg-12">
>> +            <h1>{{title}}</h1>
>> +        </div>
>> +    </div>
>> +</div>
>> +<div class="container" style="display: none;" id="addItemSection">
>> +        <div class="row">
>> +              <div class="col-md-12">
>> +                  <h2>Deploy New Partition</h2>
>> +                  <form role="form">
>> +                        <label for="policy" class="required">Partition
>> Configuration</label>
>> +
>> +                        <div class="container">
>> +                            <div class="row">
>> +                                <div class="col-md-6
>> padding-remover-left">
>> +                                    <textarea class="form-control"
>> rows="11" id="policy"></textarea>
>> +                                    <button type="button" class="btn
>> btn-primary" id="deployPolicy">Deploy Partition</button>
>> +                                    <a>Cancel</a>
>> +                                </div>
>> +                                <div class="col-md-6">
>> +                                    <i class="icons-help"></i>
>> +                                    Example configuration:
>> +                                    <pre>
>> +                                    {
>> +                                    "partition":{
>> +                                          "id": "P1",
>> +                                          "provider": "ec2",
>> +                                          "property": [
>> +                                              {
>> +                                                "name": "region",
>> +                                                "value": "ap-southeast-1"
>> +                                              }
>> +                                          ],
>> +                                          "partitionMin": "1",
>> +                                          "partitionMax": "3"
>> +                                       }
>> +                                    }
>> +                                    </pre>
>> +                                </div>
>> +                            </div>
>> +
>> +                    </div>
>> +
>> +
>> +                  </form>
>> +
>> +              </div>
>> +        </div>
>> +    </div>
>> +
>> +<div class="container">
>> +
>> +    <div class="row">
>> +        <div class="col-md-12">
>> +            <div class="table-responsive">
>> +                <table class="table table-striped">
>> +                    <thead>
>> +                        <tr>
>> +                            <th> <input type="checkbox"
>> id="checkAll"/></th>
>> +                            <th>State:</th>
>> +                            <th>Domain:</th>
>> +                            <th>Email:</th>
>> +                            <th>
>> +                                Created:
>> +                                <div>DD Mon YY - HH:MM</div>
>> +                            </th>
>> +                        </tr>
>> +                    </thead>
>> +                    <tbody>
>> +                        {{#each tenants}}
>> +                        <tr>
>> +                            <td><input value="{{domain}}"
>> type="checkbox" {{#if active}}checked="checked"{{/if}}
>> class="js_domainCheck" /></td>
>> +                            <td><a title="Click to {{#if
>> active}}}deactivate{{else}}activate{{/if}}" onclick="manage_one('{{#if
>> active}}}deactivate{{else}}activate{{/if}}',this)"
>> data-domain="{{domain}}"><i class="fa {{#if active}}}fa-check-circle-o
>> green-check{{else}}fa-exclamation-circle orange-check{{/if}}"></i></a></td>
>> +                            <td><a>{{domain}}</a></td>
>> +                            <td>{{email}}</td>
>> +                            <td>{{created}}</td>
>> +                        </tr>
>> +                        {{/each}}
>> +                    </tbody>
>> +                </table>
>> +            </div>
>> +
>> +
>> +
>> +
>> +        </div>
>> +    </div>
>> +</div>
>> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
>> +<script src="{{url
>> "/themes/theme1/ui/js/tenant_management.js"}}"></script>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> new file mode 100644
>> index 0000000..aecd7a9
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
>> @@ -0,0 +1,67 @@
>> +<div class="container content-starter">
>> +    <div class="row">
>> +        <div class="col-lg-12">
>> +            <h1>{{title}}</h1>
>> +        </div>
>> +    </div>
>> +</div>
>> +<div class="container">
>> +<div class="row">
>> +    <div class="col-md-12">
>> +        <form method="post" action="{{url "/tenant_management.jag" }}">
>> +            <div class="h2-wrapper"><h2>Domain Information</h2></div>
>> +            <label class="required">Domain:</label>
>> +            <div class="form-inline"><input type="text" placeholder="
>> example.com"/> <button class="btn btn-default">Check
>> Availability</button></div>
>> +            <label><input type="checkbox"/> Validate the domain now
>> (Optional)</label>
>> +
>> +            <div class="h2-wrapper"><h2>Usage Plan Information</h2></div>
>> +            <label class="required">Select usage plan:</label>
>> +            <select>
>> +                <option>Enterprise</option>
>> +            </select>
>> +            <a>More Info</a>
>> +
>> +            <div class="h2-wrapper"><h2>Contact Details</h2></div>
>> +
>> +            <div class="col-md-3 padding-remover-left">
>> +                <label class="required">First Name:</label>
>> +                <input type="text"/>
>> +            </div>
>> +            <div class="col-md-3">
>> +                <label class="required">Last Name:</label>
>> +                <input type="text"/>
>> +            </div>
>> +            <div class="clearfix"></div>
>> +            <label class="required">Admin User Name:</label>
>> +            <input type="text"/>
>> +            <div class="clearfix"></div>
>> +
>> +            <div class="col-md-3 padding-remover-left">
>> +                <label class="required">Admin Password:</label>
>> +                <input type="text"/>
>> +            </div>
>> +            <div class="col-md-3">
>> +                <label class="required">Admin Password (Repeat):</label>
>> +                <input type="text"/>
>> +            </div>
>> +
>> +            <div class="clearfix"></div>
>> +            <label class="required">Email:</label>
>> +            <input type="text"/>
>> +
>> +            <label class="required">Are you human?</label>
>> +            <div style="padding-bottom:10px;"><i class="icons-help
>> icons-small-size"></i> Type the characters you see in the picture
>> below.</div>
>> +            <div class="clearfix"></div>
>> +            <input type="text"/>
>> +
>> +            <div class="h2-wrapper"><h2>Terms of Use</h2></div>
>> +            <div class="terms-of-use">Lorem ipsum dolor sit amet,
>> consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium,
>> at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque.
>> Praesent bibendum turpis vel tincidunt sollicitudin. Integer nibh est,
>> pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien.</div>
>> +            <label><input type="checkbox"/> I agree</label>
>> +
>> +            <button class="btn btn-primary" type="submit">Add new
>> Tenant</button>
>> +        </form>
>> +    </div>
>> +</div>
>> +</div>
>> +<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
>> +<script src="{{url
>> "/themes/theme1/ui/js/tenant_management.js"}}"></script>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> new file mode 100644
>> index 0000000..c59751a
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js
>> @@ -0,0 +1,75 @@
>> +var render = function (theme, data, meta, require) {
>> +    for(var i=0;i<data.step_data.length;i++){
>> +        data.step_data[i].key = data.step_data[i].name.replace(/ /g,'');
>> +    }
>> +    var title;
>> +    var wizard_on_val = [];
>> +    for(var i=0; i<5 ;i++){
>> +        if(i <= data.wizard.step-1){
>> +            wizard_on_val.push(true);
>> +        }else{
>> +            wizard_on_val.push(false);
>> +        }
>> +    }
>> +    var config_status = data.wizard;
>> +    if( config_status.step == 1 ){
>> +        title = 'Partition Deployment';
>> +    }else if( config_status.step == 2 ){
>> +        title = 'Policy Deployment';
>> +    }else if( config_status.step == 3 ){
>> +        title = 'Lb';
>> +    }else if( config_status.step == 4 ){
>> +        title = 'Cartridge Deployment';
>> +    }else if( config_status.step == 5 ){
>> +        title = 'Multi-Tenant Service Deployment';
>> +    }
>> +    theme('index', {
>> +        body: [
>> +            {
>> +                partial: 'configure_stratos_wizard',
>> +                context: {
>> +                    title:title,
>> +                    step_data:data.step_data,
>> +                    step:config_status.step,
>> +                    wizard_on_1:wizard_on_val[0],
>> +                    wizard_on_2:wizard_on_val[1],
>> +                    wizard_on_3:wizard_on_val[2],
>> +                    wizard_on_4:wizard_on_val[3],
>> +                    wizard_on_5:wizard_on_val[4]
>> +                }
>> +            }
>> +        ],
>> +        header: [
>> +            {
>> +                partial: 'header',
>> +                context:{
>> +                    title:'Configure Stratos',
>> +                    button:{
>> +                        link:'/',
>> +                        name:'Deploy New Cartridge',
>> +                        class_name:''
>> +                    },
>> +                    has_help:false,
>> +                    step_data:true,
>> +                    config_status:data.config_status,
>> +                    wizard_on:true,
>> +                    wizard_on_1:wizard_on_val[0],
>> +                    wizard_on_2:wizard_on_val[1],
>> +                    wizard_on_3:wizard_on_val[2],
>> +                    wizard_on_4:wizard_on_val[3],
>> +                    wizard_on_5:wizard_on_val[4],
>> +                    step:step,
>> +                    configure_stratos:true
>> +                }
>> +            }
>> +        ],
>> +        title:[
>> +            {
>> +                partial:'title',
>> +                context:{
>> +                    title:title
>> +                }
>> +            }
>> +        ]
>> +    });
>> +};
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> index 35c4375..37b30dc 100644
>> ---
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
>> @@ -1,34 +1,38 @@
>>  var render = function (theme, data, meta, require) {
>> -    // Re-create the data structure of the cartridges.
>> -    /* var mycartridges = [
>> -     {
>> -     kind: "cartridges",
>> -     cartridges: []}
>> -     ];
>> -     var cartridgesToPush;
>> -     for(var i=0;i<data.mycartridges.length;i++){
>> -     if(data.mycartridges[i].category == undefined){
>> -     cartridgesToPush = null;
>> -     for(var j=0;j<mycartridges.length;j++){
>> -     if(mycartridges[j].kind == "cartridges" ){
>> -     cartridgesToPush = mycartridges[j].cartridges;
>> -     }
>> -     }
>> -     cartridgesToPush.push(data.mycartridges[i]);
>> -     }else{
>> -     cartridgesToPush = null;
>> -     for (var j = 0; j < mycartridges.length; j++) {
>> -     if (mycartridges[j].kind == data.mycartridges[i].category) {
>> -     cartridgesToPush = mycartridges[j].cartridges;
>> -     }
>> -     }
>> -     if(cartridgesToPush == null){
>> -
>> mycartridges.push({kind:data.mycartridges[i].category,cartridges:[data.mycartridges[i]]})
>> -     }else{
>> -     cartridgesToPush.push(data.mycartridges[i]);
>> -     }
>> -     }
>> -     }*/
>> +      // Re-create the data structure of the cartridges.
>> +    var log = new Log();
>> +    var cartridges_old = data.mycartridges.cartridge;
>> +    var cartridges_new = [
>> +        {
>> +            kind: "Cartridges",
>> +            cartridges: []}
>> +    ];
>> +    var cartridgesToPush;
>> +    for (var i = 0; i < cartridges_old.length; i++) {
>> +        if (cartridges_old[i].category == undefined) {
>> +            cartridgesToPush = null;
>> +            for (var j = 0; j < cartridges_new.length; j++) {
>> +                if (cartridges_new[j].kind == "Cartridges") {
>> +                    cartridgesToPush = cartridges_new[j].cartridges;
>> +                }
>> +            }
>> +            cartridgesToPush.push(cartridges_old[i]);
>> +            log.info(cartridges_old[i]);
>> +        } else {
>> +            cartridgesToPush = null;
>> +            for (var j = 0; j < cartridges_new.length; j++) {
>> +                if (cartridges_new[j].kind ==
>> cartridges_old[i].category) {
>> +                    cartridgesToPush = cartridges_new[j].cartridges;
>> +                }
>> +            }
>> +            if (cartridgesToPush == null) {
>> +                cartridges_new.push({kind: cartridges_old[i].category,
>> cartridges: [cartridges_old[i]]})
>> +            } else {
>> +                cartridgesToPush.push(cartridges_old[i]);
>> +            }
>> +        }
>> +    }
>> +    log.info(cartridges_new);
>>
>>      theme('index', {
>>          body: [
>> @@ -36,7 +40,7 @@ var render = function (theme, data, meta, require) {
>>                  partial: 'mycartridges',
>>                  context: {
>>                      title: 'My Cartridges',
>> -                    mycartridges: {}
>> +                    mycartridges: cartridges_new
>>                  }
>>              }
>>          ],
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> new file mode 100644
>> index 0000000..8b676ab
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js
>> @@ -0,0 +1,42 @@
>> +var render = function (theme, data, meta, require) {
>> +
>> +    var create_btn_class = 'btn-important';
>> +    var title = 'Tenant Management';
>> +    theme('index', {
>> +        body: [
>> +            {
>> +                partial: 'tenant_management',
>> +                context: {
>> +                    title:title,
>> +                    tenants:data.tenants
>> +                }
>> +            }
>> +        ],
>> +        header: [
>> +            {
>> +                partial: 'header',
>> +                context:{
>> +                    title:'Tenant Management',
>> +                    button:{
>> +                        link:'/tenant_new.jag',
>> +                        name:'Add New Tenant',
>> +                        class_name:create_btn_class
>> +                    },
>> +                    has_help:true,
>> +                    help:"Tenants you create has permission to view and
>> subscribe to Cartridges. Tenants don't have permission to do Partition
>> deployment, Policy deployment, LB Creation, and MT service deployment.",
>> +                    tenant_mgt:true,
>> +                    config_status:data.config_status,
>> +                    has_action_buttons:true
>> +                }
>> +            }
>> +        ],
>> +        title:[
>> +            {
>> +                partial:'title',
>> +                context:{
>> +                    title:title
>> +                }
>> +            }
>> +        ]
>> +    });
>> +};
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f3a94af9/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> ----------------------------------------------------------------------
>> diff --git
>> a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> new file mode 100644
>> index 0000000..3ae7026
>> --- /dev/null
>> +++
>> b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_new.js
>> @@ -0,0 +1,42 @@
>> +var render = function (theme, data, meta, require) {
>> +
>> +    var create_btn_class = 'btn-default';
>> +    var title = 'Tenant Management - Add New Tenant';
>> +    theme('index', {
>> +        body: [
>> +            {
>> +                partial: 'tenant_new',
>> +                context: {
>> +                    title:title,
>> +                    tenants:data.tenants
>> +                }
>> +            }
>> +        ],
>> +        header: [
>> +            {
>> +                partial: 'header',
>> +                context:{
>> +                    title:title,
>> +                    button:{
>> +                        link:'/tenant_management.jag',
>> +                        name:'Tenant Management',
>> +                        class_name:create_btn_class,
>> +                        class_icon:'fa fa-arrow-left'
>> +                    },
>> +                    has_help:true,
>> +                    help:"Tenants you create has permission to view and
>> subscribe to Cartridges. Tenants don't have permission to do Partition
>> deployment, Policy deployment, LB Creation, and MT service deployment.",
>> +                    tenant_mgt:true,
>> +                    config_status:data.config_status
>> +                }
>> +            }
>> +        ],
>> +        title:[
>> +            {
>> +                partial:'title',
>> +                context:{
>> +                    title:title
>> +                }
>> +            }
>> +        ]
>> +    });
>> +};
>> \ No newline at end of file
>>
>>
>
>
> --
> Best Regards,
> Nirmal
>
> Nirmal Fernando.
> PPMC Member & Committer of Apache Stratos,
> Senior Software Engineer, WSO2 Inc.
>
> Blog: http://nirmalfdo.blogspot.com/
>



-- 
Pradeep Fernando.
http://pradeepfernando.blogspot.com/

Mime
View raw message