This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8cbeb4120a6a75fe2a3f6f5fffba963f32f5c162
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 28 11:14:56 2020 +0000
Polish
---
java/org/apache/tomcat/util/digester/Digester.java | 9 ++++++---
.../tomcat/util/digester/EnvironmentPropertySource.java | 8 +++++---
webapps/docs/changelog.xml | 11 +++++++----
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/tomcat/util/digester/Digester.java
b/java/org/apache/tomcat/util/digester/Digester.java
index dc60837..fcf32c7 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -146,11 +146,14 @@ public class Digester extends DefaultHandler2 {
}
/**
- * A {@link
org.apache.tomcat.util.IntrospectionUtils.SecurePropertySource} that uses
environment variables to resolve expressions.
- * Still available for backwards compatibility.
- * @see org.apache.tomcat.util.digester.EnvironmentPropertySource
+ * A {@link org.apache.tomcat.util.IntrospectionUtils.SecurePropertySource}
+ * that uses environment variables to resolve expressions. Still available
+ * for backwards compatibility.
*
+ * @deprecated Use {@link
org.apache.tomcat.util.digester.EnvironmentPropertySource}
+ * This will be removed in Tomcat 10 onwards.
*/
+ @Deprecated
public static class EnvironmentPropertySource extends
org.apache.tomcat.util.digester.EnvironmentPropertySource {
}
diff --git
a/java/org/apache/tomcat/util/digester/EnvironmentPropertySource.java
b/java/org/apache/tomcat/util/digester/EnvironmentPropertySource.java
index e7948ce..6b4138c 100644
--- a/java/org/apache/tomcat/util/digester/EnvironmentPropertySource.java
+++ b/java/org/apache/tomcat/util/digester/EnvironmentPropertySource.java
@@ -22,7 +22,8 @@ import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.security.PermissionCheck;
/**
- * A {@link org.apache.tomcat.util.IntrospectionUtils.SecurePropertySource}
that uses environment variables to resolve expressions.
+ * A {@link org.apache.tomcat.util.IntrospectionUtils.SecurePropertySource}
+ * that uses environment variables to resolve expressions.
*
* <p><strong>Usage example:</strong></p>
*
@@ -49,8 +50,9 @@ import org.apache.tomcat.util.security.PermissionCheck;
* {@code
*
-Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource}
* </pre>
- *
- * <b>NOTE</b>: When configured the PropertySource for resolving expressions
from system properties is still active.
+ *
+ * <b>NOTE</b>: When configured the PropertySource for resolving expressions
+ * from system properties is still active.
*
* @see Digester
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7a91894..c69d8d9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,6 +67,13 @@
<bug>64166</bug>: Ensure that the names returned by
<code>HttpServletResponse.getHeaderNames()</code> are unique. (markt)
</fix>
+ <scode>
+ Rename
<code>org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource</code>
+ to
+ <code>org.apache.tomcat.util.digester.EnvironmentPropertySource</code>.
+ The old class is still available but deprecated. Patch provided by
Bernd
+ Bohmann. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
@@ -164,10 +171,6 @@
<fix>
Missing store config attributes for Resources elements. (remm)
</fix>
- <scode>
- Rename
<code>org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource</code>
to
-
<code>org.apache.tomcat.util.digester.EnvironmentPropertySource</code>. Old
class is still available.
- </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
