Author: remm
Date: Tue Nov 28 13:53:25 2017
New Revision: 1816545
URL: http://svn.apache.org/viewvc?rev=1816545&view=rev
Log:
The system property replacement from the property source is best done using a
system property of its own rather than a listener. Embedded can call the static
method directly. Deprecate the (useless) listener.
Modified:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/systemprops.xml
Modified:
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java?rev=1816545&r1=1816544&r2=1816545&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/util/SystemPropertyReplacerListener.java
Tue Nov 28 13:53:25 2017
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.digester.D
/**
* Helper class used to do property replacement on system properties.
+ * @deprecated
*/
public class SystemPropertyReplacerListener
implements LifecycleListener {
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1816545&r1=1816544&r2=1816545&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Nov 28
13:53:25 2017
@@ -108,6 +108,9 @@ public class Digester extends DefaultHan
propertySource = source;
propertySourceSet = true;
}
+ if
(Boolean.getBoolean("org.apache.tomcat.util.digester.REPLACE_SYSTEM_PROPERTIES"))
{
+ replaceSystemProperties();
+ }
}
public static void setPropertySource(IntrospectionUtils.PropertySource
propertySource) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816545&r1=1816544&r2=1816545&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Nov 28 13:53:25 2017
@@ -52,6 +52,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Add an additional system property for the system property replacement.
+ (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.2 (markt)" rtext="release in progress">
<subsection name="Catalina">
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1816545&r1=1816544&r2=1816545&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Tue Nov 28 13:53:25 2017
@@ -46,9 +46,13 @@
<p>Use this to add a property source, that will be invoked when
<code>${parameter}</code>
denoted parameters are found in the XML files that Tomcat parses.</p>
<p>Property replacement from the specified property source on the JVM
- system properties can also be done by adding the
- <code>org.apache.catalina.util.SystemPropertyReplacerListener</code>
- listener as a Server listener in the container.</p>
+ system properties can also be done using the
+ <code>REPLACE_SYSTEM_PROPERTIES</code> system property.</p>
+ </property>
+ <property name="org.apache.tomcat.util.digester.
REPLACE_SYSTEM_PROPERTIES">
+ <p>Set this boolean system property to <code>true</code> to cause
+ property replacement from the digester property source on the JVM
+ system properties.</p>
</property>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
