Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 0a82e898d -> 9270f1393
# IGNITE-843 Agent rename. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9270f139 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9270f139 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9270f139 Branch: refs/heads/ignite-843 Commit: 9270f139375e06651e199d8e7e545e1717fc7a97 Parents: 0a82e89 Author: Andrey <anovi...@gridgain.com> Authored: Thu Aug 20 17:17:06 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Aug 20 17:17:06 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/README.txt | 12 +++++++++--- modules/control-center-agent/pom.xml | 2 +- .../org/apache/ignite/agent/AgentConfiguration.java | 16 +++++++++------- .../src/main/js/controllers/common-module.js | 2 +- .../src/main/js/controllers/metadata-controller.js | 1 + .../src/main/js/controllers/sql-controller.js | 3 ++- .../src/main/js/views/templates/agent-download.jade | 5 +++-- 7 files changed, 26 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-agent/README.txt ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt index 6c5ac8e..e9a57ff 100644 --- a/modules/control-center-agent/README.txt +++ b/modules/control-center-agent/README.txt @@ -34,24 +34,30 @@ Options: -c, --config Path to optional configuration file. - -drv, --driverFolder + -drv, --driver-folder Path to folder with JDBC drivers, for example "/home/user/drivers". Default: "./jdbc-drivers". -l, --login User's login (email) on Ignite Web Agent. - -n, --nodeUri + -n, --node-uri URI for connect to Ignite REST server, for example: "http://localhost:8080";. Default: "http://localhost:8080";. -p, --password User's password. - -s, --serverUri + -s, --server-uri URI for connect to Ignite Web Agent, for example: "wss://control-center.example.com:3001". Default: "wss://localhost:3001". + -tm, --test-metadata + Start H2 database with sample tables in same process. + + -ts, --test-sql + Create cache and populate it with sample data for use in query. + Ignite Web Agent Build Instructions ============================================== http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-agent/pom.xml ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/pom.xml b/modules/control-center-agent/pom.xml index f8283e5..2f24f22 100644 --- a/modules/control-center-agent/pom.xml +++ b/modules/control-center-agent/pom.xml @@ -122,7 +122,7 @@ <descriptors> <descriptor>assembly/release-control-center-agent.xml</descriptor> </descriptors> - <finalName>ignite-web-agent</finalName> + <finalName>ignite-web-agent-${project.version}</finalName> <outputDirectory>target</outputDirectory> <appendAssemblyId>false</appendAssemblyId> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java index 78f3117..911ebd1 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java @@ -42,13 +42,13 @@ public class AgentConfiguration { private String pwd; /** */ - @Parameter(names = {"-s", "--serverUri"}, description = "URI for connect to Ignite Web Control Center via " + + @Parameter(names = {"-s", "--server-uri"}, description = "URI for connect to Ignite Web Control Center via " + "web-socket protocol, for example: wss://control-center.my-company.com:3001") private String srvUri; /** */ - @Parameter(names = {"-n", "--nodeUri"}, description = "URI for connect to Ignite REST server, " + - "for example: http://localhost:8080";) + @Parameter(names = {"-n", "--node-uri"}, + description = "URI for connect to Ignite REST server, for example: http://localhost:8080";) private String nodeUri = "http://localhost:8080";; /** */ @@ -56,16 +56,18 @@ public class AgentConfiguration { private String cfgPath; /** */ - @Parameter(names = {"-drv", "--driverFolder"}, description = "Path to folder with JDBC drivers, for example " + - "/home/user/jdbc-drivers") + @Parameter(names = {"-drv", "--driver-folder"}, + description = "Path to folder with JDBC drivers, for example /home/user/jdbc-drivers") private String driversFolder; /** */ - @Parameter(names = { "-tm", "--testMetadata" }, description = "Start H2 database with sample tables in same process.") + @Parameter(names = { "-tm", "--test-metadata" }, + description = "Start H2 database with sample tables in same process.") private boolean meta; /** */ - @Parameter(names = { "-ts", "--testSql" }, description = "Create cache and populate it with sample data for use in query.") + @Parameter(names = { "-ts", "--test-sql" }, + description = "Create cache and populate it with sample data for use in query.") private boolean sql; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index c8e9964..f268743 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1182,7 +1182,7 @@ controlCenterModule.controller('agent-download', [ var lnk = document.createElement('a'); - lnk.setAttribute('href', '/agent/ignite-web-agent.zip'); + lnk.setAttribute('href', '/agent/ignite-web-agent-1.4.1-SNAPSHOT.zip'); lnk.style.display = 'none'; document.body.appendChild(lnk); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index a14e0e1..feff6b1 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -21,6 +21,7 @@ controlCenterModule.controller('metadataController', [ // Initialize the super class and extend it. angular.extend(this, $controller('agent-download', {$scope: $scope})); $scope.agentGoal = 'load metadata from database schema'; + $scope.agentTestDriveOption = '--test-metadata'; $scope.joinTip = $common.joinTip; $scope.getModel = $common.getModel; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-web/src/main/js/controllers/sql-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 5bc2d76..d02dec0 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -20,6 +20,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$controller', '$http // Initialize the super class and extend it. angular.extend(this, $controller('agent-download', {$scope: $scope})); $scope.agentGoal = 'execute sql statements'; + $scope.agentTestDriveOption = '--test-sql'; $scope.joinTip = $common.joinTip; @@ -39,7 +40,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$controller', '$http $scope.notebook_name = notebook.name; if (notebook.paragraphs) - notebook.paragraphs = [{}]; + notebook.paragraphs = [{name: 'Query'}]; }) .error(function (errMsg) { $common.showError(errMsg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9270f139/modules/control-center-web/src/main/js/views/templates/agent-download.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/templates/agent-download.jade b/modules/control-center-web/src/main/js/views/templates/agent-download.jade index 84d347f..9ff32e8 100644 --- a/modules/control-center-web/src/main/js/views/templates/agent-download.jade +++ b/modules/control-center-web/src/main/js/views/templates/agent-download.jade @@ -20,12 +20,13 @@ h4.modal-title Connection to Ignite Web Agent is not established .agent-download p Please download and run - a(href='#' ng-click='downloadAgent()') ignite-web-agent + a(href='javascript:void(0)' ng-click='downloadAgent()') ignite-web-agent | in order to {{::agentGoal}}. p For installation: ul li Download and unzip ignite-web-agent. - li For list of options, run ignite-web-agent.{sh|bat} âhelp. + li For list of options, run ignite-web-agent.{sh|bat} --help. + li To test drive, run ignite-web-agent.{sh|bat} {{::agentTestDriveOption}}. li Refer to README.txt for more information. .modal-footer button.btn.btn-primary(ng-click='downloadAgent()') Download zip
