Fixing quickstart XML references to provider

jetty · Nov 27, 2024 · 9bfab80 · 9bfab80
1 parent 2e9660d
commit 9bfab80
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 29 deletions.
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml b/jetty-ee10/jetty-ee10-quickstart/src/main/config/etc/jetty-ee10-quickstart.xml
@@ -7,12 +7,23 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider-ee10">
-      <Get name="properties">
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
-      </Get>
-  </Ref>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.mode" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.origin" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.xml" />
+    </Arg>
+  </Call>
 
 </Configure>
diff --git a/jetty-ee11/jetty-ee11-quickstart/src/main/config/etc/jetty-ee11-quickstart.xml b/jetty-ee11/jetty-ee11-quickstart/src/main/config/etc/jetty-ee11-quickstart.xml
@@ -7,12 +7,22 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider">
-      <Get name="properties">
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
-      </Get>
-  </Ref>
-
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.mode" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.origin" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.xml" />
+    </Arg>
+  </Call>
 </Configure>
diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml b/jetty-ee8/jetty-ee8-quickstart/src/main/config/etc/jetty-ee8-quickstart.xml
@@ -7,12 +7,23 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider-ee8">
-      <Get name="properties">
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
-      </Get>
-  </Ref>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.mode" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.origin" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.xml" />
+    </Arg>
+  </Call>
 
 </Configure>
diff --git a/jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml b/jetty-ee9/jetty-ee9-quickstart/src/main/config/etc/jetty-ee9-quickstart.xml
@@ -7,12 +7,23 @@
     <Arg><Property name="jetty.quickstart.mode"/></Arg>
   </Call>
 
-  <Ref refid="WebAppProvider-ee9">
-      <Get name="properties">
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode"><Property name="jetty.quickstart.mode"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin"><Property name="jetty.quickstart.origin"/></Put>
-        <Put name="jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml"><Property name="jetty.quickstart.xml"/></Put>
-      </Get>
-  </Ref>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.mode</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.mode" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.origin</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.origin" />
+    </Arg>
+  </Call>
+  <Call name="setAttribute">
+    <Arg>jetty.deploy.attribute.org.eclipse.jetty.quickstart.xml</Arg>
+    <Arg>
+      <Property name="jetty.quickstart.xml" />
+    </Arg>
+  </Call>
 
 </Configure>