Author: kkolinko
Date: Mon Jan 27 13:53:17 2014
New Revision: 1561678
URL: http://svn.apache.org/r1561678
Log:
Merged revision r1561127 from tomcat/trunk:
Remove $Revision keyword from files in catalina/**
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXGetTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXSetTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/SessionsTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditional.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561127
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JKStatusUpdateTask.java
Mon Jan 27 13:53:17 2014
@@ -27,7 +27,6 @@ import org.apache.tools.ant.BuildExcepti
* mod_jk status (1.2.9) application.
*
* @author Peter Rossbach
- * @version $Revision$
* @since 5.5.9
*/
public class JKStatusUpdateTask extends AbstractCatalinaTask {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXGetTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXGetTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXGetTask.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXGetTask.java Mon Jan
27 13:53:17 2014
@@ -30,7 +30,6 @@ import org.apache.tools.ant.BuildExcepti
* supported by the Tomcat manager application.
*
* @author Peter Rossbach
- * @version $Revision$
*/
public class JMXGetTask extends AbstractCatalinaTask {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXQueryTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXQueryTask.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXQueryTask.java Mon Jan
27 13:53:17 2014
@@ -30,7 +30,6 @@ import org.apache.tools.ant.BuildExcepti
* (<code>/jmxproxy/?qry</code>) supported by the Tomcat manager application.
*
* @author Vivek Chopra
- * @version $Revision$
*/
public class JMXQueryTask extends AbstractCatalinaTask {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXSetTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXSetTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXSetTask.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/JMXSetTask.java Mon Jan
27 13:53:17 2014
@@ -30,7 +30,6 @@ import org.apache.tools.ant.BuildExcepti
* supported by the Tomcat manager application.
*
* @author Vivek Chopra
- * @version $Revision$
*/
public class JMXSetTask extends AbstractCatalinaTask {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/SessionsTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/SessionsTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/SessionsTask.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/SessionsTask.java Mon Jan
27 13:53:17 2014
@@ -27,7 +27,6 @@ import org.apache.tools.ant.BuildExcepti
* supported by the Tomcat manager application.
*
* @author Vivek Chopra
- * @version $Revision$
*/
public class SessionsTask extends AbstractCatalinaCommandTask {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
Mon Jan 27 13:53:17 2014
@@ -55,7 +55,6 @@ import org.apache.tools.ant.BuildExcepti
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
- * @version $Revision$
* @since 5.5.12
*/
public class JMXAccessorCreateTask extends JMXAccessorTask {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java
Mon Jan 27 13:53:17 2014
@@ -47,7 +47,6 @@ import org.apache.tools.ant.BuildExcepti
* These tasks require Ant 1.6 or later interface.
*
* @author Peter Rossbach
- * @version $Revision$
* @since 5.5.12
*/
public class JMXAccessorUnregisterTask extends JMXAccessorTask {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOnEntry.java
Mon Jan 27 13:53:17 2014
@@ -29,7 +29,6 @@ import org.apache.catalina.Session;
* reauthentications when SingleSignOn is in use.
*
* @author B Stansberry, based on work by Craig R. McClanahan
- * @version $Revision$
*
* @see SingleSignOn
* @see AuthenticatorBase#reauthenticateFromSSO
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Mon Jan 27 13:53:17 2014
@@ -36,7 +36,6 @@ import org.apache.tomcat.util.ExceptionU
*
* @author Greg Murray
* @author Remy Maucherat
- * @version $Revision: 1.0
*/
public final class ApplicationFilterFactory {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
Mon Jan 27 13:53:17 2014
@@ -58,7 +58,6 @@ import org.apache.tomcat.util.res.String
*
* @author Filip Hanik
* @author Peter Rossbach
- * @version $Revision$
*/
public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer, FileChangeListener {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
Mon Jan 27 13:53:17 2014
@@ -42,7 +42,6 @@ import org.apache.naming.ContextBindings
* @author Craig R. McClanahan
* @author Carson McDonald
* @author Ignacio Ortega
-* @version $Revision$
*/
public class DataSourceRealm
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/session/PersistentManager.java
Mon Jan 27 13:53:17 2014
@@ -29,10 +29,8 @@ package org.apache.catalina.session;
* <li>Limit the number of active sessions kept in memory by
* swapping less active sessions out to disk.</li>
*
- * @version $Revision$
* @author Kief Morris (k...@kief.com)
*/
-
public final class PersistentManager extends PersistentManagerBase {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
Mon Jan 27 13:53:17 2014
@@ -25,7 +25,6 @@ import java.util.regex.PatternSyntaxExce
/**
* Represents a parsed expression.
*
- * @version $Revision$
* @author Paul Speed
*/
public class ExpressionParseTree {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
Mon Jan 27 13:53:17 2014
@@ -22,7 +22,6 @@ package org.apache.catalina.ssi;
* patterned similar to the StreamTokenizer in the JDK but customized for SSI
* conditional expression parsing.
*
- * @version $Revision$
* @author Paul Speed
*/
public class ExpressionTokenizer {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditional.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditional.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditional.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditional.java Mon
Jan 27 13:53:17 2014
@@ -22,7 +22,6 @@ import java.text.ParseException;
/**
* SSI command that handles all conditional directives.
*
- * @version $Revision$
* @author Paul Speed
* @author David Becker
*/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
Mon Jan 27 13:53:17 2014
@@ -22,7 +22,6 @@ package org.apache.catalina.ssi;
* information necessary to process the nested conditional commands ( if, elif,
* else, endif ).
*
- * @version $Revision$
* @author Dan Sandberg
* @author Paul Speed
*/
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1561678&r1=1561677&r2=1561678&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ExpandWar.java Mon
Jan 27 13:53:17 2014
@@ -45,9 +45,7 @@ import org.apache.tomcat.util.res.String
* @author Craig R. McClanahan
* @author Remy Maucherat
* @author Glenn L. Nielsen
- * @version $Revision$
*/
-
public class ExpandWar {
private static final Log log = LogFactory.getLog(ExpandWar.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
