From d5a0b2bd1e157351a2cc4b53cbda9baf620ec9e4 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Fri, 5 Aug 2022 18:48:08 +1000
Subject: [PATCH] more fixes on Resource

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 .../ee10/servlet/security/HashLoginService.java     |  1 +
 .../modules/demo.d/jetty-ee10-demo-realm.xml        | 12 +++++++++++-
 .../src/test/resources/test-realm.xml               | 13 ++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/HashLoginService.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/HashLoginService.java
index 34bb2116121..84bb63fb895 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/HashLoginService.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/HashLoginService.java
@@ -16,6 +16,7 @@ package org.eclipse.jetty.ee10.servlet.security;
 import java.util.List;
 
 import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml b/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml
index 06b556f453e..88e3c46bb41 100644
--- a/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml
+++ b/jetty-home/src/main/resources/modules/demo.d/jetty-ee10-demo-realm.xml
@@ -8,11 +8,21 @@
   <!-- configuration (see $(jetty.home)/webapps/test.xml for an    -->
   <!-- example).                                                   -->
   <!-- =========================================================== -->
+
+
+
+  <Call class="org.eclipse.jetty.util.resource.ResourceFactory" name="of" arg="Server">
+    <Call id="realmResource" class="org.eclipse.jetty.util.resource.Resource" name="newResource">
+      <Arg><Property name="jetty.demo.realm" default="etc/jetty-ee10-demo-realm.properties" /></Arg>
+    </Call>
+  </Call>
+
+
   <Call name="addBean">
     <Arg>
       <New class="org.eclipse.jetty.ee10.servlet.security.HashLoginService">
         <Set name="name">Test Realm</Set>
-        <Set name="config">etc/jetty-ee10-demo-realm.properties</Set>
+        <Set name="config"><Ref refid="realmResource"/></Set>
         <Set name="hotReload">false</Set>
       </New>
     </Arg>
diff --git a/tests/test-distribution/test-distribution-common/src/test/resources/test-realm.xml b/tests/test-distribution/test-distribution-common/src/test/resources/test-realm.xml
index 0b4cf7f7c31..0bf0a9fb372 100644
--- a/tests/test-distribution/test-distribution-common/src/test/resources/test-realm.xml
+++ b/tests/test-distribution/test-distribution-common/src/test/resources/test-realm.xml
@@ -8,13 +8,20 @@
   <!-- configuration (see $(jetty.home)/webapps/test.xml for an    -->
   <!-- example).                                                   -->
   <!-- =========================================================== -->
+
+  <Call class="org.eclipse.jetty.util.resource.ResourceFactory" name="of" arg="Server">
+    <Call id="realmResource" class="org.eclipse.jetty.util.resource.Resource" name="newResource">
+      <Arg><Property name="jetty.demo.realm" default="etc/realm.properties" /></Arg>
+    </Call>
+  </Call>
+
+
+
   <Call name="addBean">
     <Arg>
       <New class="org.eclipse.jetty.security.HashLoginService">
         <Set name="name">Test Realm</Set>
-        <Set name="config">
-          <Property name="jetty.demo.realm" default="etc/realm.properties" />
-        </Set>
+        <Set name="config"><Ref refid="realmResource"/></Set>
         <Set name="hotReload">false</Set>
       </New>
     </Arg>