Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItemFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItemFactory.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItemFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItemFactory.java
Mon Oct 23 20:17:11 2006
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
*
- * @version $Id: DefaultFileItemFactory.java,v 1.2 2003/05/31 22:31:08 martinc
Exp $
+ * @version $Id$
*/
public class DefaultFileItemFactory implements FileItemFactory
{
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DefaultFileItemFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
Mon Oct 23 20:17:11 2006
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
*
- * @version $Id: DeferredFileOutputStream.java,v 1.2 2003/05/31 22:31:08
martinc Exp $
+ * @version $Id$
*/
public class DeferredFileOutputStream
extends ThresholdingOutputStream
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
Mon Oct 23 20:17:11 2006
@@ -45,7 +45,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
* @author Sean C. Sullivan
*
- * @version $Id: DiskFileUpload.java,v 1.3 2003/06/01 00:18:13 martinc Exp $
+ * @version $Id$
*/
public class DiskFileUpload
extends FileUploadBase
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
Mon Oct 23 20:17:11 2006
@@ -52,7 +52,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
*
- * @version $Id: FileItem.java,v 1.15 2003/06/01 17:33:24 martinc Exp $
+ * @version $Id$
*/
public interface FileItem
extends Serializable
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItem.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java
Mon Oct 23 20:17:11 2006
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
*
- * @version $Id: FileItemFactory.java,v 1.1 2003/04/27 17:30:06 martinc Exp $
+ * @version $Id$
*/
public interface FileItemFactory
{
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileItemFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
Mon Oct 23 20:17:11 2006
@@ -40,7 +40,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
* @author Sean C. Sullivan
*
- * @version $Id: FileUpload.java,v 1.23 2003/06/24 05:45:43 martinc Exp $
+ * @version $Id$
*/
public class FileUpload
extends FileUploadBase
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
Mon Oct 23 20:17:11 2006
@@ -50,7 +50,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
* @author Sean C. Sullivan
*
- * @version $Id: FileUploadBase.java,v 1.3 2003/06/01 00:18:13 martinc Exp $
+ * @version $Id$
*/
public abstract class FileUploadBase
{
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java
Mon Oct 23 20:17:11 2006
@@ -23,7 +23,7 @@
* Exception for errors encountered while processing the request.
*
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
- * @version $Id: FileUploadException.java,v 1.7 2003/04/27 17:30:06 martinc
Exp $
+ * @version $Id$
*/
public class FileUploadException
extends Exception
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Mon Oct 23 20:17:11 2006
@@ -85,7 +85,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
* @author Sean C. Sullivan
*
- * @version $Id: MultipartStream.java,v 1.12 2003/06/01 00:18:13 martinc Exp $
+ * @version $Id$
*/
public class MultipartStream
{
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
Mon Oct 23 20:17:11 2006
@@ -38,7 +38,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Cooper</a>
*
- * @version $Id: ThresholdingOutputStream.java,v 1.3 2003/05/31 22:31:08
martinc Exp $
+ * @version $Id$
*/
public abstract class ThresholdingOutputStream
extends OutputStream
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package.html?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package.html
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package.html
Mon Oct 23 20:17:11 2006
@@ -1,4 +1,4 @@
-<!-- $Id: package.html,v 1.3 2003/04/27 17:30:06 martinc Exp $ -->
+<!-- $Id$ -->
<html>
<head>
<title>Overview of the org.apache.commons.fileupload component</title>
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/package.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/package.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/log/CaptureLog.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/log/SystemLogHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
Mon Oct 23 20:17:11 2006
@@ -33,7 +33,7 @@
* supplied by the application.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26
févr. 2005) $
+ * @version $Revision$ $Date$
*/
public class BaseAttributeFilter implements NotificationFilter {
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
Mon Oct 23 20:17:11 2006
@@ -31,7 +31,7 @@
* <code>ModelMBean</code> beans exposed for management.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26
févr. 2005) $
+ * @version $Revision$ $Date$
*/
public class FeatureInfo implements Serializable {
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
Mon Oct 23 20:17:11 2006
@@ -43,7 +43,7 @@
* descriptor.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 383268 $ $Date: 2006-03-05 03:02:01 +0100 (dim., 05
mars 2006) $
+ * @version $Revision$ $Date$
*/
public class ManagedBean implements java.io.Serializable
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
Mon Oct 23 20:17:11 2006
@@ -29,7 +29,7 @@
* descriptor.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26
févr. 2005) $
+ * @version $Revision$ $Date$
*/
public class NotificationInfo extends FeatureInfo implements Serializable {
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
Mon Oct 23 20:17:11 2006
@@ -29,7 +29,7 @@
* descriptor.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 155428 $ $Date: 2005-02-26 14:12:25 +0100 (sam., 26
févr. 2005) $
+ * @version $Revision$ $Date$
*/
public class ParameterInfo extends FeatureInfo implements Serializable {
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/RegistryMBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
Mon Oct 23 20:17:11 2006
@@ -11,7 +11,7 @@
"-//Apache Software Foundation//DTD Model MBeans Configuration File"
"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";>
- $Id: mbeans-descriptors.dtd 155428 2005-02-26 13:12:25Z dirkv $
+ $Id$
-->
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/package.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/package.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/BaseEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/LeaderFollowerWorkerThread.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/MasterSlaveWorkerThread.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java Mon
Oct 23 20:17:11 2006
@@ -1,177 +1,177 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.tomcat.util.net;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ByteChannel;
-import java.nio.channels.SocketChannel;
-
-import org.apache.tomcat.util.net.NioEndpoint.Poller;
-import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
-import java.nio.channels.Selector;
-
-/**
- *
- * Base class for a SocketChannel wrapper used by the endpoint.
- * This way, logic for a SSL socket channel remains the same as for
- * a non SSL, making sure we don't need to code for any exception cases.
- *
- * @author Filip Hanik
- * @version 1.0
- */
-public class NioChannel implements ByteChannel{
-
- protected static ByteBuffer emptyBuf = ByteBuffer.allocate(0);
-
- protected SocketChannel sc = null;
-
- protected ApplicationBufferHandler bufHandler;
-
- protected Poller poller;
-
- public NioChannel(SocketChannel channel, ApplicationBufferHandler
bufHandler) throws IOException {
- this.sc = channel;
- this.bufHandler = bufHandler;
- }
-
- public void reset() throws IOException {
- bufHandler.getReadBuffer().clear();
- bufHandler.getWriteBuffer().clear();
- }
-
- /**
- * returns true if the network buffer has
- * been flushed out and is empty
- * @return boolean
- */
- public boolean flush(Selector s) throws IOException {
- return true; //no network buffer in the regular channel
- }
-
-
- /**
- * Closes this channel.
- *
- * @throws IOException If an I/O error occurs
- * @todo Implement this java.nio.channels.Channel method
- */
- public void close() throws IOException {
- getIOChannel().socket().close();
- sc.close();
- }
-
- public void close(boolean force) throws IOException {
- if (isOpen() || force ) close();
- }
- /**
- * Tells whether or not this channel is open.
- *
- * @return <tt>true</tt> if, and only if, this channel is open
- * @todo Implement this java.nio.channels.Channel method
- */
- public boolean isOpen() {
- return sc.isOpen();
- }
-
- /**
- * Writes a sequence of bytes to this channel from the given buffer.
- *
- * @param src The buffer from which bytes are to be retrieved
- * @return The number of bytes written, possibly zero
- * @throws IOException If some other I/O error occurs
- * @todo Implement this java.nio.channels.WritableByteChannel method
- */
- public int write(ByteBuffer src) throws IOException {
- return sc.write(src);
- }
-
- /**
- * Reads a sequence of bytes from this channel into the given buffer.
- *
- * @param dst The buffer into which bytes are to be transferred
- * @return The number of bytes read, possibly zero, or <tt>-1</tt> if the
channel has reached end-of-stream
- * @throws IOException If some other I/O error occurs
- * @todo Implement this java.nio.channels.ReadableByteChannel method
- */
- public int read(ByteBuffer dst) throws IOException {
- return sc.read(dst);
- }
-
-
- /**
- * getBufHandler
- *
- * @return ApplicationBufferHandler
- * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
- */
- public ApplicationBufferHandler getBufHandler() {
- return bufHandler;
- }
-
- public Poller getPoller() {
- return poller;
- }
- /**
- * getIOChannel
- *
- * @return SocketChannel
- * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
- */
- public SocketChannel getIOChannel() {
- return sc;
- }
-
- /**
- * isClosing
- *
- * @return boolean
- * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
- */
- public boolean isClosing() {
- return false;
- }
-
- /**
- * isInitHandshakeComplete
- *
- * @return boolean
- * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
- */
- public boolean isInitHandshakeComplete() {
- return true;
- }
-
- public int handshake(boolean read, boolean write) throws IOException {
- return 0;
- }
-
- public void setPoller(Poller poller) {
- this.poller = poller;
- }
-
- public void setIOChannel(SocketChannel IOChannel) {
- this.sc = IOChannel;
- }
-
- public String toString() {
- return super.toString()+":"+this.sc.toString();
- }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.tomcat.util.net;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ByteChannel;
+import java.nio.channels.SocketChannel;
+
+import org.apache.tomcat.util.net.NioEndpoint.Poller;
+import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
+import java.nio.channels.Selector;
+
+/**
+ *
+ * Base class for a SocketChannel wrapper used by the endpoint.
+ * This way, logic for a SSL socket channel remains the same as for
+ * a non SSL, making sure we don't need to code for any exception cases.
+ *
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class NioChannel implements ByteChannel{
+
+ protected static ByteBuffer emptyBuf = ByteBuffer.allocate(0);
+
+ protected SocketChannel sc = null;
+
+ protected ApplicationBufferHandler bufHandler;
+
+ protected Poller poller;
+
+ public NioChannel(SocketChannel channel, ApplicationBufferHandler
bufHandler) throws IOException {
+ this.sc = channel;
+ this.bufHandler = bufHandler;
+ }
+
+ public void reset() throws IOException {
+ bufHandler.getReadBuffer().clear();
+ bufHandler.getWriteBuffer().clear();
+ }
+
+ /**
+ * returns true if the network buffer has
+ * been flushed out and is empty
+ * @return boolean
+ */
+ public boolean flush(Selector s) throws IOException {
+ return true; //no network buffer in the regular channel
+ }
+
+
+ /**
+ * Closes this channel.
+ *
+ * @throws IOException If an I/O error occurs
+ * @todo Implement this java.nio.channels.Channel method
+ */
+ public void close() throws IOException {
+ getIOChannel().socket().close();
+ sc.close();
+ }
+
+ public void close(boolean force) throws IOException {
+ if (isOpen() || force ) close();
+ }
+ /**
+ * Tells whether or not this channel is open.
+ *
+ * @return <tt>true</tt> if, and only if, this channel is open
+ * @todo Implement this java.nio.channels.Channel method
+ */
+ public boolean isOpen() {
+ return sc.isOpen();
+ }
+
+ /**
+ * Writes a sequence of bytes to this channel from the given buffer.
+ *
+ * @param src The buffer from which bytes are to be retrieved
+ * @return The number of bytes written, possibly zero
+ * @throws IOException If some other I/O error occurs
+ * @todo Implement this java.nio.channels.WritableByteChannel method
+ */
+ public int write(ByteBuffer src) throws IOException {
+ return sc.write(src);
+ }
+
+ /**
+ * Reads a sequence of bytes from this channel into the given buffer.
+ *
+ * @param dst The buffer into which bytes are to be transferred
+ * @return The number of bytes read, possibly zero, or <tt>-1</tt> if the
channel has reached end-of-stream
+ * @throws IOException If some other I/O error occurs
+ * @todo Implement this java.nio.channels.ReadableByteChannel method
+ */
+ public int read(ByteBuffer dst) throws IOException {
+ return sc.read(dst);
+ }
+
+
+ /**
+ * getBufHandler
+ *
+ * @return ApplicationBufferHandler
+ * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+ */
+ public ApplicationBufferHandler getBufHandler() {
+ return bufHandler;
+ }
+
+ public Poller getPoller() {
+ return poller;
+ }
+ /**
+ * getIOChannel
+ *
+ * @return SocketChannel
+ * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+ */
+ public SocketChannel getIOChannel() {
+ return sc;
+ }
+
+ /**
+ * isClosing
+ *
+ * @return boolean
+ * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+ */
+ public boolean isClosing() {
+ return false;
+ }
+
+ /**
+ * isInitHandshakeComplete
+ *
+ * @return boolean
+ * @todo Implement this org.apache.tomcat.util.net.SecureNioChannel method
+ */
+ public boolean isInitHandshakeComplete() {
+ return true;
+ }
+
+ public int handshake(boolean read, boolean write) throws IOException {
+ return 0;
+ }
+
+ public void setPoller(Poller poller) {
+ this.poller = poller;
+ }
+
+ public void setIOChannel(SocketChannel IOChannel) {
+ this.sc = IOChannel;
+ }
+
+ public String toString() {
+ return super.toString()+":"+this.sc.toString();
+ }
+
+}
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLSupport.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SocketStatus.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/TcpConnection.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/TcpConnectionHandler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java Mon Oct 23
20:17:11 2006
@@ -41,7 +41,7 @@
* package someplace.</p>
*
* @author Craig R. McClanahan
- * @version $Revision: 299472 $ $Date: 2004-06-20 02:08:15 +0200 (dim., 20
juin 2004) $
+ * @version $Revision$ $Date$
*/
public final class URL implements Serializable {
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/URL.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/puretls/PureTLSImplementation.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/puretls/PureTLSSocket.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/puretls/PureTLSSocketFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/puretls/PureTLSSupport.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java?view=diff&rev=467222&r1=467221&r2=467222
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java Mon
Oct 23 20:17:11 2006
@@ -42,7 +42,7 @@
* <p>Please see the documentation for java.util.ResourceBundle for
* more information.
*
- * @version $Revision: 299753 $ $Date: 2004-08-29 19:14:42 +0200 (dim., 29
août 2004) $
+ * @version $Revision$ $Date$
*
* @author James Duncan Davidson [EMAIL PROTECTED]
* @author James Todd [EMAIL PROTECTED]
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPoolRunnable.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
