[tomcat] 02/02: Remove deprecated code
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 563f85ab1076fdf7329b2c6cbae22d64a859d572
Author: Mark Thomas
AuthorDate: Tue May 5 09:48:44 2020 +0100
Remove deprecated code
---
java/org/apache/catalina/connector/Connector.java | 30 ---
1 file changed, 30 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 033b194..e941291 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -322,36 +322,6 @@ public class Connector extends LifecycleMBeanBase {
/**
- * Return a property from the protocol handler.
- *
- * @param name the property name
- * @return the property value
- *
- * @deprecated Use {@link #getProperty(String)}. This will be removed in
- * Tomcat 10 onwards.
- */
-@Deprecated
-public Object getAttribute(String name) {
-return getProperty(name);
-}
-
-
-/**
- * Set a property on the protocol handler.
- *
- * @param name the property name
- * @param value the property value
- *
- * @deprecated Use {@link #setAttribute(String, Object)}. This will be
- * removed in Tomcat 10 onwards.
- */
-@Deprecated
-public void setAttribute(String name, Object value) {
-setProperty(name, String.valueOf(value));
-}
-
-
-/**
* @return the Service with which we are associated (if any).
*/
public Service getService() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Remove deprecated code
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 6a313e99d4b46c8b8d5193c3112b440f3fac8e7f
Author: Mark Thomas
AuthorDate: Mon Apr 20 10:36:25 2020 +0100
Remove deprecated code
---
java/org/apache/catalina/servlets/Constants.java | 30
1 file changed, 30 deletions(-)
diff --git a/java/org/apache/catalina/servlets/Constants.java
b/java/org/apache/catalina/servlets/Constants.java
deleted file mode 100644
index a40e96c..000
--- a/java/org/apache/catalina/servlets/Constants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.catalina.servlets;
-
-/**
- * Unused. Will be removed in Tomcat 10.
- */
-@Deprecated
-public class Constants {
-
-public static final String Package = "org.apache.catalina.servlets";
-
-}
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Remove deprecated code
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
AuthorDate: Fri Feb 28 11:16:18 2020 +
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
org.apache.tomcat.util.digester.Digester$EnvironmentPropertySource
to
org.apache.tomcat.util.digester.EnvironmentPropertySource.
-The old class is still available but deprecated. Patch provided by
Bernd
-Bohmann. (markt)
+Patch provided by Bernd Bohmann. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Remove deprecated code.
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 51f96d1c44f90ab3e71a10168b09866d61c21315
Author: Mark Thomas
AuthorDate: Wed Feb 26 17:45:22 2020 +
Remove deprecated code.
---
java/org/apache/catalina/loader/WebappLoader.java | 41 ++-
1 file changed, 2 insertions(+), 39 deletions(-)
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index d681baa..75bb589 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -66,34 +66,6 @@ public class WebappLoader extends LifecycleMBeanBase
private static final Log log = LogFactory.getLog(WebappLoader.class);
-// --- Constructors
-
-/**
- * Construct a new WebappLoader. The parent class loader will be defined by
- * {@link Context#getParentClassLoader()}.
- */
-public WebappLoader() {
-this(null);
-}
-
-
-/**
- * Construct a new WebappLoader with the specified class loader
- * to be defined as the parent of the ClassLoader we ultimately create.
- *
- * @param parent The parent class loader
- *
- * @deprecated Use {@link Context#setParentClassLoader(ClassLoader)} to
- * specify the required class loader. This method will be
- * removed in Tomcat 10 onwards.
- */
-@Deprecated
-public WebappLoader(ClassLoader parent) {
-super();
-this.parentClassLoader = parent;
-}
-
-
// - Instance Variables
/**
@@ -124,12 +96,6 @@ public class WebappLoader extends LifecycleMBeanBase
/**
- * The parent class loader of the class loader we will create.
- */
-private ClassLoader parentClassLoader = null;
-
-
-/**
* The reloadable flag for this Loader.
*/
private boolean reloadable = false;
@@ -510,11 +476,8 @@ public class WebappLoader extends LifecycleMBeanBase
Class clazz = Class.forName(loaderClass);
WebappClassLoaderBase classLoader = null;
-if (parentClassLoader == null) {
-parentClassLoader = context.getParentClassLoader();
-} else {
-context.setParentClassLoader(parentClassLoader);
-}
+ClassLoader parentClassLoader = context.getParentClassLoader();
+
Class[] argTypes = { ClassLoader.class };
Object[] args = { parentClassLoader };
Constructor constr = clazz.getConstructor(argTypes);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
