You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geode.apache.org by kjduling <gi...@git.apache.org> on 2016/09/30 20:37:37 UTC
[GitHub] incubator-geode pull request #250: Feature/geode 1948
GitHub user kjduling opened a pull request:
https://github.com/apache/incubator-geode/pull/250
Feature/geode 1948
If the provided properties file is not found, before failing, geode.properties will be tried. If geode.properties is not found, gemfire.properties will be tried.
precheckin successful
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/kjduling/incubator-geode feature/GEODE-1948
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-geode/pull/250.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #250
----
commit 717178370121af896bb2397eb12730d6bf5fb20b
Author: Kevin Duling <kd...@pivotal.io>
Date: 2016-09-30T16:52:35Z
GEODE-1948 - Branding: rename gemfire.properties file to geode.properties file
commit 7551bb709ca32468db1b7026d76fb1e83cd08d25
Author: Kevin Duling <kd...@pivotal.io>
Date: 2016-09-30T18:55:36Z
GEODE-1948 - Branding: rename gemfire.properties file to geode.properties file
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-geode issue #250: Feature/geode 1948
Posted by kjduling <gi...@git.apache.org>.
Github user kjduling commented on the issue:
https://github.com/apache/incubator-geode/pull/250
Restarting this task, closing this PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-geode pull request #250: Feature/geode 1948
Posted by jinmeiliao <gi...@git.apache.org>.
Github user jinmeiliao commented on a diff in the pull request:
https://github.com/apache/incubator-geode/pull/250#discussion_r81788504
--- Diff: geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java ---
@@ -156,7 +166,14 @@ protected static Properties loadGemFireProperties(final URL url) {
if (url != null) {
try {
- properties.load(new FileReader(new File(url.toURI())));
+ File propertyFile = new File(url.toURI());
--- End diff --
This url is resolved by using gemfire.properties as default already. See DistributedSystem.getPropertiesFileURL(). So if gemfirePropertiesFile is not defined as a system property, it will use "gemfire.properties" first. We need to add another constant as GEODE_PREFIX in distribution config if we can not totally replace the GEMFIRE_PREFIX.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-geode pull request #250: Feature/geode 1948
Posted by kjduling <gi...@git.apache.org>.
Github user kjduling commented on a diff in the pull request:
https://github.com/apache/incubator-geode/pull/250#discussion_r81654416
--- Diff: geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java ---
@@ -156,7 +166,14 @@ protected static Properties loadGemFireProperties(final URL url) {
if (url != null) {
try {
- properties.load(new FileReader(new File(url.toURI())));
+ File propertyFile = new File(url.toURI());
--- End diff --
Updated. testLoadGemFirePropertiesWithNonExistingURL is an existing test that exercises this code.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-geode pull request #250: Feature/geode 1948
Posted by kjduling <gi...@git.apache.org>.
Github user kjduling closed the pull request at:
https://github.com/apache/incubator-geode/pull/250
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-geode pull request #250: Feature/geode 1948
Posted by jinmeiliao <gi...@git.apache.org>.
Github user jinmeiliao commented on a diff in the pull request:
https://github.com/apache/incubator-geode/pull/250#discussion_r81416934
--- Diff: geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java ---
@@ -156,7 +166,14 @@ protected static Properties loadGemFireProperties(final URL url) {
if (url != null) {
try {
- properties.load(new FileReader(new File(url.toURI())));
+ File propertyFile = new File(url.toURI());
--- End diff --
I believe the url is still resolved using gemfire.properties. Not sure if this change is effective.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-geode pull request #250: Feature/geode 1948
Posted by jinmeiliao <gi...@git.apache.org>.
Github user jinmeiliao commented on a diff in the pull request:
https://github.com/apache/incubator-geode/pull/250#discussion_r81417136
--- Diff: geode-core/src/main/java/org/apache/geode/distributed/AbstractLauncher.java ---
@@ -156,7 +166,14 @@ protected static Properties loadGemFireProperties(final URL url) {
if (url != null) {
try {
- properties.load(new FileReader(new File(url.toURI())));
+ File propertyFile = new File(url.toURI());
--- End diff --
We need to have integration test for this change as well.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---