Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 c50535dbf -> eb9fc35a0
# 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/eb9fc35a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb9fc35a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb9fc35a Branch: refs/heads/ignite-843 Commit: eb9fc35a02157e8500ba32ec2f8ebf8b67b9a8a1 Parents: c50535d Author: Andrey <anovi...@gridgain.com> Authored: Thu Aug 20 15:57:09 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Aug 20 15:57:09 2015 +0700 ---------------------------------------------------------------------- modules/control-center-agent/README.txt | 18 +++++++++--------- .../assembly/release-control-center-agent.xml | 5 +++-- .../bin/ignite-control-center-agent.bat | 18 ------------------ .../bin/ignite-control-center-agent.sh | 19 ------------------- .../bin/ignite-web-agent.bat | 18 ++++++++++++++++++ .../control-center-agent/bin/ignite-web-agent.sh | 19 +++++++++++++++++++ .../control-center-agent/jdbc-drivers/README.txt | 2 +- modules/control-center-agent/pom.xml | 3 ++- .../apache/ignite/agent/AgentConfiguration.java | 10 +++++++++- .../control-center-agent/test-drive/README.txt | 4 ++++ .../src/main/js/controllers/common-module.js | 2 +- 11 files changed, 66 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/README.txt ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt index aaabdf0..6c5ac8e 100644 --- a/modules/control-center-agent/README.txt +++ b/modules/control-center-agent/README.txt @@ -1,13 +1,13 @@ -Ignite Control Center Agent +Ignite Web Agent ====================================== -Ignite Control Center Agent is a java standalone application that allow to connect Ignite Grid to Ignite Web Control Center. -Ignite Control Center Agent communicates with grid nodes via REST interface and connects to Ignite Web Control Center via web-socket. +Ignite Web Agent is a java standalone application that allow to connect Ignite Grid to Ignite Web Agent. +Ignite Web Agent communicates with grid nodes via REST interface and connects to Ignite Web Agent via web-socket. -Two main functions of Ignite Control Center Agent: - 1. Proxy between Ignite Web Control Center and Ignite Grid to execute SQL statements and collect metrics for monitoring. +Two main functions of Ignite Web Agent: + 1. Proxy between Ignite Web Agent and Ignite Grid to execute SQL statements and collect metrics for monitoring. You may need to specify URI for connect to Ignite REST server via "-n" option. - 2. Proxy between Ignite Web Control Center and user RDBMS to collect database metadata for later CacheTypeMetadata configuration. + 2. Proxy between Ignite Web Agent 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. Usage example: @@ -39,7 +39,7 @@ Options: Default: "./jdbc-drivers". -l, --login - User's login (email) on Ignite Web Control Center. + User's login (email) on Ignite Web Agent. -n, --nodeUri URI for connect to Ignite REST server, for example: "http://localhost:8080";. @@ -49,11 +49,11 @@ Options: User's password. -s, --serverUri - URI for connect to Ignite Web Control Center, for example: "wss://control-center.example.com:3001". + URI for connect to Ignite Web Agent, for example: "wss://control-center.example.com:3001". Default: "wss://localhost:3001". -Ignite Control Center Agent Build Instructions +Ignite Web Agent Build Instructions ============================================== If you want to build from sources run following command in Ignite project root folder: mvn clean package -pl :ignite-control-center-agent -am -P control-center -DskipTests=true http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/assembly/release-control-center-agent.xml ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/assembly/release-control-center-agent.xml b/modules/control-center-agent/assembly/release-control-center-agent.xml index 465190b..f16ccf5 100644 --- a/modules/control-center-agent/assembly/release-control-center-agent.xml +++ b/modules/control-center-agent/assembly/release-control-center-agent.xml @@ -20,7 +20,7 @@ <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> - <id>dependencies-control-center-agent</id> + <id>release-ignite-web-agent</id> <formats> <format>zip</format> @@ -32,6 +32,7 @@ <outputDirectory>/</outputDirectory> <includes> <include>jdbc-drivers/README*</include> + <include>test-drive/README*</include> <include>README*</include> <include>LICENSE*</include> <include>NOTICE*</include> @@ -58,7 +59,7 @@ <directory>${project.build.directory}</directory> <outputDirectory>/</outputDirectory> <includes> - <include>agent-${project.version}.jar</include> + <include>ignite-web-agent-${project.version}.jar</include> </includes> </fileSet> </fileSets> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/bin/ignite-control-center-agent.bat ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/bin/ignite-control-center-agent.bat b/modules/control-center-agent/bin/ignite-control-center-agent.bat deleted file mode 100755 index 74b8299..0000000 --- a/modules/control-center-agent/bin/ignite-control-center-agent.bat +++ /dev/null @@ -1,18 +0,0 @@ -:: -:: Licensed to the Apache Software Foundation (ASF) under one or more -:: contributor license agreements. See the NOTICE file distributed with -:: this work for additional information regarding copyright ownership. -:: The ASF licenses this file to You under the Apache License, Version 2.0 -:: (the "License"); you may not use this file except in compliance with -:: the License. You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -java -jar agent-${version}.jar %* http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/bin/ignite-control-center-agent.sh ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/bin/ignite-control-center-agent.sh b/modules/control-center-agent/bin/ignite-control-center-agent.sh deleted file mode 100755 index 1e03cff..0000000 --- a/modules/control-center-agent/bin/ignite-control-center-agent.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -java -jar agent-${version}.jar "$@" \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/bin/ignite-web-agent.bat ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/bin/ignite-web-agent.bat b/modules/control-center-agent/bin/ignite-web-agent.bat new file mode 100755 index 0000000..796ddf9 --- /dev/null +++ b/modules/control-center-agent/bin/ignite-web-agent.bat @@ -0,0 +1,18 @@ +:: +:: Licensed to the Apache Software Foundation (ASF) under one or more +:: contributor license agreements. See the NOTICE file distributed with +:: this work for additional information regarding copyright ownership. +:: The ASF licenses this file to You under the Apache License, Version 2.0 +:: (the "License"); you may not use this file except in compliance with +:: the License. You may obtain a copy of the License at +:: +:: http://www.apache.org/licenses/LICENSE-2.0 +:: +:: Unless required by applicable law or agreed to in writing, software +:: distributed under the License is distributed on an "AS IS" BASIS, +:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +:: See the License for the specific language governing permissions and +:: limitations under the License. +:: + +java -jar ignite-web-agent-${version}.jar %* http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/bin/ignite-web-agent.sh ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/bin/ignite-web-agent.sh b/modules/control-center-agent/bin/ignite-web-agent.sh new file mode 100755 index 0000000..b0158a3 --- /dev/null +++ b/modules/control-center-agent/bin/ignite-web-agent.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +java -jar ignite-web-agent-${version}.jar "$@" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/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 fa2923d..bd7c488 100644 --- a/modules/control-center-agent/jdbc-drivers/README.txt +++ b/modules/control-center-agent/jdbc-drivers/README.txt @@ -1,4 +1,4 @@ -Ignite Control Center Agent +Ignite Web Agent ====================================== If you are are planning to load cache type metadata from your existing databases http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/pom.xml ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/pom.xml b/modules/control-center-agent/pom.xml index c832a7f..f8283e5 100644 --- a/modules/control-center-agent/pom.xml +++ b/modules/control-center-agent/pom.xml @@ -70,7 +70,7 @@ </dependencies> <build> - <finalName>agent-${project.version}</finalName> + <finalName>ignite-web-agent-${project.version}</finalName> <plugins> <plugin> @@ -122,6 +122,7 @@ <descriptors> <descriptor>assembly/release-control-center-agent.xml</descriptor> </descriptors> + <finalName>ignite-web-agent</finalName> <outputDirectory>target</outputDirectory> <appendAssemblyId>false</appendAssemblyId> </configuration> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/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 318b1ac..959c10f 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 @@ -61,9 +61,17 @@ public class AgentConfiguration { private String driversFolder; /** */ - @Parameter(names = { "-h", "--help" }, description = "Print this help message") + @Parameter(names = { "-tm", "--testMetadata" }, description = "Start H2 database with sample tables in same process.") private boolean help; + /** */ + @Parameter(names = { "-ts", "--testSql" }, description = "Create cache and populate it with sample data for use in query.") + private boolean meta; + + /** */ + @Parameter(names = { "-h", "--help" }, description = "Print this help message") + private boolean sql; + /** * @return Login. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/modules/control-center-agent/test-drive/README.txt ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/test-drive/README.txt b/modules/control-center-agent/test-drive/README.txt new file mode 100644 index 0000000..723ee3a --- /dev/null +++ b/modules/control-center-agent/test-drive/README.txt @@ -0,0 +1,4 @@ +Ignite Web Agent +====================================== + +This is folder for test-drive files. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb9fc35a/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 8ddec82..c8e9964 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/agent.zip'); + lnk.setAttribute('href', '/agent/ignite-web-agent.zip'); lnk.style.display = 'none'; document.body.appendChild(lnk);
