Updated Branches: refs/heads/master 312baf717 -> b654ee402
console inegration edits Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/2281b3ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2281b3ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2281b3ea Branch: refs/heads/master Commit: 2281b3eadcf59f8b731108d903d95738d485adb4 Parents: cdccf84 Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 17 10:13:45 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 17 10:13:45 2014 +0530 ---------------------------------------------------------------------- .../console/console.iws | 176 +++++++++++-------- .../console/controllers/addTenantSubmit.jag | 9 + .../controllers/partitionDefinitionSubmit.jag | 9 + .../controllers/policyDefinitionSubmit.jag | 9 + .../theme1/partials/partition_deployments.hbs | 6 +- .../theme1/partials/policy_deployments.hbs | 6 +- 6 files changed, 136 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2281b3ea/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 index 7b2fe3e..bf0f3bd 100644 --- a/components/org.apache.stratos.manager.console/console/console.iws +++ b/components/org.apache.stratos.manager.console/console/console.iws @@ -2,13 +2,12 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="2a216222-994f-4b4b-8241-afb5024e6741" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../../products/stratos-manager/modules/distribution/src/assembly/bin.xml" afterPath="$PROJECT_DIR$/../../../products/stratos-manager/modules/distribution/src/assembly/bin.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" afterPath="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../../products/stratos-manager/modules/distribution/target/apache-stratos-manager-4.0.0-SNAPSHOT/repository/deployment/server/jaggeryapps/console/controllers/cartridgeDefintionSubmit.jag" afterPath="$PROJECT_DIR$/../../../products/stratos-manager/modules/distribution/target/apache-stratos-manager-4.0.0-SNAPSHOT/repository/deployment/server/jaggeryapps/console/controllers/cartridgeDefintionSubmit.jag" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" afterPath="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../../../products/stratos-manager/modules/distribution/target/apache-stratos-manager-4.0.0-SNAPSHOT/repository/deployment/server/jaggeryapps/console/themes/theme1/partials/cartridge_deployments.hbs" afterPath="$PROJECT_DIR$/../../../products/stratos-manager/modules/distribution/target/apache-stratos-manager-4.0.0-SNAPSHOT/repository/deployment/server/jaggeryapps/console/themes/theme1/partials/cartridge_deployments.hbs" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/controllers/addTenantSubmit.jag" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/controllers/partitionDefinitionSubmit.jag" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/controllers/policyDefinitionSubmit.jag" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/console.iws" afterPath="$PROJECT_DIR$/console.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/util/utility.jag" afterPath="$PROJECT_DIR$/util/utility.jag" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/themes/theme1/partials/partition_deployments.hbs" afterPath="$PROJECT_DIR$/themes/theme1/partials/partition_deployments.hbs" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/themes/theme1/partials/policy_deployments.hbs" afterPath="$PROJECT_DIR$/themes/theme1/partials/policy_deployments.hbs" /> </list> <ignored path="console.iws" /> <ignored path=".idea/workspace.xml" /> @@ -72,10 +71,55 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="utility.jag" pinned="false" current="true" current-in-tab="true"> + <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="95" column="4" selection-start="2477" selection-end="2477" vertical-scroll-proportion="-1.8747628" vertical-offset="2413" max-vertical-offset="2940"> + <state line="95" column="4" selection-start="2477" selection-end="2477" vertical-scroll-proportion="41.166668" vertical-offset="2413" max-vertical-offset="2940"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="partitionDefinitionSubmit.jag" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/controllers/partitionDefinitionSubmit.jag"> + <provider selected="true" editor-type-id="text-editor"> + <state line="4" column="17" selection-start="142" selection-end="142" vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="210"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="partition_deployments.hbs" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/themes/theme1/partials/partition_deployments.hbs"> + <provider selected="true" editor-type-id="text-editor"> + <state line="18" column="73" selection-start="795" selection-end="822" vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="2010"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="policy_deployments.hbs" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/themes/theme1/partials/policy_deployments.hbs"> + <provider selected="true" editor-type-id="text-editor"> + <state line="18" column="56" selection-start="889" selection-end="889" vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="1425"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="policyDefinitionSubmit.jag" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/controllers/policyDefinitionSubmit.jag"> + <provider selected="true" editor-type-id="text-editor"> + <state line="8" column="23" selection-start="0" selection-end="358" vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="210"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="addTenantSubmit.jag" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/controllers/addTenantSubmit.jag"> + <provider selected="true" editor-type-id="text-editor"> + <state line="4" column="4" selection-start="119" selection-end="119" vertical-scroll-proportion="0.113851994" vertical-offset="0" max-vertical-offset="527"> <folding /> </state> </provider> @@ -95,7 +139,7 @@ <file leaf-file-name="cartridge_deployments.hbs" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="65" selection-start="403" selection-end="403" vertical-scroll-proportion="-6.25" vertical-offset="30" max-vertical-offset="1455"> + <state line="18" column="67" selection-start="727" selection-end="754" vertical-scroll-proportion="-4.375" vertical-offset="165" max-vertical-offset="1455"> <folding /> </state> </provider> @@ -104,7 +148,7 @@ <file leaf-file-name="cartridgeDefintionSubmit.jag" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag"> <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="7" selection-start="370" selection-end="370" vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="210"> + <state line="8" column="8" selection-start="0" selection-end="373" vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="210"> <folding /> </state> </provider> @@ -144,60 +188,6 @@ </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="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> - <marker date="1389861122086" expanded="true" signature="155:251" placeholder="{...}" /> - </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="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="{"MGT": "/mgt"...}" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -225,6 +215,11 @@ <option value="$PROJECT_DIR$/themes/theme1/partials/cartridge_deployments.hbs" /> <option value="$PROJECT_DIR$/util/utility.jag" /> <option value="$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag" /> + <option value="$PROJECT_DIR$/themes/theme1/partials/partition_deployments.hbs" /> + <option value="$PROJECT_DIR$/themes/theme1/partials/policy_deployments.hbs" /> + <option value="$PROJECT_DIR$/controllers/partitionDefinitionSubmit.jag" /> + <option value="$PROJECT_DIR$/controllers/policyDefinitionSubmit.jag" /> + <option value="$PROJECT_DIR$/controllers/addTenantSubmit.jag" /> </list> </option> </component> @@ -661,8 +656,8 @@ <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="{"MGT": "/mgt"...}" /> + <marker date="1389783850689" expanded="true" signature="-1:-1" placeholder="{...}" /> + <marker date="1389783850689" expanded="true" signature="-1:-1" placeholder="{"MGT": "/mgt"...}" /> </folding> </state> </provider> @@ -678,7 +673,7 @@ <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" /> + <element signature="n#!!doc" expanded="false" /> </folding> </state> </provider> @@ -687,7 +682,7 @@ <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="{...}" /> + <marker date="1389333163237" expanded="true" signature="-1:-1" placeholder="{...}" /> </folding> </state> </provider> @@ -703,7 +698,7 @@ <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> - <marker date="1389861122086" expanded="true" signature="155:251" placeholder="{...}" /> + <marker date="1389861122086" expanded="true" signature="-1:-1" placeholder="{...}" /> </folding> </state> </provider> @@ -749,23 +744,58 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/util/utility.jag"> + <provider selected="true" editor-type-id="text-editor"> + <state line="95" column="4" selection-start="2477" selection-end="2477" vertical-scroll-proportion="41.166668" vertical-offset="2413" max-vertical-offset="2940"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/controllers/cartridgeDefintionSubmit.jag"> <provider selected="true" editor-type-id="text-editor"> - <state line="7" column="7" selection-start="370" selection-end="370" vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="210"> + <state line="8" column="8" selection-start="0" selection-end="373" vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="210"> <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="12" column="65" selection-start="403" selection-end="403" vertical-scroll-proportion="-6.25" vertical-offset="30" max-vertical-offset="1455"> + <state line="18" column="67" selection-start="727" selection-end="754" vertical-scroll-proportion="-4.375" vertical-offset="165" max-vertical-offset="1455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/util/utility.jag"> + <entry file="file://$PROJECT_DIR$/themes/theme1/partials/partition_deployments.hbs"> + <provider selected="true" editor-type-id="text-editor"> + <state line="18" column="73" selection-start="795" selection-end="822" vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="2010"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/themes/theme1/partials/policy_deployments.hbs"> + <provider selected="true" editor-type-id="text-editor"> + <state line="18" column="56" selection-start="889" selection-end="889" vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="1425"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/controllers/partitionDefinitionSubmit.jag"> + <provider selected="true" editor-type-id="text-editor"> + <state line="4" column="17" selection-start="142" selection-end="142" vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="210"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/controllers/policyDefinitionSubmit.jag"> + <provider selected="true" editor-type-id="text-editor"> + <state line="8" column="23" selection-start="0" selection-end="358" vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="210"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/controllers/addTenantSubmit.jag"> <provider selected="true" editor-type-id="text-editor"> - <state line="95" column="4" selection-start="2477" selection-end="2477" vertical-scroll-proportion="-1.8747628" vertical-offset="2413" max-vertical-offset="2940"> + <state line="4" column="4" selection-start="119" selection-end="119" vertical-scroll-proportion="0.113851994" vertical-offset="0" max-vertical-offset="527"> <folding /> </state> </provider> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2281b3ea/components/org.apache.stratos.manager.console/console/controllers/addTenantSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/addTenantSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/addTenantSubmit.jag new file mode 100644 index 0000000..bf1ae1b --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/addTenantSubmit.jag @@ -0,0 +1,9 @@ +<% +(function(){ + var log = new Log("controller.addTenantSubmit"); + var utils = require('/util/utility.jag'); + var policyDefinition = request.getParameter("policy-definition").trim(); + utils.consoleAppUtil.deployCartridgeDefinition(policyDefinition); + response.sendRedirect(request.getContextPath() + '/policy_deployments.jag'); +}()); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2281b3ea/components/org.apache.stratos.manager.console/console/controllers/partitionDefinitionSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/partitionDefinitionSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/partitionDefinitionSubmit.jag new file mode 100644 index 0000000..e2998fc --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/partitionDefinitionSubmit.jag @@ -0,0 +1,9 @@ +<% +(function(){ + var log = new Log("controller.partitionDefinitionSubmit"); + var utils = require('/util/utility.jag'); + var partitionDefinition = request.getParameter("cartridge-definition").trim(); + utils.consoleAppUtil.deployCartridgeDefinition(partitionDefinition); + response.sendRedirect(request.getContextPath() + '/partition_deployments.jag'); +}()); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2281b3ea/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag new file mode 100644 index 0000000..fab6f4a --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag @@ -0,0 +1,9 @@ +<% +(function(){ + var log = new Log("controller.policyDefinitionSubmit"); + var utils = require('/util/utility.jag'); + var policyDefinition = request.getParameter("policy-definition").trim(); + utils.consoleAppUtil.deployCartridgeDefinition(policyDefinition); + response.sendRedirect(request.getContextPath() + '/policy_deployments.jag'); +}()); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2281b3ea/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs index 87930b7..fba37a3 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs @@ -10,14 +10,14 @@ <div class="row"> <div class="col-md-12"> <h2>Deploy New Partition</h2> - <form role="form"> + <form method="post" role="form" action="{{url "/controllers/partitionDefintionSubmit.jag"}}"> <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> + <textarea name="partition-definition" class="form-control" rows="11" id="policy"></textarea> + <button type="submit" class="btn btn-primary" id="deployPolicy">Deploy Partition</button> <a>Cancel</a> </div> <div class="col-md-6"> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/2281b3ea/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs index c7cfc42..4eac7a6 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs @@ -9,14 +9,14 @@ <div class="row"> <div class="col-md-12"> <h2>Deploy New Policy</h2> - <form role="form"> + <form method="post" role="form" action="{{url "/controllers/partitionDefintionSubmit.jag"}}"> <label for="policy" class="required">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 type="button" class="btn btn-primary" id="deployPolicy">Deploy Partition</button> + <textarea name="policy-definition" class="form-control" rows="11" id="policy"></textarea> + <button type="submit" class="btn btn-primary" id="deployPolicy">Deploy Partition</button> <a>Cancel</a> </div> <div class="col-md-6">
