Author: kkolinko
Date: Mon Jan 27 12:48:36 2014
New Revision: 1561655
URL: http://svn.apache.org/r1561655
Log:
Merged revisions r1561178-r1561179 from tomcat/trunk:
Remove $Id keyword from all remaining files in tomcat/util/**
Remove svn:keywords property from the rest of files in tomcat/util/**
svn propdel svn:keywords --depth infinity
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/package.html (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/CaptureLog.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketStatus.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (contents,
props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/Constants.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/LocalStrings.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/package.html
(contents, props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
(props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
(props changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1561178-1561179
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/MutableInteger.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ContentType.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/MimeHeaders.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/package.html
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_ja.properties
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/CaptureLog.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java?rev=1561655&r1=1561654&r2=1561655&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
Mon Jan 27 12:48:36 2014
@@ -20,8 +20,6 @@ package org.apache.tomcat.util.net;
/**
* Defines an interface used to manage SSL sessions. The manager operates on a
* single session.
- *
- * $Id$
*/
public interface SSLSessionManager {
/**
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSessionManager.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketProperties.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/SocketStatus.java
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1561655&r1=1561654&r2=1561655&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java Mon Jan 27
12:48:36 2014
@@ -42,9 +42,7 @@ import java.util.Locale;
* package someplace.</p>
*
* @author Craig R. McClanahan
- * @version $Id$
*/
-
public final class URL implements Serializable {
private static final long serialVersionUID = 1L;
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
('svn:keywords' removed)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1561655&r1=1561654&r2=1561655&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java Mon
Jan 27 12:48:36 2014
@@ -45,14 +45,11 @@ import java.util.ResourceBundle;
* <p>Please see the documentation for java.util.ResourceBundle for
* more information.
*
- * @version $Id$
- *
* @author James Duncan Davidson [dun...@eng.sun.com]
* @author James Todd [go...@eng.sun.com]
* @author Mel Martinez [mmarti...@g1440.com]
* @see java.util.ResourceBundle
*/
-
public class StringManager {
private static int LOCALE_CACHE_SIZE = 10;
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
('svn:keywords' removed)
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/Constants.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/LocalStrings.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
('svn:keywords' removed)
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/package.html?rev=1561655&r1=1561654&r2=1561655&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/package.html
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/package.html Mon Jan
27 12:48:36 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/scan/package.html
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/Constants.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThread.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/TaskThreadFactory.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
('svn:keywords' removed)
Propchange:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
('svn:keywords' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
