This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 5341026890 Write ContextService (for completeness)
5341026890 is described below
commit 5341026890f7c3e259758d27df56d25d6c34c122
Author: remm <[email protected]>
AuthorDate: Mon Sep 14 23:27:09 2026 +0200
Write ContextService (for completeness)
---
java/org/apache/catalina/storeconfig/NamingResourcesSF.java | 5 +++++
java/org/apache/catalina/storeconfig/server-registry.xml | 7 +++++++
2 files changed, 12 insertions(+)
diff --git a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
index 35e60db416..41336fa0c5 100644
--- a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
+++ b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.descriptor.web.ContextLocalEjb;
import org.apache.tomcat.util.descriptor.web.ContextResource;
import org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef;
import org.apache.tomcat.util.descriptor.web.ContextResourceLink;
+import org.apache.tomcat.util.descriptor.web.ContextService;
/**
* Store server.xml element NamingResources
@@ -86,6 +87,10 @@ public class NamingResourcesSF extends StoreFactoryBase {
// Store nested <ResourceLink> elements
ContextResourceLink[] resourceLinks =
resources.findResourceLinks();
storeElementArray(aWriter, indent, resourceLinks);
+
+ // Store nested <ServiceRef> elements
+ ContextService[] services = resources.findServices();
+ storeElementArray(aWriter, indent, services);
}
}
}
diff --git a/java/org/apache/catalina/storeconfig/server-registry.xml
b/java/org/apache/catalina/storeconfig/server-registry.xml
index c35080e995..91cd7e29bf 100644
--- a/java/org/apache/catalina/storeconfig/server-registry.xml
+++ b/java/org/apache/catalina/storeconfig/server-registry.xml
@@ -350,6 +350,13 @@
tagClass="org.apache.tomcat.util.descriptor.web.ContextResourceLink"
storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
</Description>
+ <Description
+ tag="ServiceRef"
+ standard="true"
+ default="false"
+ tagClass="org.apache.tomcat.util.descriptor.web.ContextService"
+ storeFactoryClass="org.apache.catalina.storeconfig.StoreFactoryBase">
+ </Description>
<Description
tag="Transaction"
standard="true"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
