Author: kkolinko
Date: Mon Jan 27 12:42:39 2014
New Revision: 1561654
URL: http://svn.apache.org/r1561654
Log:
Merged revisions r1561171-r1561172, r1561175-r1561176 from tomcat/trunk:
Remove $Id keyword from files in tomcat/util/(digester|file|modeler)/**
Remove svn:keywords property from tomcat/util/(digester|file|modeler)/**
svn propdel svn:keywords --depth infinity
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectParamRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/PathCallParamRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Rule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RuleSet.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Rules.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Constants.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/LocalStrings.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/package.html
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/package.html
(props changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561171-1561172,1561175-1561176
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/NodeCreateRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ObjectParamRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/PathCallParamRule.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Rule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RuleSet.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Rules.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/package.html
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Constants.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/LocalStrings.properties
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/Matcher.java
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/package.html?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/package.html
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/package.html Mon Jan
27 12:42:39 2014
@@ -17,9 +17,6 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
-<!--
-$Id$
--->
</head>
<body bgcolor="white">
<p>
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/file/package.html
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
Mon Jan 27 12:42:39 2014
@@ -33,9 +33,7 @@ import javax.management.NotificationFilt
* supplied by the application.</p>
*
* @author Craig R. McClanahan
- * @version $Id$
*/
-
public class BaseAttributeFilter implements NotificationFilter {
private static final long serialVersionUID = 1L;
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
Mon Jan 27 12:42:39 2014
@@ -31,9 +31,7 @@ import javax.management.MBeanFeatureInfo
* <code>ModelMBean</code> beans exposed for management.</p>
*
* @author Craig R. McClanahan
- * @version $Id$
*/
-
public class FeatureInfo implements Serializable {
static final long serialVersionUID = -911529176124712296L;
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
Mon Jan 27 12:42:39 2014
@@ -42,9 +42,7 @@ import javax.management.ServiceNotFoundE
* descriptor.</p>
*
* @author Craig R. McClanahan
- * @version $Id$
*/
-
public class ManagedBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
Mon Jan 27 12:42:39 2014
@@ -27,7 +27,6 @@ import javax.management.MBeanNotificatio
* descriptor.</p>
*
* @author Craig R. McClanahan
- * @version $Id$
*/
public class NotificationInfo extends FeatureInfo {
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
Mon Jan 27 12:42:39 2014
@@ -27,9 +27,7 @@ import javax.management.MBeanParameterIn
* descriptor.</p>
*
* @author Craig R. McClanahan
- * @version $Id$
*/
-
public class ParameterInfo extends FeatureInfo {
static final long serialVersionUID = 2222796006787664020L;
// ----------------------------------------------------------- Constructors
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd?rev=1561654&r1=1561653&r2=1561654&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
Mon Jan 27 12:42:39 2014
@@ -26,8 +26,6 @@
<!DOCTYPE mbeans-descriptors PUBLIC
"-//Apache Software Foundation//DTD Model MBeans Configuration File"
"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>
-
- $Id$
-->
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/package.html
('svn:keywords' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
