You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/28 11:16:57 UTC
[tomcat] branch master updated (8f83475 -> 5ee4720)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 8f83475 The '$' in the class name of Digester$EnvironmentPropertySource is no… (#244)
new 8cbeb41 Polish
new 5ee4720 Remove deprecated code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/util/digester/Digester.java | 9 ---------
.../apache/tomcat/util/digester/EnvironmentPropertySource.java | 8 +++++---
webapps/docs/changelog.xml | 10 ++++++----
3 files changed, 11 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Remove deprecated code
Posted by ma...@apache.org.
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 5ee4720ea9ca5701ac306caafa56ea41ec23372f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 28 11:16:18 2020 +0000
Remove deprecated code
---
java/org/apache/tomcat/util/digester/Digester.java | 12 ------------
webapps/docs/changelog.xml | 3 +--
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java
index fcf32c7..46d80d0 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -145,18 +145,6 @@ 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.
- *
- * @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 {
- }
-
protected IntrospectionUtils.PropertySource source[] = new IntrospectionUtils.PropertySource[] {
new SystemPropertySource() };
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c69d8d9..513420c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,8 +71,7 @@
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)
+ Patch provided by Bernd Bohmann. (markt)
</scode>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Polish
Posted by ma...@apache.org.
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org