Revert https://issues.redhat.com/browse/JBTM-3954

This reverts commit 6faa32c.
jbosstm · Dec 6, 2024 · a725ff2 · a725ff2
1 parent 3c6d72b
commit a725ff2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/coordinator/pom.xml b/coordinator/pom.xml
@@ -17,6 +17,10 @@
   <packaging>jar</packaging>
   <name>LRA Coordinator jar</name>
 
+  <properties>
+    <lra.coordinator.path>lra-coordinator/lra-coordinator</lra.coordinator.path>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.jboss.byteman</groupId>

diff --git a/service-base/src/test/java/io/narayana/lra/LRAConstantsTest.java b/service-base/src/test/java/io/narayana/lra/LRAConstantsTest.java
@@ -27,8 +27,8 @@ public void getCoordinatorFromUsualLRAId() {
 
     @Test
     public void getCoordinatorWithMultipleCoordinatorPaths() {
-        URI lraId = URI.create("http://198.10.0.10:8999/lra-coordinator");
+        URI lraId = URI.create("http://198.10.0.10:8999/lra-coordinator/lra-coordinator");
         URI coordinatorUri = LRAConstants.getLRACoordinatorUrl(lraId);
-        Assert.assertEquals("http://198.10.0.10:8999/lra-coordinator", coordinatorUri.toASCIIString());
+        Assert.assertEquals("http://198.10.0.10:8999/lra-coordinator/lra-coordinator", coordinatorUri.toASCIIString());
     }
 }
diff --git a/test/basic/src/test/java/io/narayana/lra/arquillian/OpenAPIIT.java b/test/basic/src/test/java/io/narayana/lra/arquillian/OpenAPIIT.java
@@ -46,7 +46,7 @@ public void test() throws URISyntaxException, MalformedURLException {
         Response response = client.target(url.toURI()).request().get();
         String output = response.readEntity(String.class);
         assertFalse("WildFly OpenAPI document has paths at wrong location",
-                output.contains("/lra-coordinator:"));
+                output.contains("/lra-coordinator/lra-coordinator:"));
         assertTrue("WildFly OpenAPI document does not have paths for expected location:\n" + output,
                 output.contains("/lra-coordinator:"));
         assertTrue("WildFly OpenAPI document does not have server URL",

diff --git a/test/pom.xml b/test/pom.xml
@@ -108,7 +108,8 @@
         <lra.coordinator.object.store.path>${project.build.directory}/wfly_lra_objectstore</lra.coordinator.object.store.path>
         <!-- the AppServerCoordinatorDeploymentObserver creates the deployment named 'lra-coordinator' and deploys it to the app server,
              the last part of the path with value 'lra-coordinator' is defined by LRA coordinator JAX-RS endpoint -->
-        <lra.coordinator.url>http://${lra.coordinator.host}:${lra.coordinator.port}/lra-coordinator</lra.coordinator.url>
+        <lra.coordinator.url>http://${lra.coordinator.host}:${lra.coordinator.port}/lra-coordinator/lra-coordinator</lra.coordinator.url>
+        <lra.coordinator.war.name>lra-coordinator.war</lra.coordinator.war.name>
         <!-- The following filename is used for starting the WildFly instance that hosts the LRA coordinator; this file is a copy of the
              standalone.xml file provided in WildFly (${env.JBOSS_HOME}/standalone/configuration/standalone.xml). Please, see the plugins
              section of this profile (specifically, maven-antrun-plugin) for further info -->