From 5d9435d2da4d8974602cdc1fc453955624c9ede2 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 26 Jul 2000 13:28:26 +0000
Subject: [PATCH] Removed the deprecated versions of Path and
 EnumeratedAttribute.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267844 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      | 12 ++--
 .../apache/tools/ant/EnumeratedAttribute.java | 62 ----------------
 src/main/org/apache/tools/ant/Path.java       | 71 -------------------
 3 files changed, 6 insertions(+), 139 deletions(-)
 delete mode 100644 src/main/org/apache/tools/ant/EnumeratedAttribute.java
 delete mode 100644 src/main/org/apache/tools/ant/Path.java

diff --git a/WHATSNEW b/WHATSNEW
index 17a95d74d..6a8388a00 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,12 +1,15 @@
 Changes from Ant 1.1 to the current sources
 
-Changes that could break older buildfiles:
-------------------------------------------
+Changes that could break older environments:
+--------------------------------------------
 
 * copying of support files in <javac> has been removed.
 
 * the command line switches _not_ starting with - have been removed.
 
+* Path and EnumeratedAttribute have been moved from
+org.apache.tools.ant to org.apache.tools.ant.types.
+
 Other changes:
 --------------
 
@@ -19,16 +22,13 @@ specified.
 * <style> will create the necessary target directories and reprocess
 all files if the stylesheet changes.
 
-* Path and EnumeratedAttribute moved to a new package
-org.apache.tools.ant.types.
-
 * New data types fileset and patternset - expected to get a broader
 use, pending documentation.
 
 * You can specify environment variables to the exec task - pending
 documentation.
 
-* Get can check wether a remote file is actually newer than a local
+* Get can check whether a remote file is actually newer than a local
 copy before it starts a download (HTTP only).
 
 * Added a -logger option to allow the class which performs logging to be 
diff --git a/src/main/org/apache/tools/ant/EnumeratedAttribute.java b/src/main/org/apache/tools/ant/EnumeratedAttribute.java
deleted file mode 100644
index a7b3826df..000000000
--- a/src/main/org/apache/tools/ant/EnumeratedAttribute.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    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
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package org.apache.tools.ant;
-
-/**
- * This class has been moved to org.apache.tools.ant.types.
- *
- * @deprecated This class has been moved to org.apache.tools.ant.types.
- */
-public abstract class EnumeratedAttribute {}
diff --git a/src/main/org/apache/tools/ant/Path.java b/src/main/org/apache/tools/ant/Path.java
deleted file mode 100644
index e5ba3e77e..000000000
--- a/src/main/org/apache/tools/ant/Path.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    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
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package org.apache.tools.ant;
-
-/**
- * This class has been moved to org.apache.tools.ant.types.
- *
- * @deprecated This class has been moved to org.apache.tools.ant.types.
- */
-
-public class Path extends org.apache.tools.ant.types.Path {
-    public Path(Project p, String path) {
-        super(p, path);
-    }
-
-    public Path(Project p) {
-        super(p);
-    }
-}