diff --git a/java/src/org/apache/xml/resolver/Catalog.java b/java/src/org/apache/xml/resolver/Catalog.java index ec02b10..5f12324 100644 --- a/java/src/org/apache/xml/resolver/Catalog.java +++ b/java/src/org/apache/xml/resolver/Catalog.java @@ -1,10 +1,9 @@ // Catalog.java - Represents OASIS Open Catalog files. -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/CatalogEntry.java b/java/src/org/apache/xml/resolver/CatalogEntry.java index 6573c9a..7490db0 100644 --- a/java/src/org/apache/xml/resolver/CatalogEntry.java +++ b/java/src/org/apache/xml/resolver/CatalogEntry.java @@ -1,10 +1,9 @@ // CatalogEntry.java - Represents Catalog entries -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/CatalogException.java b/java/src/org/apache/xml/resolver/CatalogException.java index df6aad9..9bd6d8f 100644 --- a/java/src/org/apache/xml/resolver/CatalogException.java +++ b/java/src/org/apache/xml/resolver/CatalogException.java @@ -1,10 +1,9 @@ // CatalogException.java - Catalog exception -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/CatalogManager.java b/java/src/org/apache/xml/resolver/CatalogManager.java index a4cbfab..34022bd 100644 --- a/java/src/org/apache/xml/resolver/CatalogManager.java +++ b/java/src/org/apache/xml/resolver/CatalogManager.java @@ -1,10 +1,9 @@ // CatalogManager.java - Access CatalogManager.properties -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/LICENSE b/java/src/org/apache/xml/resolver/LICENSE.resolver.txt similarity index 82% rename from java/src/org/apache/xml/resolver/LICENSE rename to java/src/org/apache/xml/resolver/LICENSE.resolver.txt index 558c10d..9bd360f 100644 --- a/java/src/org/apache/xml/resolver/LICENSE +++ b/java/src/org/apache/xml/resolver/LICENSE.resolver.txt @@ -1,8 +1,10 @@ -/* +xml-commons/LICENSE.txt $Id$ +See README.txt for additional licensing information. + +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,7 +12,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -18,15 +20,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -48,10 +50,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ - diff --git a/java/src/org/apache/xml/resolver/Resolver.java b/java/src/org/apache/xml/resolver/Resolver.java index 7236d0e..621f50c 100644 --- a/java/src/org/apache/xml/resolver/Resolver.java +++ b/java/src/org/apache/xml/resolver/Resolver.java @@ -1,10 +1,9 @@ // Resolver.java - Represents an extension of OASIS Open Catalog files. -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/apps/XParseError.java b/java/src/org/apache/xml/resolver/apps/XParseError.java index ba1ceae..9dbbe11 100644 --- a/java/src/org/apache/xml/resolver/apps/XParseError.java +++ b/java/src/org/apache/xml/resolver/apps/XParseError.java @@ -1,10 +1,9 @@ // XParseError.java - An error handler for xparse -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/apps/resolver.java b/java/src/org/apache/xml/resolver/apps/resolver.java index 846674b..3003bad 100644 --- a/java/src/org/apache/xml/resolver/apps/resolver.java +++ b/java/src/org/apache/xml/resolver/apps/resolver.java @@ -1,10 +1,9 @@ // resolver.java - A simple command-line test tool for the resolver -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/apps/xparse.java b/java/src/org/apache/xml/resolver/apps/xparse.java index c8cba07..7ea071c 100644 --- a/java/src/org/apache/xml/resolver/apps/xparse.java +++ b/java/src/org/apache/xml/resolver/apps/xparse.java @@ -1,10 +1,9 @@ // xparse.java - A simple command-line XML parser -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/apps/xread.java b/java/src/org/apache/xml/resolver/apps/xread.java index 02ff22c..3c7717b 100644 --- a/java/src/org/apache/xml/resolver/apps/xread.java +++ b/java/src/org/apache/xml/resolver/apps/xread.java @@ -1,10 +1,9 @@ // xread.java - A simple command-line XML parser -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/helpers/BootstrapResolver.java b/java/src/org/apache/xml/resolver/helpers/BootstrapResolver.java index e90cf0a..72d3aba 100644 --- a/java/src/org/apache/xml/resolver/helpers/BootstrapResolver.java +++ b/java/src/org/apache/xml/resolver/helpers/BootstrapResolver.java @@ -1,10 +1,9 @@ // BootstrapResolver.java - Resolve entities and URIs internally -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/helpers/Debug.java b/java/src/org/apache/xml/resolver/helpers/Debug.java index 95d3b71..caed0c8 100644 --- a/java/src/org/apache/xml/resolver/helpers/Debug.java +++ b/java/src/org/apache/xml/resolver/helpers/Debug.java @@ -1,10 +1,9 @@ // Debug.java - Print debug messages -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/helpers/Namespaces.java b/java/src/org/apache/xml/resolver/helpers/Namespaces.java index a7eecb9..f8a6c7b 100644 --- a/java/src/org/apache/xml/resolver/helpers/Namespaces.java +++ b/java/src/org/apache/xml/resolver/helpers/Namespaces.java @@ -1,10 +1,9 @@ // Namespaces.java - Analyze namespace nodes in a DOM tree -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/helpers/PublicId.java b/java/src/org/apache/xml/resolver/helpers/PublicId.java index c559ef6..dd1df70 100644 --- a/java/src/org/apache/xml/resolver/helpers/PublicId.java +++ b/java/src/org/apache/xml/resolver/helpers/PublicId.java @@ -1,10 +1,9 @@ // PublicId.java - Information about public identifiers -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/CatalogReader.java b/java/src/org/apache/xml/resolver/readers/CatalogReader.java index 11aa76d..b16f397 100644 --- a/java/src/org/apache/xml/resolver/readers/CatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/CatalogReader.java @@ -1,10 +1,9 @@ // CatalogReader.java - An interface for reading catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/DOMCatalogParser.java b/java/src/org/apache/xml/resolver/readers/DOMCatalogParser.java index d4ec7c3..b590ac7 100644 --- a/java/src/org/apache/xml/resolver/readers/DOMCatalogParser.java +++ b/java/src/org/apache/xml/resolver/readers/DOMCatalogParser.java @@ -1,10 +1,9 @@ // DOMCatalogParser.java - An interface for reading catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java b/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java index ecb0559..01bf69a 100644 --- a/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/DOMCatalogReader.java @@ -1,10 +1,9 @@ // DOMCatalogReader.java - Read XML Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java b/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java index 1300d7c..2a95857 100644 --- a/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/ExtendedXMLCatalogReader.java @@ -1,10 +1,9 @@ // ExtendedXMLCatalogReader.java - Read XML Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java b/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java index 42ea04e..289cf3e 100644 --- a/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/OASISXMLCatalogReader.java @@ -1,10 +1,9 @@ // OASISXMLCatalogReader.java - Read XML Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/SAXCatalogParser.java b/java/src/org/apache/xml/resolver/readers/SAXCatalogParser.java index ee5fec9..2cd4b18 100644 --- a/java/src/org/apache/xml/resolver/readers/SAXCatalogParser.java +++ b/java/src/org/apache/xml/resolver/readers/SAXCatalogParser.java @@ -1,10 +1,9 @@ // SAXCatalogParser.java - An interface for reading catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java b/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java index 77c980b..1c3cb20 100644 --- a/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/SAXCatalogReader.java @@ -1,10 +1,9 @@ // SAXCatalogReader.java - Read XML Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/SAXParserHandler.java b/java/src/org/apache/xml/resolver/readers/SAXParserHandler.java index c289171..7df1c23 100644 --- a/java/src/org/apache/xml/resolver/readers/SAXParserHandler.java +++ b/java/src/org/apache/xml/resolver/readers/SAXParserHandler.java @@ -1,10 +1,9 @@ // SAXParserHandler.java - An entity-resolving DefaultHandler -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java b/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java index 820ef90..3dba3a0 100644 --- a/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/TR9401CatalogReader.java @@ -1,10 +1,9 @@ // TR9401CatalogReader.java - Read OASIS Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java b/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java index e42fc5d..96f7876 100644 --- a/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/TextCatalogReader.java @@ -1,10 +1,9 @@ // TextCatalogReader.java - Read text/plain Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/readers/XCatalogReader.java b/java/src/org/apache/xml/resolver/readers/XCatalogReader.java index a66c28f..0fcbfd9 100644 --- a/java/src/org/apache/xml/resolver/readers/XCatalogReader.java +++ b/java/src/org/apache/xml/resolver/readers/XCatalogReader.java @@ -1,10 +1,9 @@ // XCatalogReader.java - Read XML Catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/tools/CatalogResolver.java b/java/src/org/apache/xml/resolver/tools/CatalogResolver.java index b8a7a49..a79d248 100644 --- a/java/src/org/apache/xml/resolver/tools/CatalogResolver.java +++ b/java/src/org/apache/xml/resolver/tools/CatalogResolver.java @@ -1,10 +1,9 @@ // CatalogResolver.java - A SAX EntityResolver/JAXP URI Resolver -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/tools/ResolvingParser.java b/java/src/org/apache/xml/resolver/tools/ResolvingParser.java index a9d829a..35346ac 100644 --- a/java/src/org/apache/xml/resolver/tools/ResolvingParser.java +++ b/java/src/org/apache/xml/resolver/tools/ResolvingParser.java @@ -1,10 +1,9 @@ // ResolvingParser.java - An interface for reading catalog files -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java b/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java index 97e9ebc..9af96ec 100644 --- a/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java +++ b/java/src/org/apache/xml/resolver/tools/ResolvingXMLFilter.java @@ -1,10 +1,9 @@ // ResolvingXMLFilter.java - An XMLFilter that performs catalog resolution -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java b/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java index fec42b7..df5315b 100644 --- a/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java +++ b/java/src/org/apache/xml/resolver/tools/ResolvingXMLReader.java @@ -1,10 +1,9 @@ // ResolvingXMLReader.java - An XMLReader that performs catalog resolution -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/tests/resolver/src/DynamicTest.java b/java/tests/resolver/src/DynamicTest.java index 294d580..6d701ea 100644 --- a/java/tests/resolver/src/DynamicTest.java +++ b/java/tests/resolver/src/DynamicTest.java @@ -1,10 +1,9 @@ // ManagerTest.java - A test of multiple Catalog Managers -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/tests/resolver/src/ExtendedTest.java b/java/tests/resolver/src/ExtendedTest.java index a4b8180..b28398b 100644 --- a/java/tests/resolver/src/ExtendedTest.java +++ b/java/tests/resolver/src/ExtendedTest.java @@ -1,10 +1,9 @@ // ManagerTest.java - A test of multiple Catalog Managers -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/tests/resolver/src/JarTest.java b/java/tests/resolver/src/JarTest.java index 6539d5f..91603f1 100644 --- a/java/tests/resolver/src/JarTest.java +++ b/java/tests/resolver/src/JarTest.java @@ -1,10 +1,9 @@ // ManagerTest.java - A test of multiple Catalog Managers -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/tests/resolver/src/StaticTest.java b/java/tests/resolver/src/StaticTest.java index 7343732..b8db566 100644 --- a/java/tests/resolver/src/StaticTest.java +++ b/java/tests/resolver/src/StaticTest.java @@ -1,10 +1,9 @@ // ManagerTest.java - A test of multiple Catalog Managers -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */ diff --git a/java/tests/resolver/src/TestParser.java b/java/tests/resolver/src/TestParser.java index 59fc7ed..1338ee9 100644 --- a/java/tests/resolver/src/TestParser.java +++ b/java/tests/resolver/src/TestParser.java @@ -1,10 +1,9 @@ // ManagerTest.java - A test of multiple Catalog Managers -/* +/* ==================================================================== * The Apache Software License, Version 1.1 * - * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -12,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in @@ -20,15 +19,15 @@ * distribution. * * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: + * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Xalan" and "Apache Software Foundation" must + * 4. The names "Apache" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this - * software without prior written permission. For written + * software without prior written permission. For written * permission, please contact apache@apache.org. * * 5. Products derived from this software may not be called "Apache", @@ -50,9 +49,7 @@ * ==================================================================== * * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation and was - * originally based on software copyright (c) 2001, International - * Business Machines Corporation., http://www.ibm.com. For more + * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * . */