Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B95C18292 for ; Thu, 30 Jul 2015 09:37:02 +0000 (UTC) Received: (qmail 73351 invoked by uid 500); 30 Jul 2015 09:37:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 73320 invoked by uid 500); 30 Jul 2015 09:37:02 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 73311 invoked by uid 99); 30 Jul 2015 09:37:02 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jul 2015 09:37:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 8D9E01A8C4A for ; Thu, 30 Jul 2015 09:36:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id mXJh-VFoHzXv for ; Thu, 30 Jul 2015 09:36:46 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 724342C69F for ; Thu, 30 Jul 2015 09:36:46 +0000 (UTC) Received: (qmail 72872 invoked by uid 99); 30 Jul 2015 09:36:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Jul 2015 09:36:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E700E6B80; Thu, 30 Jul 2015 09:36:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 30 Jul 2015 09:36:50 -0000 Message-Id: In-Reply-To: <431d0233e2bf435fa31293bb3d879553@git.apache.org> References: <431d0233e2bf435fa31293bb3d879553@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Tue Jul 28 18:48:48 2015 +0300 Committer: sevdokimov 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