Revert "GEODE-7436: Deploy jar using semantic versioning scheme (apac…

…he#4343)" (apache#4380) This reverts commit 0d4c191
leeqiang250 · Nov 27, 2019 · 6ad41d3 · 6ad41d3
1 parent 6bc6e59
commit 6ad41d3
Show file tree

Hide file tree

Showing 29 changed files with 580 additions and 1,512 deletions.
diff --git a/...ava/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java b/...ava/org/apache/geode/management/internal/cli/commands/DeployCommandRedeployDUnitTest.java
@@ -29,7 +29,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -217,8 +216,7 @@ private static void assertThatFunctionHasVersion(String functionId, String versi
 
   private static void assertThatCanLoad(String jarName, String className)
       throws ClassNotFoundException {
-    assertThat(ClassPathLoader.getLatest().getJarDeployer()
-        .getDeployedJar(FilenameUtils.getBaseName(jarName))).isNotNull();
+    assertThat(ClassPathLoader.getLatest().getJarDeployer().getDeployedJar(jarName)).isNotNull();
     assertThat(ClassPathLoader.getLatest().forName(className)).isNotNull();
   }
 

diff --git a/.../org/apache/geode/management/internal/cli/commands/DeploySemanticVersionJarDUnitTest.java b/.../org/apache/geode/management/internal/cli/commands/DeploySemanticVersionJarDUnitTest.java
diff --git a/...est/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java b/...est/java/org/apache/geode/management/internal/cli/commands/DeployWithGroupsDUnitTest.java
@@ -171,10 +171,8 @@ public void deployMultipleJarsToOneGroup() throws Exception {
         .hasRowSize(4)
         .hasAnyRow().contains("server-1", "DeployCommandsDUnit3.jar")
         .hasAnyRow().contains("server-1", "DeployCommandsDUnit4.jar")
-        .hasAnyRow()
-        .contains("server-2", "DeployCommandsDUnit3.jar", "DeployCommandsDUnit3.jar not deployed")
-        .hasAnyRow()
-        .contains("server-2", "DeployCommandsDUnit4.jar", "DeployCommandsDUnit4.jar not deployed");
+        .hasAnyRow().contains("server-2", "DeployCommandsDUnit3.jar", "JAR not deployed")
+        .hasAnyRow().contains("server-2", "DeployCommandsDUnit4.jar", "JAR not deployed");
     server1.invoke(() -> {
       assertThatCannotLoad(jarName3, class3);
       assertThatCannotLoad(jarName4, class4);

diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderDeployTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/ClassPathLoaderDeployTest.java
@@ -129,15 +129,15 @@ public void deployNewVersionOfFunctionOverOldVersion() throws Exception {
     GemFireCache gemFireCache = server.getCache();
     DistributedSystem distributedSystem = gemFireCache.getDistributedSystem();
 
-    ClassPathLoader.getLatest().getJarDeployer().deploy(jarVersion1);
+    ClassPathLoader.getLatest().getJarDeployer().deploy("MyJar.jar", jarVersion1);
 
     assertThatClassCanBeLoaded("jddunit.function.MyFunction");
     Execution execution = FunctionService.onMember(distributedSystem.getDistributedMember());
 
     List<String> result = (List<String>) execution.execute("MyFunction").getResult();
     assertThat(result.get(0)).isEqualTo("Version1");
 
-    ClassPathLoader.getLatest().getJarDeployer().deploy(jarVersion2);
+    ClassPathLoader.getLatest().getJarDeployer().deploy("MyJar.jar", jarVersion2);
     result = (List<String>) execution.execute("MyFunction").getResult();
     assertThat(result.get(0)).isEqualTo("Version2");
   }