You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2015/10/13 19:11:21 UTC
incubator-geode git commit: Cleanup code
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-189-new 534e200de -> f33d5b757
Cleanup code
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f33d5b75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f33d5b75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f33d5b75
Branch: refs/heads/feature/GEODE-189-new
Commit: f33d5b75746dd2b7922bba951063ea2620111a04
Parents: 534e200
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Oct 13 10:10:54 2015 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Oct 13 10:10:54 2015 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/internal/logging/LogService.java | 3 ---
.../gemfire/internal/logging/LogServiceIntegrationJUnitTest.java | 2 +-
.../gemstone/gemfire/internal/logging/LogServiceJUnitTest.java | 1 -
3 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f33d5b75/gemfire-core/src/main/java/com/gemstone/gemfire/internal/logging/LogService.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/logging/LogService.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/logging/LogService.java
index 9722588..a24343c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/logging/LogService.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/logging/LogService.java
@@ -141,9 +141,6 @@ public class LogService extends LogManager {
return new AppenderContext(name);
}
- private static final String GEMFIRE_CONFIG_LOCATION_BUILD = "gemfire-core" + File.separator + "build" + File.separator + "resources" + File.separator + "main" + File.separator + "log4j2.xml";
- private static final String GEMFIRE_CONFIG_LOCATION_JAR = "gemfire-core" + File.separator + "build" + File.separator + "resources" + File.separator + "main" + File.separator + "log4j2.xml";
-
public static boolean isUsingGemFireDefaultConfig() {
final Configuration config = ((org.apache.logging.log4j.core.Logger)
LogManager.getLogger(ROOT_LOGGER_NAME, GemFireParameterizedMessageFactory.INSTANCE)).getContext().getConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f33d5b75/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceIntegrationJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceIntegrationJUnitTest.java
index 04e45a4..fb54061 100755
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceIntegrationJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceIntegrationJUnitTest.java
@@ -198,7 +198,7 @@ public class LogServiceIntegrationJUnitTest {
}
@Test
- public void shouldUsCliConfigIfCliConfigIsSpecifiedViaClasspath() throws Exception {
+ public void shouldUseCliConfigIfCliConfigIsSpecifiedViaClasspath() throws Exception {
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, "classpath:"+CLI_CONFIG_FILE_NAME);
assertThat(LogService.getConfiguration().getConfigurationSource().toString()).contains(CLI_CONFIG_FILE_NAME);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f33d5b75/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceJUnitTest.java
index 5c224a9..c8c7eda 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogServiceJUnitTest.java
@@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.*;
import java.net.URL;
import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;