Author: markt
Date: Thu Mar 15 14:52:10 2018
New Revision: 1826825
URL: http://svn.apache.org/viewvc?rev=1826825&view=rev
Log:
Fix some TODOs in XML generation
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1826825&r1=1826824&r2=1826825&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Thu Mar
15 14:52:10 2018
@@ -1026,7 +1026,8 @@ public class WebXml extends XmlEncodingB
resourceEnvRef.getName());
appendElement(sb, INDENT4, "resource-env-ref-type",
resourceEnvRef.getType());
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
+ resourceEnvRef.getProperty("mappedName"));
for (InjectionTarget target :
resourceEnvRef.getInjectionTargets()) {
sb.append(" <injection-target>\n");
@@ -1051,10 +1052,9 @@ public class WebXml extends XmlEncodingB
appendElement(sb, INDENT4, "res-auth", resourceRef.getAuth());
// resource-ref/res-sharing-scope was introduced in Servlet 2.3
if (getMajorVersion() > 2 || getMinorVersion() > 2) {
- appendElement(sb, INDENT4, "res-sharing-scope",
- resourceRef.getScope());
+ appendElement(sb, INDENT4, "res-sharing-scope",
resourceRef.getScope());
}
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
resourceRef.getProperty("mappedName"));
for (InjectionTarget target : resourceRef.getInjectionTargets()) {
sb.append(" <injection-target>\n");
appendElement(sb, INDENT6, "injection-target-class",
@@ -1140,7 +1140,7 @@ public class WebXml extends XmlEncodingB
appendElement(sb, INDENT4, "env-entry-name", envEntry.getName());
appendElement(sb, INDENT4, "env-entry-type", envEntry.getType());
appendElement(sb, INDENT4, "env-entry-value", envEntry.getValue());
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
envEntry.getProperty("mappedName"));
for (InjectionTarget target : envEntry.getInjectionTargets()) {
sb.append(" <injection-target>\n");
appendElement(sb, INDENT6, "injection-target-class",
@@ -1162,7 +1162,7 @@ public class WebXml extends XmlEncodingB
appendElement(sb, INDENT4, "home", ejbRef.getHome());
appendElement(sb, INDENT4, "remote", ejbRef.getRemote());
appendElement(sb, INDENT4, "ejb-link", ejbRef.getLink());
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
ejbRef.getProperty("mappedName"));
for (InjectionTarget target : ejbRef.getInjectionTargets()) {
sb.append(" <injection-target>\n");
appendElement(sb, INDENT6, "injection-target-class",
@@ -1187,7 +1187,7 @@ public class WebXml extends XmlEncodingB
appendElement(sb, INDENT4, "local-home",
ejbLocalRef.getHome());
appendElement(sb, INDENT4, "local", ejbLocalRef.getLocal());
appendElement(sb, INDENT4, "ejb-link", ejbLocalRef.getLink());
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
ejbLocalRef.getProperty("mappedName"));
for (InjectionTarget target :
ejbLocalRef.getInjectionTargets()) {
sb.append(" <injection-target>\n");
appendElement(sb, INDENT6, "injection-target-class",
@@ -1246,7 +1246,7 @@ public class WebXml extends XmlEncodingB
sb.append(" </handler>\n");
}
// TODO handler-chains
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
serviceRef.getProperty("mappedName"));
for (InjectionTarget target :
serviceRef.getInjectionTargets()) {
sb.append(" <injection-target>\n");
appendElement(sb, INDENT6, "injection-target-class",
@@ -1301,7 +1301,7 @@ public class WebXml extends XmlEncodingB
mdr.getUsage());
appendElement(sb, INDENT4, "message-destination-link",
mdr.getLink());
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
mdr.getProperty("mappedName"));
for (InjectionTarget target : mdr.getInjectionTargets()) {
sb.append(" <injection-target>\n");
appendElement(sb, INDENT6, "injection-target-class",
@@ -1321,7 +1321,8 @@ public class WebXml extends XmlEncodingB
appendElement(sb, INDENT4, "display-name",
md.getDisplayName());
appendElement(sb, INDENT4, "message-destination-name",
md.getName());
- // TODO mapped-name
+ appendElement(sb, INDENT4, "mapped-name",
md.getProperty("mappedName"));
+ // TODO lookup-name
sb.append(" </message-destination>\n");
}
sb.append('\n');
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
