conor 2003/07/04 07:04:56
Modified: src/main/org/apache/tools/ant ComponentHelper.java
Project.java TaskContainer.java TypeAdapter.java
src/main/org/apache/tools/ant/filters TokenFilter.java
src/main/org/apache/tools/ant/helper ProjectHelper2.java
src/main/org/apache/tools/ant/launch AntMain.java
Launcher.java Locator.java
src/main/org/apache/tools/ant/taskdefs DefaultExcludes.java
Expand.java Move.java SubAnt.java Taskdef.java
TempFile.java WhichResource.java
src/main/org/apache/tools/ant/taskdefs/optional/clearcase
CCMklabel.java CCMklbtype.java CCRmtype.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
DotnetBaseMatchingTask.java DotnetDefine.java
DotnetResource.java ImportTypelib.java JSharp.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
WebsphereDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJImport.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
Jasper41Mangler.java
src/main/org/apache/tools/ant/taskdefs/optional/net
SetProxy.java
src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Labelsync.java P4Resolve.java
src/main/org/apache/tools/ant/taskdefs/optional/script
ScriptDef.java ScriptDefBase.java
src/main/org/apache/tools/ant/types Assertions.java
FilterChain.java PropertySet.java
ResourceLocation.java
src/main/org/apache/tools/ant/types/optional
ScriptFilter.java
src/main/org/apache/tools/ant/types/selectors
DifferentSelector.java MappingSelector.java
TypeSelector.java
src/main/org/apache/tools/ant/util UnPackageNameMapper.java
WeakishReference.java
src/main/org/apache/tools/ant/util/optional
WeakishReference12.java
Log:
Easy stuff - imports and licence headers
Revision Changes Path
1.16 +20 -27 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
--- ComponentHelper.java 4 Jul 2003 09:35:31 -0000 1.15
+++ ComponentHelper.java 4 Jul 2003 14:04:52 -0000 1.16
@@ -54,19 +54,12 @@
package org.apache.tools.ant;
-import org.apache.tools.ant.util.LazyHashtable;
import org.apache.tools.ant.util.WeakishReference;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Properties;
-import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Vector;
import java.io.InputStream;
1.142 +4 -6 ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -w -u -r1.141 -r1.142
--- Project.java 26 Jun 2003 08:54:28 -0000 1.141
+++ Project.java 4 Jul 2003 14:04:53 -0000 1.142
@@ -73,8 +73,6 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
-import org.apache.tools.ant.util.WeakishReference;
-import org.apache.tools.ant.util.LazyHashtable;
/**
* Central representation of an Ant project. This class defines an
1.6 +1 -1 ant/src/main/org/apache/tools/ant/TaskContainer.java
Index: TaskContainer.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/TaskContainer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
1.2 +4 -6 ant/src/main/org/apache/tools/ant/TypeAdapter.java
Index: TypeAdapter.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/TypeAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- TypeAdapter.java 26 Jun 2003 08:54:28 -0000 1.1
+++ TypeAdapter.java 4 Jul 2003 14:04:53 -0000 1.2
@@ -54,8 +54,6 @@
package org.apache.tools.ant;
-import java.lang.reflect.Method;
-
/**
* Used to wrap types.
*
1.7 +7 -10
ant/src/main/org/apache/tools/ant/filters/TokenFilter.java
Index: TokenFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/TokenFilter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
--- TokenFilter.java 26 Jun 2003 16:45:05 -0000 1.6
+++ TokenFilter.java 4 Jul 2003 14:04:53 -0000 1.7
@@ -55,14 +55,11 @@
import java.io.IOException;
import java.io.Reader;
-import java.util.Hashtable;
import java.util.Vector;
import java.util.Enumeration;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Parameter;
import org.apache.tools.ant.types.RegularExpression;
import org.apache.tools.ant.types.Substitution;
import org.apache.tools.ant.util.FileUtils;
1.20 +1 -2
ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
--- ProjectHelper2.java 3 May 2003 14:30:26 -0000 1.19
+++ ProjectHelper2.java 4 Jul 2003 14:04:53 -0000 1.20
@@ -61,7 +61,6 @@
import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
import java.util.Stack;
-import java.util.Locale;
import org.xml.sax.Locator;
import org.xml.sax.InputSource;
1.2 +2 -2 ant/src/main/org/apache/tools/ant/launch/AntMain.java
Index: AntMain.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/AntMain.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- AntMain.java 27 Jun 2003 11:19:22 -0000 1.1
+++ AntMain.java 4 Jul 2003 14:04:53 -0000 1.2
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
1.2 +16 -16 ant/src/main/org/apache/tools/ant/launch/Launcher.java
Index: Launcher.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Launcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- Launcher.java 27 Jun 2003 11:19:22 -0000 1.1
+++ Launcher.java 4 Jul 2003 14:04:53 -0000 1.2
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
1.2 +13 -13 ant/src/main/org/apache/tools/ant/launch/Locator.java
Index: Locator.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Locator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- Locator.java 27 Jun 2003 11:19:22 -0000 1.1
+++ Locator.java 4 Jul 2003 14:04:53 -0000 1.2
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
1.2 +7 -7
ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java
Index: DefaultExcludes.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/DefaultExcludes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- DefaultExcludes.java 9 May 2003 12:10:36 -0000 1.1
+++ DefaultExcludes.java 4 Jul 2003 14:04:54 -0000 1.2
@@ -58,7 +58,7 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+
/**
* Alters the default excludes for the <strong>entire</strong> build..
*
1.46 +4 -5 ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -w -u -r1.45 -r1.46
--- Expand.java 3 Jul 2003 13:02:01 -0000 1.45
+++ Expand.java 4 Jul 2003 14:04:54 -0000 1.46
@@ -55,7 +55,6 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
1.36 +2 -3 ant/src/main/org/apache/tools/ant/taskdefs/Move.java
Index: Move.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -u -r1.35 -r1.36
--- Move.java 19 May 2003 15:21:15 -0000 1.35
+++ Move.java 4 Jul 2003 14:04:54 -0000 1.36
@@ -59,7 +59,6 @@
import java.util.Enumeration;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
1.5 +3 -6 ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
Index: SubAnt.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- SubAnt.java 22 May 2003 07:27:50 -0000 1.4
+++ SubAnt.java 4 Jul 2003 14:04:54 -0000 1.5
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,8 +23,8 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "Ant" and "Apache Software Foundation"
- * must not be used to endorse or promote products derived
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
*
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs;
import java.io.File;
@@ -71,8 +70,6 @@
import org.apache.tools.ant.types.PropertySet;
import org.apache.tools.ant.types.Reference;
-import org.apache.tools.ant.taskdefs.Ant;
-import org.apache.tools.ant.taskdefs.Property;
/**
* <i>EXPERIMENTAL:</i> This task is experimental and may be under continual
1.28 +1 -2 ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
Index: Taskdef.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Taskdef.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -u -r1.27 -r1.28
--- Taskdef.java 26 Jun 2003 08:54:29 -0000 1.27
+++ Taskdef.java 4 Jul 2003 14:04:54 -0000 1.28
@@ -54,7 +54,6 @@
package org.apache.tools.ant.taskdefs;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.TaskAdapter;
1.7 +53 -53 ant/src/main/org/apache/tools/ant/taskdefs/TempFile.java
Index: TempFile.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/TempFile.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
--- TempFile.java 10 Feb 2003 14:13:36 -0000 1.6
+++ TempFile.java 4 Jul 2003 14:04:54 -0000 1.7
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +50 -51
ant/src/main/org/apache/tools/ant/taskdefs/WhichResource.java
Index: WhichResource.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/WhichResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- WhichResource.java 10 Feb 2003 14:13:36 -0000 1.2
+++ WhichResource.java 4 Jul 2003 14:04:54 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,6 @@
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.types.Path;
1.2 +0 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java
Index: CCMklabel.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- CCMklabel.java 14 Apr 2003 18:42:16 -0000 1.1
+++ CCMklabel.java 4 Jul 2003 14:04:55 -0000 1.2
@@ -56,9 +56,6 @@
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-
-import java.io.File;
/**
* Task to perform mklabel command to ClearCase.
1.2 +0 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java
Index: CCMklbtype.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- CCMklbtype.java 14 Apr 2003 18:42:16 -0000 1.1
+++ CCMklbtype.java 4 Jul 2003 14:04:55 -0000 1.2
@@ -56,9 +56,6 @@
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-
-import java.io.File;
/**
* Task to perform mklbtype command to ClearCase.
1.2 +0 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java
Index: CCRmtype.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- CCRmtype.java 14 Apr 2003 18:42:16 -0000 1.1
+++ CCRmtype.java 4 Jul 2003 14:04:55 -0000 1.2
@@ -56,9 +56,6 @@
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Path;
-
-import java.io.File;
/**
* Task to perform rmtype command to ClearCase.
1.3 +49 -50
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java
Index: DotnetBaseMatchingTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- DotnetBaseMatchingTask.java 11 Mar 2003 06:07:37 -0000 1.2
+++ DotnetBaseMatchingTask.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs.optional.dotnet;
1.2 +49 -50
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java
Index: DotnetDefine.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- DotnetDefine.java 11 Mar 2003 06:07:37 -0000 1.1
+++ DotnetDefine.java 4 Jul 2003 14:04:55 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs.optional.dotnet;
import org.apache.tools.ant.BuildException;
1.2 +52 -53
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java
Index: DotnetResource.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- DotnetResource.java 11 Mar 2003 06:07:37 -0000 1.1
+++ DotnetResource.java 4 Jul 2003 14:04:55 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
-* Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
-* 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs.optional.dotnet;
import org.apache.tools.ant.BuildException;
1.3 +49 -50
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
Index: ImportTypelib.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- ImportTypelib.java 20 Jun 2003 19:33:51 -0000 1.2
+++ ImportTypelib.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs.optional.dotnet;
1.3 +49 -51
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java
Index: JSharp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- JSharp.java 20 Jun 2003 19:33:51 -0000 1.2
+++ JSharp.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -51,8 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
-
package org.apache.tools.ant.taskdefs.optional.dotnet;
import org.apache.tools.ant.BuildException;
1.23 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
Index: WebsphereDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
--- WebsphereDeploymentTool.java 3 Jul 2003 21:48:06 -0000 1.22
+++ WebsphereDeploymentTool.java 4 Jul 2003 14:04:55 -0000 1.23
@@ -66,7 +66,6 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Java;
-import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.Environment;
import org.apache.tools.ant.types.Path;
1.20 +0 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
Index: VAJImport.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
--- VAJImport.java 6 May 2003 15:19:17 -0000 1.19
+++ VAJImport.java 4 Jul 2003 14:04:55 -0000 1.20
@@ -54,7 +54,6 @@
package org.apache.tools.ant.taskdefs.optional.ide;
-import java.lang.reflect.Field;
import java.util.Enumeration;
import java.util.Vector;
import org.apache.tools.ant.BuildException;
1.3 +49 -50
ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java
Index: Jasper41Mangler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- Jasper41Mangler.java 10 Feb 2003 14:14:11 -0000 1.2
+++ Jasper41Mangler.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs.optional.jsp;
1.13 +15 -16
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
Index: SetProxy.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
--- SetProxy.java 22 Apr 2003 07:35:15 -0000 1.12
+++ SetProxy.java 4 Jul 2003 14:04:55 -0000 1.13
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs.optional.net;
import java.lang.reflect.InvocationTargetException;
1.3 +0 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java
Index: P4Labelsync.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- P4Labelsync.java 26 May 2003 06:17:47 -0000 1.2
+++ P4Labelsync.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -59,8 +59,6 @@
package org.apache.tools.ant.taskdefs.optional.perforce;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.util.StringUtils;
1.5 +53 -53
ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java
Index: P4Resolve.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- P4Resolve.java 10 Feb 2003 14:14:19 -0000 1.4
+++ P4Resolve.java 4 Jul 2003 14:04:55 -0000 1.5
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
-* Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +64 -67
ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
Index: ScriptDef.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- ScriptDef.java 18 Jun 2003 13:02:12 -0000 1.2
+++ ScriptDef.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -57,8 +57,6 @@
import org.apache.tools.ant.MagicNames;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.RuntimeConfigurable;
-import org.apache.tools.ant.UnknownElement;
import java.util.Map;
import java.util.HashMap;
@@ -67,7 +65,6 @@
import java.util.Iterator;
import java.util.Set;
import java.util.HashSet;
-import java.util.Locale;
import org.apache.bsf.BSFException;
import org.apache.bsf.BSFManager;
1.3 +13 -14
ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java
Index: ScriptDefBase.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- ScriptDefBase.java 18 Jun 2003 13:02:12 -0000 1.2
+++ ScriptDefBase.java 4 Jul 2003 14:04:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
@@ -54,7 +54,6 @@
package org.apache.tools.ant.taskdefs.optional.script;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.MagicNames;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DynamicConfigurator;
1.2 +50 -50 ant/src/main/org/apache/tools/ant/types/Assertions.java
Index: Assertions.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- Assertions.java 13 Jun 2003 05:16:36 -0000 1.1
+++ Assertions.java 4 Jul 2003 14:04:56 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "Ant" 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 [EMAIL PROTECTED]
1.12 +5 -10 ant/src/main/org/apache/tools/ant/types/FilterChain.java
Index: FilterChain.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterChain.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- FilterChain.java 28 May 2003 16:27:36 -0000 1.11
+++ FilterChain.java 4 Jul 2003 14:04:56 -0000 1.12
@@ -54,9 +54,6 @@
package org.apache.tools.ant.types;
import java.util.Vector;
-import java.io.StringWriter;
-import java.io.Reader;
-import java.io.IOException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.filters.ChainableReader;
@@ -74,8 +71,6 @@
import org.apache.tools.ant.filters.TabsToSpaces;
import org.apache.tools.ant.filters.TailFilter;
import org.apache.tools.ant.filters.TokenFilter;
-import org.apache.tools.ant.filters.BaseFilterReader;
-import org.apache.tools.ant.taskdefs.Concat;
/**
1.5 +3 -7 ant/src/main/org/apache/tools/ant/types/PropertySet.java
Index: PropertySet.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/PropertySet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- PropertySet.java 14 May 2003 12:49:14 -0000 1.4
+++ PropertySet.java 4 Jul 2003 14:04:56 -0000 1.5
@@ -54,8 +54,6 @@
package org.apache.tools.ant.types;
-import java.io.File;
-import java.io.IOException;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
@@ -64,8 +62,6 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Property;
import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.regexp.RegexpMatcher;
import org.apache.tools.ant.util.regexp.RegexpMatcherFactory;
1.5 +3 -6
ant/src/main/org/apache/tools/ant/types/ResourceLocation.java
Index: ResourceLocation.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/ResourceLocation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- ResourceLocation.java 10 Feb 2003 14:14:31 -0000 1.4
+++ ResourceLocation.java 4 Jul 2003 14:04:56 -0000 1.5
@@ -77,9 +77,6 @@
* @version $Id$
* @since Ant 1.6
*/
-
-import java.net.URL;
-
public class ResourceLocation {
//-- Fields
----------------------------------------------------------------
1.3 +0 -2
ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
Index: ScriptFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- ScriptFilter.java 28 May 2003 16:27:36 -0000 1.2
+++ ScriptFilter.java 4 Jul 2003 14:04:56 -0000 1.3
@@ -62,8 +62,6 @@
import org.apache.bsf.BSFException;
import org.apache.bsf.BSFManager;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
/**
1.6 +49 -49
ant/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java
Index: DifferentSelector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/DifferentSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- DifferentSelector.java 25 May 2003 09:43:53 -0000 1.5
+++ DifferentSelector.java 4 Jul 2003 14:04:56 -0000 1.6
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +49 -49
ant/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java
Index: MappingSelector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/MappingSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- MappingSelector.java 10 Feb 2003 14:14:35 -0000 1.3
+++ MappingSelector.java 4 Jul 2003 14:04:56 -0000 1.4
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +0 -4
ant/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java
Index: TypeSelector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/selectors/TypeSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- TypeSelector.java 26 May 2003 06:17:47 -0000 1.2
+++ TypeSelector.java 4 Jul 2003 14:04:56 -0000 1.3
@@ -54,12 +54,8 @@
package org.apache.tools.ant.types.selectors;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Parameter;
/**
1.2 +2 -2
ant/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java
Index: UnPackageNameMapper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/UnPackageNameMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- UnPackageNameMapper.java 16 Jun 2003 09:28:28 -0000 1.1
+++ UnPackageNameMapper.java 4 Jul 2003 14:04:56 -0000 1.2
@@ -54,7 +54,7 @@
package org.apache.tools.ant.util;
import java.io.File;
-import org.apache.tools.ant.util.GlobPatternMapper;
+
/**
* Maps dotted package name matches to a directory name.
* This is the inverse of the package mapper.
1.9 +49 -49
ant/src/main/org/apache/tools/ant/util/WeakishReference.java
Index: WeakishReference.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/WeakishReference.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- WeakishReference.java 22 Apr 2003 07:35:17 -0000 1.8
+++ WeakishReference.java 4 Jul 2003 14:04:56 -0000 1.9
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +49 -49
ant/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java
Index: WeakishReference12.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/optional/WeakishReference12.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- WeakishReference12.java 10 Feb 2003 14:14:41 -0000 1.2
+++ WeakishReference12.java 4 Jul 2003 14:04:56 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]