You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/07/28 17:50:49 UTC
[1/2] incubator-ignite git commit: IGNITE-1121 Rename
'config.properties' to 'default.config.properties'
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1121 b9d650a7b -> 666d44caa
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-1121
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
[2/2] incubator-ignite git commit: IGNITE-1121 Add copyrights.
Posted by se...@apache.org.
IGNITE-1121 Add copyrights.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/666d44ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/666d44ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/666d44ca
Branch: refs/heads/ignite-1121
Commit: 666d44caac5f8bfff36c25d8fb35144337b813f0
Parents: a4be95f
Author: sevdokimov <se...@gridgain.com>
Authored: Tue Jul 28 18:50:39 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Tue Jul 28 18:50:39 2015 +0300
----------------------------------------------------------------------
.../src/main/resources/default.config.properties | 15 +++++++++++++++
.../src/main/resources/logging.properties | 15 +++++++++++++++
2 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/666d44ca/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
index e7064b7..631e811 100644
--- a/modules/control-center-agent/src/main/resources/default.config.properties
+++ b/modules/control-center-agent/src/main/resources/default.config.properties
@@ -1,3 +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.
+
# Ignite Control Center web-socket server URI.
serverURI=wss://localhost:3001
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/666d44ca/modules/control-center-agent/src/main/resources/logging.properties
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/resources/logging.properties b/modules/control-center-agent/src/main/resources/logging.properties
index f63c832..ea397c1 100644
--- a/modules/control-center-agent/src/main/resources/logging.properties
+++ b/modules/control-center-agent/src/main/resources/logging.properties
@@ -1,3 +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.
+
handlers =java.util.logging.ConsoleHandler
.level = INFO
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter