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 2017/07/28 15:55:31 UTC
svn commit: r1803287 - in /tomcat/tc8.5.x/trunk/java/org/apache:
catalina/ha/ catalina/realm/ catalina/startup/
tomcat/util/descriptor/tagplugin/ tomcat/util/descriptor/tld/
tomcat/util/descriptor/web/ tomcat/util/digester/
Author: markt
Date: Fri Jul 28 15:55:30 2017
New Revision: 1803287
URL: http://svn.apache.org/viewvc?rev=1803287&view=rev
Log:
Deprecate RuleSetBase as it has no meaningful content once deprecated methods are removed
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri Jul 28 15:55:30 2017
@@ -29,6 +29,7 @@ import org.apache.tomcat.util.digester.R
*
* @author Peter Rossbach
*/
+@SuppressWarnings("deprecation")
public class ClusterRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri Jul 28 15:55:30 2017
@@ -31,6 +31,7 @@ import org.xml.sax.Attributes;
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
public class MemoryRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Fri Jul 28 15:55:30 2017
@@ -29,6 +29,7 @@ import org.apache.tomcat.util.digester.R
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
public class ContextRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java Fri Jul 28 15:55:30 2017
@@ -25,6 +25,7 @@ import org.apache.tomcat.util.digester.R
* CredentialHandler such as the <code>NestedCredentialHandler</code> that used
* nested CredentialHandlers.</p>
*/
+@SuppressWarnings("deprecation")
public class CredentialHandlerRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Fri Jul 28 15:55:30 2017
@@ -31,6 +31,7 @@ import org.apache.tomcat.util.digester.R
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
public class EngineRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/HostRuleSet.java Fri Jul 28 15:55:30 2017
@@ -31,6 +31,7 @@ import org.apache.tomcat.util.digester.R
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
public class HostRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Fri Jul 28 15:55:30 2017
@@ -30,6 +30,7 @@ import org.apache.tomcat.util.digester.R
* @author Craig R. McClanahan
* @author Remy Maucherat
*/
+@SuppressWarnings("deprecation")
public class NamingRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Fri Jul 28 15:55:30 2017
@@ -28,6 +28,7 @@ import org.apache.tomcat.util.digester.R
* element. This <code>RuleSet</code> supports Realms such as the
* <code>CombinedRealm</code> that used nested Realms.</p>
*/
+@SuppressWarnings("deprecation")
public class RealmRuleSet extends RuleSetBase {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java Fri Jul 28 15:55:30 2017
@@ -36,6 +36,7 @@ import org.xml.sax.SAXException;
/**
* Parser for Tag Plugin descriptors.
*/
+@SuppressWarnings("deprecation")
public class TagPluginParser {
private static final Log log = LogFactory.getLog(TagPluginParser.class);
private static final String PREFIX = "tag-plugins/tag-plugin";
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java Fri Jul 28 15:55:30 2017
@@ -27,6 +27,7 @@ import org.xml.sax.Attributes;
*
* Only version information used and short names are allowed.
*/
+@SuppressWarnings("deprecation")
public class ImplicitTldRuleSet extends RuleSetBase {
private static final StringManager sm = StringManager.getManager(ImplicitTldRuleSet.class);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java Fri Jul 28 15:55:30 2017
@@ -30,6 +30,7 @@ import org.xml.sax.Attributes;
/**
* RulesSet for digesting TLD files.
*/
+@SuppressWarnings("deprecation")
public class TldRuleSet extends RuleSetBase {
private static final String PREFIX = "taglib";
private static final String VALIDATOR_PREFIX = PREFIX + "/validator";
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java Fri Jul 28 15:55:30 2017
@@ -36,6 +36,7 @@ import org.xml.sax.Attributes;
*
* @author Craig R. McClanahan
*/
+@SuppressWarnings("deprecation")
public class WebRuleSet extends RuleSetBase {
/**
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java?rev=1803287&r1=1803286&r2=1803287&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java Fri Jul 28 15:55:30 2017
@@ -14,23 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.tomcat.util.digester;
-
/**
* <p>Convenience base class that implements the {@link RuleSet} interface.
* Concrete implementations should list all of their actual rule creation
* logic in the <code>addRuleSet()</code> implementation.</p>
+ *
+ * @deprecated Unnecessary once deprecated methods are removed. Will be removed
+ * in Tomcat 9.
*/
-
+@Deprecated
public abstract class RuleSetBase implements RuleSet {
-
// ----------------------------------------------------- Instance Variables
-
/**
* The namespace URI that all Rule instances created by this RuleSet
* will be associated with.
@@ -43,7 +41,6 @@ public abstract class RuleSetBase implem
// ------------------------------------------------------------- Properties
-
/**
* Return the namespace URI that will be applied to all Rule instances
* created from this RuleSet.
@@ -53,15 +50,12 @@ public abstract class RuleSetBase implem
@Deprecated
@Override
public String getNamespaceURI() {
-
return (this.namespaceURI);
-
}
// --------------------------------------------------------- Public Methods
-
/**
* Add the set of Rule instances defined in this RuleSet to the
* specified <code>Digester</code> instance, associating them with
@@ -73,6 +67,4 @@ public abstract class RuleSetBase implem
*/
@Override
public abstract void addRuleInstances(Digester digester);
-
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org