fix build

apache · Oct 29, 2020 · a8baf43 · a8baf43
1 parent d54af94
commit a8baf43
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/...org/apache/geode/management/internal/configuration/ClusterConfigStartMemberDUnitTest.java b/...org/apache/geode/management/internal/configuration/ClusterConfigStartMemberDUnitTest.java
@@ -15,7 +15,6 @@
  */
 package org.apache.geode.management.internal.configuration;
 
-import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
 import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
 import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
 import static org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
@@ -93,7 +92,6 @@ private MemberVM startLocatorWithLoadCCFromDir() throws Exception {
     Properties properties = new Properties();
     properties.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
     properties.setProperty(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, "true");
-    properties.setProperty(CLUSTER_CONFIGURATION_DIR, locatorDir.getCanonicalPath());
 
     MemberVM locator = lsRule.startLocatorVM(0, properties);
 

diff --git a/...integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java b/...integrationTest/java/org/apache/geode/distributed/LocatorLauncherIntegrationTestCase.java
@@ -15,7 +15,6 @@
 package org.apache.geode.distributed;
 
 import static org.apache.geode.distributed.AbstractLauncher.Status.STOPPED;
-import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
 import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.apache.geode.distributed.internal.InternalConfigurationPersistenceService.CLUSTER_CONFIG_DISK_DIR_PREFIX;
@@ -120,7 +119,6 @@ protected Builder newBuilder() {
     return new Builder()
         .setMemberName(getUniqueName())
         .setWorkingDirectory(getWorkingDirectoryPath())
-        .set(CLUSTER_CONFIGURATION_DIR, getClusterConfigDirectoryPath())
         .set(DISABLE_AUTO_RECONNECT, "true");
   }
 

diff --git a/...ache/geode/management/internal/cli/commands/DestroySecondJndiBindingCommandDUnitTest.java b/...ache/geode/management/internal/cli/commands/DestroySecondJndiBindingCommandDUnitTest.java
@@ -17,18 +17,14 @@
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-import java.util.Properties;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
 import org.apache.geode.internal.jndi.JNDIInvoker;
 import org.apache.geode.management.internal.configuration.domain.Configuration;
@@ -50,16 +46,9 @@ public class DestroySecondJndiBindingCommandDUnitTest {
   @Rule
   public GfshCommandRule gfsh = new GfshCommandRule();
 
-  @Rule
-  public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
   @Before
   public void before() throws Exception {
-    String clusterConfigDir = temporaryFolder.getRoot().getAbsolutePath();
-    Properties properties = new Properties();
-    properties.setProperty(ConfigurationProperties.CLUSTER_CONFIGURATION_DIR, clusterConfigDir);
-
-    locator = cluster.startLocatorVM(0, properties);
+    locator = cluster.startLocatorVM(0);
     server1 = cluster.startServerVM(1, locator.getPort());
     server2 = cluster.startServerVM(2, locator.getPort());