You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/07/30 11:36:50 UTC
[06/28] incubator-ignite git commit: IGNITE-1121 Rename
'config.properties' to 'default.config.properties'
IGNITE-1121 Rename 'config.properties' to 'default.config.properties'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4be95ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4be95ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4be95ff
Branch: refs/heads/ignite-1155_1
Commit: a4be95ffa1cee69d892162d9246367e61a031715
Parents: b9d650a
Author: sevdokimov <se...@gridgain.com>
Authored: Tue Jul 28 18:48:48 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue Jul 28 18:48:48 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/agent/AgentLauncher.java | 2 +-
.../src/main/resources/config.properties | 11 -----------
.../src/main/resources/default.config.properties | 11 +++++++++++
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4be95ff/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
index 1ed5448..0e173d8 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java
@@ -51,7 +51,7 @@ public class AgentLauncher {
protected static AgentConfiguration getConfiguration(String[] args) throws IOException {
AgentConfiguration cfg = new AgentConfiguration();
- URL dftlCfgUrl = AgentLauncher.class.getResource("/config.properties");
+ URL dftlCfgUrl = AgentLauncher.class.getResource("/default.config.properties");
cfg.load(dftlCfgUrl);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4be95ff/modules/control-center-agent/src/main/resources/config.properties
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/resources/config.properties b/modules/control-center-agent/src/main/resources/config.properties
deleted file mode 100644
index e7064b7..0000000
--- a/modules/control-center-agent/src/main/resources/config.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ignite Control Center web-socket server URI.
-serverURI=wss://localhost:3001
-
-# Default Ignite node server URI.
-nodeURI=http://localhost:8080
-
-# User's login (email) on Ignite Control Center
-# login=ivan.ivanov@gmail.com
-
-# User's password
-# password=qwert
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4be95ff/modules/control-center-agent/src/main/resources/default.config.properties
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/resources/default.config.properties b/modules/control-center-agent/src/main/resources/default.config.properties
new file mode 100644
index 0000000..e7064b7
--- /dev/null
+++ b/modules/control-center-agent/src/main/resources/default.config.properties
@@ -0,0 +1,11 @@
+# Ignite Control Center web-socket server URI.
+serverURI=wss://localhost:3001
+
+# Default Ignite node server URI.
+nodeURI=http://localhost:8080
+
+# User's login (email) on Ignite Control Center
+# login=ivan.ivanov@gmail.com
+
+# User's password
+# password=qwert
\ No newline at end of file