Author: markt Date: Fri Jul 28 15:46:05 2017 New Revision: 1803286 URL: http://svn.apache.org/viewvc?rev=1803286&view=rev Log: Deprecate RuleSetBase as it has no meaningful content
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,14 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.ha; - import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; - +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the contents of a @@ -29,7 +25,7 @@ import org.apache.tomcat.util.digester.R * * @author Peter Rossbach */ -public class ClusterRuleSet extends RuleSetBase { +public class ClusterRuleSet implements RuleSet { // ----------------------------------------------------- Instance Variables @@ -49,9 +45,7 @@ public class ClusterRuleSet extends Rule * matching pattern prefix. */ public ClusterRuleSet() { - this(""); - } @@ -63,7 +57,6 @@ public class ClusterRuleSet extends Rule * trailing slash character) */ public ClusterRuleSet(String prefix) { - super(); this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,29 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.realm; - import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.Rule; -import org.apache.tomcat.util.digester.RuleSetBase; +import org.apache.tomcat.util.digester.RuleSet; import org.xml.sax.Attributes; - /** * <p><strong>RuleSet</strong> for recognizing the users defined in the * XML file processed by <code>MemoryRealm</code>.</p> * * @author Craig R. McClanahan */ -public class MemoryRuleSet extends RuleSetBase { +public class MemoryRuleSet implements RuleSet { // ----------------------------------------------------- Instance Variables - /** * The matching pattern prefix to use for recognizing our elements. */ @@ -45,15 +40,12 @@ public class MemoryRuleSet extends RuleS // ------------------------------------------------------------ Constructor - /** * Construct an instance of this <code>RuleSet</code> with the default * matching pattern prefix. */ public MemoryRuleSet() { - this("tomcat-users/"); - } @@ -65,7 +57,6 @@ public class MemoryRuleSet extends RuleS * trailing slash character) */ public MemoryRuleSet(String prefix) { - super(); this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,14 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.startup; - import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; - +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the contents of a @@ -29,12 +25,10 @@ import org.apache.tomcat.util.digester.R * * @author Craig R. McClanahan */ -public class ContextRuleSet extends RuleSetBase { - +public class ContextRuleSet implements RuleSet { // ----------------------------------------------------- Instance Variables - /** * The matching pattern prefix to use for recognizing our elements. */ @@ -49,7 +43,6 @@ public class ContextRuleSet extends Rule // ------------------------------------------------------------ Constructor - /** * Construct an instance of this <code>RuleSet</code> with the default * matching pattern prefix. @@ -88,7 +81,6 @@ public class ContextRuleSet extends Rule // --------------------------------------------------------- Public Methods - /** * <p>Add the set of Rule instances defined in this RuleSet to the * specified <code>Digester</code> instance, associating them with @@ -249,5 +241,4 @@ public class ContextRuleSet extends Rule "setCookieProcessor", "org.apache.tomcat.util.http.CookieProcessor"); } - } Modified: tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java Fri Jul 28 15:46:05 2017 @@ -17,7 +17,7 @@ package org.apache.catalina.startup; import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the contents of a @@ -25,7 +25,7 @@ import org.apache.tomcat.util.digester.R * CredentialHandler such as the <code>NestedCredentialHandler</code> that used * nested CredentialHandlers.</p> */ -public class CredentialHandlerRuleSet extends RuleSetBase { +public class CredentialHandlerRuleSet implements RuleSet { private static final int MAX_NESTED_LEVELS = Integer.getInteger( Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,14 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.startup; - import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; - +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the contents of a @@ -31,12 +27,10 @@ import org.apache.tomcat.util.digester.R * * @author Craig R. McClanahan */ -public class EngineRuleSet extends RuleSetBase { - +public class EngineRuleSet implements RuleSet { // ----------------------------------------------------- Instance Variables - /** * The matching pattern prefix to use for recognizing our elements. */ @@ -45,7 +39,6 @@ public class EngineRuleSet extends RuleS // ------------------------------------------------------------ Constructor - /** * Construct an instance of this <code>RuleSet</code> with the default * matching pattern prefix. @@ -69,7 +62,6 @@ public class EngineRuleSet extends RuleS // --------------------------------------------------------- Public Methods - /** * <p>Add the set of Rule instances defined in this RuleSet to the * specified <code>Digester</code> instance, associating them with @@ -122,8 +114,5 @@ public class EngineRuleSet extends RuleS digester.addSetNext(prefix + "Engine/Valve", "addValve", "org.apache.catalina.Valve"); - } - - } Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,14 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.startup; - import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; - +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the contents of a @@ -31,12 +27,10 @@ import org.apache.tomcat.util.digester.R * * @author Craig R. McClanahan */ -public class HostRuleSet extends RuleSetBase { - +public class HostRuleSet implements RuleSet { // ----------------------------------------------------- Instance Variables - /** * The matching pattern prefix to use for recognizing our elements. */ @@ -45,7 +39,6 @@ public class HostRuleSet extends RuleSet // ------------------------------------------------------------ Constructor - /** * Construct an instance of this <code>RuleSet</code> with the default * matching pattern prefix. @@ -69,7 +62,6 @@ public class HostRuleSet extends RuleSet // --------------------------------------------------------- Public Methods - /** * <p>Add the set of Rule instances defined in this RuleSet to the * specified <code>Digester</code> instance, associating them with @@ -126,8 +118,5 @@ public class HostRuleSet extends RuleSet digester.addSetNext(prefix + "Host/Valve", "addValve", "org.apache.catalina.Valve"); - } - - } Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,14 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.startup; - import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; - +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the JNDI Enterprise Naming @@ -30,12 +26,10 @@ import org.apache.tomcat.util.digester.R * @author Craig R. McClanahan * @author Remy Maucherat */ -public class NamingRuleSet extends RuleSetBase { - +public class NamingRuleSet implements RuleSet { // ----------------------------------------------------- Instance Variables - /** * The matching pattern prefix to use for recognizing our elements. */ @@ -44,7 +38,6 @@ public class NamingRuleSet extends RuleS // ------------------------------------------------------------ Constructor - /** * Construct an instance of this <code>RuleSet</code> with the default * matching pattern prefix. @@ -68,7 +61,6 @@ public class NamingRuleSet extends RuleS // --------------------------------------------------------- Public Methods - /** * <p>Add the set of Rule instances defined in this RuleSet to the * specified <code>Digester</code> instance, associating them with @@ -129,8 +121,5 @@ public class NamingRuleSet extends RuleS digester.addRule(prefix + "Transaction", new SetNextNamingRule("setTransaction", "org.apache.tomcat.util.descriptor.web.ContextTransaction")); - } - - } Modified: tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Fri Jul 28 15:46:05 2017 @@ -14,29 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.startup; - import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; - +import org.apache.tomcat.util.digester.RuleSet; /** * <p><strong>RuleSet</strong> for processing the contents of a Realm definition * element. This <code>RuleSet</code> supports Realms such as the * <code>CombinedRealm</code> that used nested Realms.</p> */ -public class RealmRuleSet extends RuleSetBase { - +public class RealmRuleSet implements RuleSet { private static final int MAX_NESTED_REALM_LEVELS = Integer.getInteger( "org.apache.catalina.startup.RealmRuleSet.MAX_NESTED_REALM_LEVELS", 3).intValue(); - // ----------------------------------------------------- Instance Variables + // ----------------------------------------------------- Instance Variables /** * The matching pattern prefix to use for recognizing our elements. @@ -46,7 +41,6 @@ public class RealmRuleSet extends RuleSe // ------------------------------------------------------------ Constructor - /** * Construct an instance of this <code>RuleSet</code> with the default * matching pattern prefix. @@ -70,7 +64,6 @@ public class RealmRuleSet extends RuleSe // --------------------------------------------------------- Public Methods - /** * <p>Add the set of Rule instances defined in this RuleSet to the * specified <code>Digester</code> instance, associating them with Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java Fri Jul 28 15:46:05 2017 @@ -29,7 +29,7 @@ import org.apache.juli.logging.LogFactor import org.apache.tomcat.util.descriptor.DigesterFactory; import org.apache.tomcat.util.descriptor.XmlErrorHandler; import org.apache.tomcat.util.digester.Digester; -import org.apache.tomcat.util.digester.RuleSetBase; +import org.apache.tomcat.util.digester.RuleSet; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -78,7 +78,7 @@ public class TagPluginParser { return plugins; } - private static class TagPluginRuleSet extends RuleSetBase { + private static class TagPluginRuleSet implements RuleSet { @Override public void addRuleInstances(Digester digester) { digester.addCallMethod(PREFIX, "addPlugin", 2); Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ImplicitTldRuleSet.java Fri Jul 28 15:46:05 2017 @@ -18,7 +18,7 @@ package org.apache.tomcat.util.descripto import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.Rule; -import org.apache.tomcat.util.digester.RuleSetBase; +import org.apache.tomcat.util.digester.RuleSet; import org.apache.tomcat.util.res.StringManager; import org.xml.sax.Attributes; @@ -27,7 +27,7 @@ import org.xml.sax.Attributes; * * Only version information used and short names are allowed. */ -public class ImplicitTldRuleSet extends RuleSetBase { +public class ImplicitTldRuleSet implements RuleSet { private static final StringManager sm = StringManager.getManager(ImplicitTldRuleSet.class); Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java Fri Jul 28 15:46:05 2017 @@ -24,13 +24,13 @@ import javax.servlet.jsp.tagext.Variable import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.Rule; -import org.apache.tomcat.util.digester.RuleSetBase; +import org.apache.tomcat.util.digester.RuleSet; import org.xml.sax.Attributes; /** * RulesSet for digesting TLD files. */ -public class TldRuleSet extends RuleSetBase { +public class TldRuleSet implements RuleSet { private static final String PREFIX = "taglib"; private static final String VALIDATOR_PREFIX = PREFIX + "/validator"; private static final String TAG_PREFIX = PREFIX + "/tag"; Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java Fri Jul 28 15:46:05 2017 @@ -24,19 +24,18 @@ import org.apache.tomcat.util.digester.C import org.apache.tomcat.util.digester.CallParamRule; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.Rule; -import org.apache.tomcat.util.digester.RuleSetBase; +import org.apache.tomcat.util.digester.RuleSet; import org.apache.tomcat.util.digester.SetNextRule; import org.apache.tomcat.util.res.StringManager; import org.xml.sax.Attributes; - /** * <p><strong>RuleSet</strong> for processing the contents of a web application * deployment descriptor (<code>/WEB-INF/web.xml</code>) resource.</p> * * @author Craig R. McClanahan */ -public class WebRuleSet extends RuleSetBase { +public class WebRuleSet implements RuleSet { /** * The string resources for this package. @@ -136,7 +135,6 @@ public class WebRuleSet extends RuleSetB * @param fragment <code>true</code> if this is a web fragment */ public WebRuleSet(String prefix, boolean fragment) { - super(); this.prefix = prefix; this.fragment = fragment; Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java?rev=1803286&r1=1803285&r2=1803286&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java Fri Jul 28 15:46:05 2017 @@ -20,7 +20,10 @@ 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. Will be removed in Tomcat 9 */ +@Deprecated public abstract class RuleSetBase implements RuleSet { /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org