From: markt Date: Tue, 24 Oct 2006 03:17:11 +0000 (+0000) Subject: Correct props. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d079d96e89dfab8c5b620dab37f572c9dd142a90;p=tomcat7.0 Correct props. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@467222 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/javax/servlet/http/LocalStrings_es.properties b/java/javax/servlet/http/LocalStrings_es.properties index 0fe2cac4a..85cda003f 100644 --- a/java/javax/servlet/http/LocalStrings_es.properties +++ b/java/javax/servlet/http/LocalStrings_es.properties @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# $Id: LocalStrings_es.properties 267129 2004-03-18 16:40:35Z jfarcand $ +# $Id$ # # Default localized string information # Localized para Locale es_ES diff --git a/java/javax/servlet/resources/XMLSchema.dtd b/java/javax/servlet/resources/XMLSchema.dtd index 0a758a751..7969fe143 100644 --- a/java/javax/servlet/resources/XMLSchema.dtd +++ b/java/javax/servlet/resources/XMLSchema.dtd @@ -1,7 +1,7 @@ - + diff --git a/java/javax/servlet/resources/datatypes.dtd b/java/javax/servlet/resources/datatypes.dtd index f0ca8d200..13e89208d 100644 --- a/java/javax/servlet/resources/datatypes.dtd +++ b/java/javax/servlet/resources/datatypes.dtd @@ -16,7 +16,7 @@ --> + Overview of the org.apache.commons.fileupload component diff --git a/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java b/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java index b9eca5cae..a142c083a 100644 --- a/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java +++ b/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java @@ -33,7 +33,7 @@ import javax.management.NotificationFilter; * supplied by the application.

* * @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 { diff --git a/java/org/apache/tomcat/util/modeler/FeatureInfo.java b/java/org/apache/tomcat/util/modeler/FeatureInfo.java index 7dedc87ca..e979da9a6 100644 --- a/java/org/apache/tomcat/util/modeler/FeatureInfo.java +++ b/java/org/apache/tomcat/util/modeler/FeatureInfo.java @@ -31,7 +31,7 @@ import javax.management.MBeanFeatureInfo; * ModelMBean beans exposed for management.

* * @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 { diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java b/java/org/apache/tomcat/util/modeler/ManagedBean.java index 9d7c55b3e..04a6daac1 100644 --- a/java/org/apache/tomcat/util/modeler/ManagedBean.java +++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java @@ -43,7 +43,7 @@ import javax.management.ServiceNotFoundException; * descriptor.

* * @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 diff --git a/java/org/apache/tomcat/util/modeler/NotificationInfo.java b/java/org/apache/tomcat/util/modeler/NotificationInfo.java index c685896bf..f924d7e14 100644 --- a/java/org/apache/tomcat/util/modeler/NotificationInfo.java +++ b/java/org/apache/tomcat/util/modeler/NotificationInfo.java @@ -29,7 +29,7 @@ import javax.management.MBeanNotificationInfo; * descriptor.

* * @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 { diff --git a/java/org/apache/tomcat/util/modeler/ParameterInfo.java b/java/org/apache/tomcat/util/modeler/ParameterInfo.java index 003d14173..3771e982d 100644 --- a/java/org/apache/tomcat/util/modeler/ParameterInfo.java +++ b/java/org/apache/tomcat/util/modeler/ParameterInfo.java @@ -29,7 +29,7 @@ import javax.management.MBeanParameterInfo; * descriptor.

* * @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 { diff --git a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd index f2d9c61b6..8a6a85290 100644 --- a/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd +++ b/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd @@ -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$ --> diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java index 33b008ff0..2cff92b2e 100644 --- a/java/org/apache/tomcat/util/net/NioChannel.java +++ b/java/org/apache/tomcat/util/net/NioChannel.java @@ -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 true 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 -1 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 true 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 -1 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(); + } + +} diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java index e264d6343..3521f6eb7 100644 --- a/java/org/apache/tomcat/util/net/URL.java +++ b/java/org/apache/tomcat/util/net/URL.java @@ -41,7 +41,7 @@ import java.net.MalformedURLException; * package someplace.

* * @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 { diff --git a/java/org/apache/tomcat/util/res/StringManager.java b/java/org/apache/tomcat/util/res/StringManager.java index dba3ea2a0..593980ef1 100644 --- a/java/org/apache/tomcat/util/res/StringManager.java +++ b/java/org/apache/tomcat/util/res/StringManager.java @@ -42,7 +42,7 @@ import java.util.ResourceBundle; *

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 [duncan@eng.sun.com] * @author James Todd [gonzo@eng.sun.com]