ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Agent: renamed -drv to -d. Add defaults, minor readme.txt cleanup.
Date Wed, 23 Sep 2015 08:14:57 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 812db6816 -> d5b4b4ed5


IGNITE-843 Agent: renamed -drv to -d. Add defaults, minor readme.txt cleanup.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5b4b4ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5b4b4ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5b4b4ed

Branch: refs/heads/ignite-843
Commit: d5b4b4ed526b8e950fc86d5a3256d1b56d0a8d41
Parents: 812db68
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Wed Sep 23 15:14:58 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Sep 23 15:14:58 2015 +0700

----------------------------------------------------------------------
 modules/control-center-agent/README.txt         | 41 ++++++++------------
 .../jdbc-drivers/README.txt                     |  2 +-
 .../apache/ignite/agent/AgentConfiguration.java | 12 +++---
 3 files changed, 23 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5b4b4ed/modules/control-center-agent/README.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt
index cdf384d..2c90020 100644
--- a/modules/control-center-agent/README.txt
+++ b/modules/control-center-agent/README.txt
@@ -8,10 +8,10 @@ Two main functions of Ignite Web Agent:
     You may need to specify URI for connect to Ignite REST server via "-n" option.
 
  2. Proxy between Ignite Web Console and user RDBMS to collect database metadata for later
CacheTypeMetadata configuration.
-    You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via
"-drv" option.
+    You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via
"-d" option.
 
 Usage example:
-    ignite-control-center-agent.sh -t 1a2b3c4d5f -s wss://webconsole.example.com
+    ignite-control-center-agent.sh -t 1a2b3c4d5f -s wss://console.example.com
 
 Test drive of Ignite Web Agent:
     In order to simplify evaluation two test drive modes were implemented:
@@ -55,38 +55,29 @@ Configuration file:
 
     Example configuration file:
         token=1a2b3c4d5f
-        serverURI=wss://webconsole.example.com:3001
+        serverURI=wss://console.example.com:3001
         test-drive-sql=true
 
 Options:
     -h, --help
-       Print this help message.
-
+       Print this help message
     -c, --config
-       Path to optional configuration file.
-
-    -drv, --driver-folder
-       Path to folder with JDBC drivers, for example "/home/user/drivers".
-       Default: "./jdbc-drivers".
-
+       Path to configuration file
+    -d, --driver-folder
+       Path to folder with JDBC drivers, default value: ./jdbc-drivers
     -n, --node-uri
-       URI for connect to Ignite REST server, for example: "http://localhost:8080".
-       Default: "http://localhost:8080".
-
-    -t, --token
-       User's security token.
-
+       URI for connect to Ignite REST server, default value:
+       http://localhost:8080
     -s, --server-uri
-       URI for connect to Ignite Web Agent, for example: "wss://webconsole.example.com:3001".
-       Default: "wss://localhost:3001".
-
+       URI for connect to Ignite Web Console via web-socket protocol, default
+       value: wss://localhost:3001
     -tm, --test-drive-metadata
-       Start H2 database with sample tables in same process.
-       JDBC URL for connect to sample database: jdbc:h2:mem:test-drive-db
-
+       Start H2 database with sample tables in same process. JDBC URL for
+       connecting to sample database: jdbc:h2:mem:test-drive-db
     -ts, --test-drive-sql
-       Create cache and populate it with sample data for use in query.
-
+       Create cache and populate it with sample data for use in query
+    -t, --token
+       User's security token
 
 Ignite Web Agent Build Instructions
 ==============================================

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5b4b4ed/modules/control-center-agent/jdbc-drivers/README.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/jdbc-drivers/README.txt b/modules/control-center-agent/jdbc-drivers/README.txt
index bd7c488..cad43b7 100644
--- a/modules/control-center-agent/jdbc-drivers/README.txt
+++ b/modules/control-center-agent/jdbc-drivers/README.txt
@@ -6,5 +6,5 @@ you need to copy JDBC drivers in this folder.
 
 This is default folder for JDBC drivers.
 
-Also, you could specify custom folder using option: "-drv CUSTOM_PATH_TO_FOLDER_WITH_JDBC_DRIVERS".
+Also, you could specify custom folder using option: "-d CUSTOM_PATH_TO_FOLDER_WITH_JDBC_DRIVERS".
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d5b4b4ed/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 c3f9de2..7946515 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
@@ -46,12 +46,12 @@ public class AgentConfiguration {
 
     /** */
     @Parameter(names = {"-s", "--server-uri"}, description = "URI for connect to Ignite Web
Console via " +
-        "web-socket protocol, for example: wss://webconsole.my-company.com:3001")
+        "web-socket protocol, default value: wss://localhost:3001")
     private String srvUri;
 
     /** */
     @Parameter(names = {"-n", "--node-uri"},
-        description = "URI for connect to Ignite REST server, for example: http://localhost:8080")
+        description = "URI for connect to Ignite REST server, default value: http://localhost:8080")
     private String nodeUri;
 
     /** */
@@ -59,19 +59,19 @@ public class AgentConfiguration {
     private String cfgPath;
 
     /** */
-    @Parameter(names = {"-drv", "--driver-folder"},
-        description = "Path to folder with JDBC drivers, for example: /home/user/jdbc-drivers")
+    @Parameter(names = {"-d", "--driver-folder"},
+        description = "Path to folder with JDBC drivers, default value: ./jdbc-drivers")
     private String driversFolder;
 
     /** */
     @Parameter(names = { "-tm", "--test-drive-metadata" },
         description = "Start H2 database with sample tables in same process. " +
-            "JDBC URL for connect to sample database: jdbc:h2:mem:test-drive-db")
+            "JDBC URL for connecting to sample database: jdbc:h2:mem:test-drive-db")
     private Boolean meta;
 
     /** */
     @Parameter(names = { "-ts", "--test-drive-sql" },
-        description = "Create cache and populate it with sample data for use in query.")
+        description = "Create cache and populate it with sample data for use in query")
     private Boolean sql;
 
     /** */


Mime
View raw message