Produced by Araxis Merge on 2016-08-05 09:21:31 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Merge Test Files/jakarta-tomcat-4.0.6-src/catalina/src/share/org/apache/catalina/connector/http | Constants.java | 2002-10-08 14:15:34 +0000 |
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http | Constants.java | 2002-12-19 13:49:38 +0000 |
| 3 | /Merge Test Files/jakarta-tomcat-4.1.24-src/catalina/src/share/org/apache/catalina/connector/http | Constants.java | 2003-03-19 09:18:34 +0000 |
| Note: Merge considers the second file to be the common ancestor of the others. | |||
| Description | Between Files 1 and 2 | Between Files 2 and 3 | Relative to Common Ancestor | |||
|---|---|---|---|---|---|---|
| Text Blocks | Lines | Text Blocks | Lines | Text Blocks | Lines | |
| Unchanged | 6 | 152 | 1 | 162 | ||
| Changed | 1 | 6 | 0 | 0 | 1 | 6 |
| Inserted | 1 | 2 | 0 | 0 | 3 | 6 |
| Removed | 3 | 6 | 0 | 0 | 1 | 2 |
| Note: An automatic merge would leave 0 conflict(s). | ||||||
| Whitespace | Differences in whitespace are significant |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are significant |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /* | 1 | /* | 1 | /* | |||||
| 2 | * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v 1.5 2001/07/26 04:03:23 | 2 | * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v 1.7 2002/03/18 07:15: | 2 | * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/Constants.java,v 1.7 2002/03/18 07:15:39 remm Exp $ | |||||
| 3 | * $Revision: 1.5 $ | 3 | * $Revision: 1.7 $ | 3 | * $Revision: 1.7 $ | |||||
| 4 | * $Date: 2001/07/26 04:03:23 | 4 | * $Date: 2002/03/18 07:15: | 4 | * $Date: 2002/03/18 07:15:39 $ | |||||
| 5 | * | 5 | * | 5 | * | |||||
| 6 | * ==================================================================== | 6 | * ==================================================================== | 6 | * ==================================================================== | |||||
| 7 | * | 7 | * | 7 | * | |||||
| 8 | * The Apache Software License, Version 1.1 | 8 | * The Apache Software License, Version 1.1 | 8 | * The Apache Software License, Version 1.1 | |||||
| 9 | * | 9 | * | 9 | * | |||||
| 10 | * Copyright (c) 1999 The Apache Software Foundation. All rights | 10 | * Copyright (c) 1999 The Apache Software Foundation. All rights | 10 | * Copyright (c) 1999 The Apache Software Foundation. All rights | |||||
| 11 | * reserved. | 11 | * reserved. | 11 | * reserved. | |||||
| 12 | * | 12 | * | 12 | * | |||||
| 13 | * Redistribution and use in source and binary forms, with or without | 13 | * Redistribution and use in source and binary forms, with or without | 13 | * Redistribution and use in source and binary forms, with or without | |||||
| 14 | * modification, are permitted provided that the following conditions | 14 | * modification, are permitted provided that the following conditions | 14 | * modification, are permitted provided that the following conditions | |||||
| 15 | * are met: | 15 | * are met: | 15 | * are met: | |||||
| 16 | * | 16 | * | 16 | * | |||||
| 17 | * 1. Redistributions of source code must retain the above copyright | 17 | * 1. Redistributions of source code must retain the above copyright | 17 | * 1. Redistributions of source code must retain the above copyright | |||||
| 18 | * notice, this list of conditions and the following disclaimer. | 18 | * notice, this list of conditions and the following disclaimer. | 18 | * notice, this list of conditions and the following disclaimer. | |||||
| 19 | * | 19 | * | 19 | * | |||||
| 20 | * 2. Redistributions in binary form must reproduce the above copyright | 20 | * 2. Redistributions in binary form must reproduce the above copyright | 20 | * 2. Redistributions in binary form must reproduce the above copyright | |||||
| 21 | * notice, this list of conditions and the following disclaimer in | 21 | * notice, this list of conditions and the following disclaimer in | 21 | * notice, this list of conditions and the following disclaimer in | |||||
| 22 | * the documentation and/or other materials provided with the | 22 | * the documentation and/or other materials provided with the | 22 | * the documentation and/or other materials provided with the | |||||
| 23 | * distribution. | 23 | * distribution. | 23 | * distribution. | |||||
| 24 | * | 24 | * | 24 | * | |||||
| 25 | * 3. The end-user documentation included with the redistribution, if | 25 | * 3. The end-user documentation included with the redistribution, if | 25 | * 3. The end-user documentation included with the redistribution, if | |||||
| 26 | * any, must include the following acknowlegement: | 26 | * any, must include the following acknowlegement: | 26 | * any, must include the following acknowlegement: | |||||
| 27 | * "This product includes software developed by the | 27 | * "This product includes software developed by the | 27 | * "This product includes software developed by the | |||||
| 28 | * Apache Software Foundation (http://www.apache.org/)." | 28 | * Apache Software Foundation (http://www.apache.org/)." | 28 | * Apache Software Foundation (http://www.apache.org/)." | |||||
| 29 | * Alternately, this acknowlegement may appear in the software itself, | 29 | * Alternately, this acknowlegement may appear in the software itself, | 29 | * Alternately, this acknowlegement may appear in the software itself, | |||||
| 30 | * if and wherever such third-party acknowlegements normally appear. | 30 | * if and wherever such third-party acknowlegements normally appear. | 30 | * if and wherever such third-party acknowlegements normally appear. | |||||
| 31 | * | 31 | * | 31 | * | |||||
| 32 | * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software | 32 | * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software | 32 | * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software | |||||
| 33 | * Foundation" must not be used to endorse or promote products derived | 33 | * Foundation" must not be used to endorse or promote products derived | 33 | * Foundation" must not be used to endorse or promote products derived | |||||
| 34 | * from this software without prior written permission. For written | 34 | * from this software without prior written permission. For written | 34 | * from this software without prior written permission. For written | |||||
| 35 | * permission, please contact apache@apache.org. | 35 | * permission, please contact apache@apache.org. | 35 | * permission, please contact apache@apache.org. | |||||
| 36 | * | 36 | * | 36 | * | |||||
| 37 | * 5. Products derived from this software may not be called "Apache" | 37 | * 5. Products derived from this software may not be called "Apache" | 37 | * 5. Products derived from this software may not be called "Apache" | |||||
| 38 | * nor may "Apache" appear in their names without prior written | 38 | * nor may "Apache" appear in their names without prior written | 38 | * nor may "Apache" appear in their names without prior written | |||||
| 39 | * permission of the Apache Group. | 39 | * permission of the Apache Group. | 39 | * permission of the Apache Group. | |||||
| 40 | * | 40 | * | 40 | * | |||||
| 41 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED | 41 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED | 41 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED | |||||
| 42 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 42 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 42 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |||||
| 43 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 43 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 43 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |||||
| 44 | * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR | 44 | * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR | 44 | * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR | |||||
| 45 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 45 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 45 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||||
| 46 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 46 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 46 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |||||
| 47 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | 47 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | 47 | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | |||||
| 48 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 48 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 48 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | |||||
| 49 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 49 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 49 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | |||||
| 50 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | 50 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | 50 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | |||||
| 51 | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 51 | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 51 | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |||||
| 52 | * SUCH DAMAGE. | 52 | * SUCH DAMAGE. | 52 | * SUCH DAMAGE. | |||||
| 53 | * ==================================================================== | 53 | * ==================================================================== | 53 | * ==================================================================== | |||||
| 54 | * | 54 | * | 54 | * | |||||
| 55 | * This software consists of voluntary contributions made by many | 55 | * This software consists of voluntary contributions made by many | 55 | * This software consists of voluntary contributions made by many | |||||
| 56 | * individuals on behalf of the Apache Software Foundation. For more | 56 | * individuals on behalf of the Apache Software Foundation. For more | 56 | * individuals on behalf of the Apache Software Foundation. For more | |||||
| 57 | * information on the Apache Software Foundation, please see | 57 | * information on the Apache Software Foundation, please see | 57 | * information on the Apache Software Foundation, please see | |||||
| 58 | * <http://www.apache.org/>. | 58 | * <http://www.apache.org/>. | 58 | * <http://www.apache.org/>. | |||||
| 59 | * | 59 | * | 59 | * | |||||
| 60 | * [Additional notices, if required by prior licensing conditions] | 60 | * [Additional notices, if required by prior licensing conditions] | 60 | * [Additional notices, if required by prior licensing conditions] | |||||
| 61 | * | 61 | * | 61 | * | |||||
| 62 | */ | 62 | */ | 62 | */ | |||||
| 63 | 63 | 63 | ||||||||
| 64 | 64 | 64 | ||||||||
| 65 | package org.apache.catalina.connector.http; | 65 | package org.apache.catalina.connector.http; | 65 | package org.apache.catalina.connector.http; | |||||
| 66 | 66 | 66 | ||||||||
| 67 | 67 | 67 | ||||||||
| 68 | import org.apache.catalina.Globals; | |||||||||
| 69 | ||||||||||
| 70 | ||||||||||
| 71 | /** | 68 | /** | 68 | /** | |||||
| 72 | * Static constants for this package. | 69 | * Static constants for this package. | 69 | * Static constants for this package. | |||||
| 70 | * | 70 | * | |||||||
| 71 | * @deprecated | 71 | * @deprecated | |||||||
| 73 | */ | 72 | */ | 72 | */ | |||||
| 74 | ||||||||||
| 75 | public final class Constants { | 73 | public final class Constants { | 73 | public final class Constants { | |||||
| 76 | 74 | 74 | ||||||||
| 77 | public static final String Package = "org.apache.catalina.connector.http"; | 75 | public static final String Package = "org.apache.catalina.connector.http"; | 75 | public static final String Package = "org.apache.catalina.connector.http"; | |||||
| 78 | public static final String ServerInfo = | |||||||||
| 79 | Globals.SERVER_INFO + " (HTTP/1.1 Connector)"; | |||||||||
| 80 | public static final int DEFAULT_CONNECTION_TIMEOUT = 60000; | 76 | public static final int DEFAULT_CONNECTION_TIMEOUT = 60000; | 76 | public static final int DEFAULT_CONNECTION_TIMEOUT = 60000; | |||||
| 81 | 77 | 77 | ||||||||
| 82 | public static final int PROCESSOR_IDLE = 0; | 78 | public static final int PROCESSOR_IDLE = 0; | 78 | public static final int PROCESSOR_IDLE = 0; | |||||
| 83 | public static final int PROCESSOR_ACTIVE = 1; | 79 | public static final int PROCESSOR_ACTIVE = 1; | 79 | public static final int PROCESSOR_ACTIVE = 1; | |||||
| 84 | 80 | 80 | ||||||||
| 85 | } | 81 | } | 81 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.