Issue #6735 Fix xml for infinispan-remote-query and infinispan-embedd…

…ed-query Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Sep 9, 2021 · cf68d90 · cf68d90
1 parent e7294c5
commit cf68d90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/...dded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/...dded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
@@ -18,7 +18,7 @@
         <New class="org.hibernate.search.cfg.SearchMapping">
           <Call name="entity">
             <Arg>
-              <Get class="org.eclipse.jetty.server.session.infinispan.InfinispanSessionData" name="class"/>
+              <Get class="org.eclipse.jetty.session.infinispan.InfinispanSessionData" name="class"/>
             </Arg>
             <Call name="indexed">
               <Call name="providedId">
@@ -57,7 +57,7 @@
           </Arg>
           <Call name="addIndexedEntity">
             <Arg>
-              <Get class="org.eclipse.jetty.server.session.infinispan.InfinispanSessionData" name="class"/>
+              <Get class="org.eclipse.jetty.session.infinispan.InfinispanSessionData" name="class"/>
             </Arg>
             <Call name="withProperties">
               <Arg>

diff --git a/...remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/...remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
@@ -8,7 +8,7 @@
   <!-- ===================================================================== -->
   <New id="mapping" class="org.hibernate.search.cfg.SearchMapping">
     <Call name="entity">
-      <Arg><Call class="java.lang.Class" name="forName"><Arg>org.eclipse.jetty.server.session.infinispan.InfinispanSessionData</Arg></Call></Arg>
+      <Arg><Call class="java.lang.Class" name="forName"><Arg>org.eclipse.jetty.session.infinispan.InfinispanSessionData</Arg></Call></Arg>
       <Call name="indexed">
         <Call name="providedId">
           <Call name="property">

diff --git a/...t/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java b/...t/java/org/eclipse/jetty/tests/distribution/session/AbstractSessionDistributionTests.java
@@ -100,12 +100,14 @@ public void stopRestartWebappTestSessionContentSaved() throws Exception
                 assertThat(response.getContentAsString(), containsString("SESSION READ CHOCOLATE THE BEST:FRENCH"));
             }
 
+            /*
             Path logFile = jettyHomeTester.getJettyBase().resolve("resources").resolve("jetty-logging.properties");
             Files.deleteIfExists(logFile);
             try (BufferedWriter writer = Files.newBufferedWriter(logFile, StandardCharsets.UTF_8, StandardOpenOption.CREATE))
             {
                 writer.write("org.eclipse.jetty.server.session.LEVEL=DEBUG");
             }
+            */
 
             try (JettyHomeTester.Run run2 = jettyHomeTester.start(argsStart))
             {

diff --git a/...java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java b/...java/org/eclipse/jetty/tests/distribution/session/InfinispanSessionDistributionTests.java
@@ -104,7 +104,7 @@ public List<String> getFirstStartExtraArgs()
     @Override
     public String getFirstStartExtraModules()
     {
-        return "session-store-infinispan-remote";
+        return "session-store-infinispan-remote,infinispan-remote-query";
     }
 
     @Override