-compiler) to use
-
*/
-
public void setCompiler(String compiler) {
-
this.compiler = compiler;
-
}
-
-
/**
-
* Set the rebuild flag to false to only update changes in the
-
* jar rather than rerunning ejbdeploy
-
*/
-
public void setRebuild(boolean rebuild) {
-
this.alwaysRebuild = rebuild;
-
}
-
-
-
/**
-
* Setter used to store the suffix for the generated websphere jar file.
-
* @param inString the string to use as the suffix.
-
*/
-
public void setSuffix(String inString) {
-
this.jarSuffix = inString;
-
}
-
-
/**
-
* Setter used to store the value of keepGeneric
-
* @param inValue a string, either 'true' or 'false'.
-
*/
-
public void setKeepgeneric(boolean inValue) {
-
this.keepGeneric = inValue;
-
}
-
-
/**
-
* Sets whether -keepgenerated is passed to ejbdeploy (that is,
-
* the .java source files are kept).
-
* @param inValue either 'true' or 'false'
-
*/
-
public void setKeepgenerated(String inValue) {
-
this.keepgenerated = Boolean.valueOf(inValue).booleanValue();
-
}
-
-
/**
-
* Decide, wether ejbdeploy should be called or not
-
* @param ejbdeploy
-
*/
-
public void setEjbdeploy(boolean ejbdeploy) {
-
this.ejbdeploy = ejbdeploy;
-
}
-
-
/**
-
* sets some additional args to send to ejbdeploy.
-
*/
-
public void setArgs(String args) {
-
this.additionalArgs = args;
-
}
-
-
/**
-
* Setter used to store the location of the Sun's Generic EJB DTD.
-
* This can be a file on the system or a resource on the classpath.
-
* @param inString the string to use as the DTD location.
-
*/
-
public void setEJBdtd(String inString) {
-
this.ejb11DTD = inString;
-
}
-
-
/**
-
* Set the value of the oldCMP scheme. This is an antonym for
-
* newCMP
-
*/
-
public void setOldCMP(boolean oldCMP) {
-
this.newCMP = !oldCMP;
-
}
-
-
/**
-
* Set the value of the newCMP scheme. The old CMP scheme locates the
-
* websphere CMP descriptor based on the naming convention where the
-
* websphere CMP file is expected to be named with the bean name as the prefix.
-
*
-
* Under this scheme the name of the CMP descriptor does not match the name
-
* actually used in the main websphere EJB descriptor. Also, descriptors which
-
* contain multiple CMP references could not be used.
-
*
-
*/
-
public void setNewCMP(boolean newCMP) {
-
this.newCMP = newCMP;
-
}
-
-
/**
-
* Sets the temporary directory for the ejbdeploy task
-
*/
-
public void setTempdir(String tempdir) {
-
this.tempdir = tempdir;
-
}
-
-
protected DescriptorHandler getDescriptorHandler(File srcDir) {
-
DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir);
-
// register all the DTDs, both the ones that are known and
-
// any supplied by the user
-
handler.registerDTD(PUBLICID_EJB11, ejb11DTD);
-
-
for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-
EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation)i.next();
-
handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
-
}
-
-
return handler;
-
}
-
-
protected DescriptorHandler getWebsphereDescriptorHandler(final File srcDir) {
-
DescriptorHandler handler = new DescriptorHandler(getTask(), srcDir) {
-
protected void processElement() {
-
}
-
};
-
-
for (Iterator i = getConfig().dtdLocations.iterator(); i.hasNext();) {
-
EjbJar.DTDLocation dtdLocation = (EjbJar.DTDLocation)i.next();
-
handler.registerDTD(dtdLocation.getPublicId(), dtdLocation.getLocation());
-
}
-
return handler;
-
}
-
-
/**
-
* Add any vendor specific files which should be included in the
-
* EJB Jar.
-
*/
-
protected void addVendorFiles(Hashtable ejbFiles, String baseName) {
-
-
String ddPrefix = (usingBaseJarName() ? "" : baseName);
-
String dbPrefix = (dbVendor == null)? "": dbVendor + "-";
-
-
// Get the Extensions document
-
File websphereEXT = new File(getConfig().descriptorDir, ddPrefix + WAS_EXT);
-
if (websphereEXT.exists()) {
-
ejbFiles.put(META_DIR + WAS_EXT,
-
websphereEXT);
-
} else {
-
log("Unable to locate websphere extensions. It was expected to be in " +
-
websphereEXT.getPath(), Project.MSG_VERBOSE);
-
}
-
-
File websphereBND = new File(getConfig().descriptorDir, ddPrefix + WAS_BND);
-
if (websphereBND.exists()) {
-
ejbFiles.put(META_DIR + WAS_BND,
-
websphereBND);
-
}else {
-
log("Unable to locate websphere bindings. It was expected to be in " +
-
websphereBND.getPath(), Project.MSG_VERBOSE);
-
}
-
-
if (!newCMP) {
-
log("The old method for locating CMP files has been DEPRECATED.", Project.MSG_VERBOSE);
-
log("Please adjust your websphere descriptor and set newCMP=\"true\" " +
-
"to use the new CMP descriptor inclusion mechanism. ", Project.MSG_VERBOSE);
-
}
-
else {
-
// We attempt to put in the MAP and Schema files of CMP beans
-
try
-
{
-
// Add the Map file
-
File websphereMAP = new File(getConfig().descriptorDir,
-
ddPrefix + dbPrefix + WAS_CMP_MAP);
-
if (websphereMAP.exists()) {
-
ejbFiles.put(META_DIR + WAS_CMP_MAP,
-
websphereMAP);
-
} else {
-
log("Unable to locate the websphere Map: " +
-
websphereMAP.getPath(), Project.MSG_VERBOSE);
-
}
-
File websphereSchema = new File(getConfig().descriptorDir,
-
ddPrefix + dbPrefix + WAS_CMP_SCHEMA);
-
if (websphereSchema.exists()) {
-
ejbFiles.put(META_DIR + SCHEMA_DIR + WAS_CMP_SCHEMA,
-
websphereSchema);
-
} else {
-
log("Unable to locate the websphere Schema: " +
-
websphereSchema.getPath(), Project.MSG_VERBOSE);
-
}
-
// Theres nothing else to see here...keep moving sonny
-
}
-
catch(Exception e)
-
{
-
String msg = "Exception while adding Vendor specific files: " +
-
e.toString();
-
throw new BuildException(msg, e);
-
}
-
}
-
}
-
-
/**
-
* Get the vendor specific name of the Jar that will be output. The modification date
-
* of this jar will be checked against the dependent bean classes.
-
*/
-
File getVendorOutputJarFile(String baseName) {
-
return new File(getDestDir(), baseName + jarSuffix);
-
}
-
-
/**
-
* Gets the options for the EJB Deploy operation
-
* @return String
-
*/
-
protected String getOptions() {
-
// Set the options
-
StringBuffer options = new StringBuffer();
-
if (dbVendor != null) {
-
options.append(" -dbvendor ").append(dbVendor);
-
}
-
if (dbName != null) {
-
options.append(" -dbname \"").append(dbName).append("\"");
-
}
-
-
if (dbSchema != null) {
-
options.append(" -dbschema \"").append(dbSchema).append("\"");
-
}
-
-
if (codegen) {
-
options.append(" -codegen");
-
}
-
-
if (quiet) {
-
options.append(" -quiet");
-
}
-
-
if (novalidate) {
-
options.append(" -novalidate");
-
}
-
-
if (nowarn) {
-
options.append(" -nowarn");
-
}
-
-
if (noinform) {
-
options.append(" -noinform");
-
}
-
-
if (trace) {
-
options.append(" -trace");
-
}
-
-
if (use35MappingRules) {
-
options.append(" -35");
-
}
-
-
if (rmicOptions != null) {
-
options.append(" -rmic \"").append(rmicOptions).append("\"");
-
}
-
-
return options.toString();
-
} // end getOptions
-
-
/**
-
* Helper method invoked by execute() for each websphere jar to be built.
-
* Encapsulates the logic of constructing a java task for calling
-
* websphere.ejbdeploy and executing it.
-
* @param sourceJar java.io.File representing the source (EJB1.1) jarfile.
-
* @param destJar java.io.File representing the destination, websphere
-
* jarfile.
-
*/
-
private void buildWebsphereJar(File sourceJar, File destJar) {
-
try {
-
if (ejbdeploy) {
-
String args =
-
" " + sourceJar.getPath() +
-
" " + tempdir +
-
" " + destJar.getPath() +
-
" " + getOptions();
-
-
if (getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0) {
-
args += " -cp " + getCombinedClasspath();
}
-
-
// Why do my ""'s get stripped away???
-
log("EJB Deploy Options: " + args, Project.MSG_VERBOSE);
-
-
Java javaTask = (Java)getTask().getProject().createTask("java");
-
// Set the JvmArgs
-
javaTask.createJvmarg().setValue("-Xms64m");
-
javaTask.createJvmarg().setValue("-Xmx128m");
-
-
// Set the Environment variable
-
Environment.Variable var = new Environment.Variable();
-
var.setKey("websphere.lib.dir");
-
var.setValue(getTask().getProject().getProperty("websphere.home") + "/lib");
-
javaTask.addSysproperty(var);
-
-
// Set the working directory
-
javaTask.setDir(new File(getTask().getProject().getProperty("websphere.home")));
-
-
// Set the Java class name
-
javaTask.setTaskName("ejbdeploy");
-
javaTask.setClassname("com.ibm.etools.ejbdeploy.EJBDeploy");
-
-
Commandline.Argument arguments = javaTask.createArg();
-
arguments.setLine(args);
-
-
Path classpath = wasClasspath;
-
if (classpath == null) {
-
classpath = getCombinedClasspath();
-
}
-
-
if (classpath != null) {
-
javaTask.setClasspath(classpath);
-
javaTask.setFork(true);
-
}
-
else {
-
javaTask.setFork(true);
-
}
-
-
log("Calling websphere.ejbdeploy for " + sourceJar.toString(),
-
Project.MSG_VERBOSE);
-
-
javaTask.execute();
-
}
-
}
-
catch (Exception e) {
-
// Have to catch this because of the semantics of calling main()
-
String msg = "Exception while calling ejbdeploy. Details: " + e.toString();
-
throw new BuildException(msg, e);
-
}
-
}
-
-
/**
-
* Method used to encapsulate the writing of the JAR file. Iterates over the
-
* filenames/java.io.Files in the Hashtable stored on the instance variable
-
* ejbFiles.
-
*/
-
protected void writeJar(String baseName, File jarFile, Hashtable files, String publicId)
-
throws BuildException
-
{
-
if (ejbdeploy) {
-
// create the -generic.jar, if required
-
File genericJarFile = super.getVendorOutputJarFile(baseName);
-
super.writeJar(baseName, genericJarFile, files, publicId);
-
-
// create the output .jar, if required
-
if (alwaysRebuild || isRebuildRequired(genericJarFile, jarFile)) {
-
buildWebsphereJar(genericJarFile, jarFile);
-
}
-
if (!keepGeneric) {
-
log("deleting generic jar " + genericJarFile.toString(),
-
Project.MSG_VERBOSE);
-
genericJarFile.delete();
-
}
-
}
-
else {
-
// create the "undeployed" output .jar, if required
-
super.writeJar(baseName, jarFile, files, publicId);
-
}
-
/*
-
// need to create a generic jar first.
-
File genericJarFile = super.getVendorOutputJarFile(baseName);
-
super.writeJar(baseName, genericJarFile, files, publicId);
-
-
if (alwaysRebuild || isRebuildRequired(genericJarFile, jarFile)) {
-
buildWebsphereJar(genericJarFile, jarFile);
-
}
-
if (!keepGeneric) {
-
log("deleting generic jar " + genericJarFile.toString(),
-
Project.MSG_VERBOSE);
-
genericJarFile.delete();
-
}
-
*/
-
}
-
-
/**
-
* Called to validate that the tool parameters have been configured.
-
*
-
*/
-
public void validateConfigured() throws BuildException {
-
super.validateConfigured();
-
}
-
-
-
/**
-
* Helper method to check to see if a websphere EBJ1.1 jar needs to be rebuilt using
-
* ejbdeploy. Called from writeJar it sees if the "Bean" classes are the only thing that needs
-
* to be updated and either updates the Jar with the Bean classfile or returns true,
-
* saying that the whole websphere jar needs to be regened with ejbdeploy. This allows faster
-
* build times for working developers.
-
* - * The way websphere ejbdeploy works is it creates wrappers for the publicly defined methods as - * they are exposed in the remote interface. If the actual bean changes without changing the - * the method signatures then only the bean classfile needs to be updated and the rest of the - * websphere jar file can remain the same. If the Interfaces, ie. the method signatures change - * or if the xml deployment dicriptors changed, the whole jar needs to be rebuilt with ejbdeploy. - * This is not strictly true for the xml files. If the JNDI name changes then the jar doesnt - * have to be rebuild, but if the resources references change then it does. At this point the - * websphere jar gets rebuilt if the xml files change at all. - * - * @param genericJarFile java.io.File The generic jar file. - * @param websphereJarFile java.io.File The websphere jar file to check to see if it needs to be rebuilt. - */ - protected boolean isRebuildRequired(File genericJarFile, File websphereJarFile) - { - boolean rebuild = false; - - JarFile genericJar = null; - JarFile wasJar = null; - File newwasJarFile = null; - JarOutputStream newJarStream = null; - - try - { - log("Checking if websphere Jar needs to be rebuilt for jar " + websphereJarFile.getName(), - Project.MSG_VERBOSE); - // Only go forward if the generic and the websphere file both exist - if (genericJarFile.exists() && genericJarFile.isFile() - && websphereJarFile.exists() && websphereJarFile.isFile()) - { - //open jar files - genericJar = new JarFile(genericJarFile); - wasJar = new JarFile(websphereJarFile); - - Hashtable genericEntries = new Hashtable(); - Hashtable wasEntries = new Hashtable(); - Hashtable replaceEntries = new Hashtable(); - - //get the list of generic jar entries - for (Enumeration e = genericJar.entries(); e.hasMoreElements();) - { - JarEntry je = (JarEntry)e.nextElement(); - genericEntries.put(je.getName().replace('\\', '/'), je); - } - //get the list of websphere jar entries - for (Enumeration e = wasJar.entries() ; e.hasMoreElements();) - { - JarEntry je = (JarEntry)e.nextElement(); - wasEntries.put(je.getName(), je); - } - - //Cycle Through generic and make sure its in websphere - ClassLoader genericLoader = getClassLoaderFromJar(genericJarFile); - for (Enumeration e = genericEntries.keys(); e.hasMoreElements();) - { - String filepath = (String)e.nextElement(); - if (wasEntries.containsKey(filepath)) // File name/path match - { - // Check files see if same - JarEntry genericEntry = (JarEntry)genericEntries.get(filepath); - JarEntry wasEntry = (JarEntry)wasEntries.get(filepath); - if ((genericEntry.getCrc() != wasEntry.getCrc()) || // Crc's Match - (genericEntry.getSize() != wasEntry.getSize()) ) // Size Match - { - if (genericEntry.getName().endsWith(".class")) - { - //File are different see if its an object or an interface - String classname = genericEntry.getName().replace(File.separatorChar,'.'); - classname = classname.substring(0,classname.lastIndexOf(".class")); - Class genclass = genericLoader.loadClass(classname); - if (genclass.isInterface()) - { - //Interface changed rebuild jar. - log("Interface " + genclass.getName() + " has changed",Project.MSG_VERBOSE); - rebuild = true; - break; - } - else - { - //Object class Changed update it. - replaceEntries.put(filepath, genericEntry); - } - } - else - { - // is it the manifest. If so ignore it - if (!genericEntry.getName().equals("META-INF/MANIFEST.MF")) { - //File other then class changed rebuild - log("Non class file " + genericEntry.getName() + " has changed",Project.MSG_VERBOSE); - rebuild = true; - } - break; - } - } - } - else // a file doesnt exist rebuild - { - log("File " + filepath + " not present in websphere jar",Project.MSG_VERBOSE); - rebuild = true; - break; - } - } - - if (!rebuild) - { - log("No rebuild needed - updating jar",Project.MSG_VERBOSE); - newwasJarFile = new File(websphereJarFile.getAbsolutePath() + ".temp"); - if (newwasJarFile.exists()) { - newwasJarFile.delete(); - } - - newJarStream = new JarOutputStream(new FileOutputStream(newwasJarFile)); - newJarStream.setLevel(0); - - //Copy files from old websphere jar - for (Enumeration e = wasEntries.elements() ; e.hasMoreElements();) - { - byte[] buffer = new byte[1024]; - int bytesRead; - InputStream is; - JarEntry je = (JarEntry)e.nextElement(); - if (je.getCompressedSize() == -1 || - je.getCompressedSize() == je.getSize()) { - newJarStream.setLevel(0); - } - else { - newJarStream.setLevel(9); - } - - // Update with changed Bean class - if (replaceEntries.containsKey(je.getName())) - { - log("Updating Bean class from generic Jar " + je.getName(), - Project.MSG_VERBOSE); - // Use the entry from the generic jar - je = (JarEntry)replaceEntries.get(je.getName()); - is = genericJar.getInputStream(je); - } - else //use fle from original websphere jar - { - is = wasJar.getInputStream(je); - } - newJarStream.putNextEntry(new JarEntry(je.getName())); - - while ((bytesRead = is.read(buffer)) != -1) - { - newJarStream.write(buffer,0,bytesRead); - } - is.close(); - } - } - else - { - log("websphere Jar rebuild needed due to changed interface or XML",Project.MSG_VERBOSE); - } - } - else - { - rebuild = true; - } - } - catch(ClassNotFoundException cnfe) - { - String cnfmsg = "ClassNotFoundException while processing ejb-jar file" - + ". Details: " - + cnfe.getMessage(); - throw new BuildException(cnfmsg, cnfe); - } - catch(IOException ioe) { - String msg = "IOException while processing ejb-jar file " - + ". Details: " - + ioe.getMessage(); - throw new BuildException(msg, ioe); - } - finally { - // need to close files and perhaps rename output - if (genericJar != null) { - try { - genericJar.close(); - } - catch (IOException closeException) {} - } - - if (wasJar != null) { - try { - wasJar.close(); - } - catch (IOException closeException) {} - } - - if (newJarStream != null) { - try { - newJarStream.close(); - } - catch (IOException closeException) {} - - websphereJarFile.delete(); - newwasJarFile.renameTo(websphereJarFile); - if (!websphereJarFile.exists()) { - rebuild = true; - } - } - } - - return rebuild; - } - - /** - * Helper method invoked by isRebuildRequired to get a ClassLoader for - * a Jar File passed to it. - * - * @param classjar java.io.File representing jar file to get classes from. - */ - protected ClassLoader getClassLoaderFromJar(File classjar) throws IOException - { - Path lookupPath = new Path(getTask().getProject()); - lookupPath.setLocation(classjar); - - Path classpath = getCombinedClasspath(); - if (classpath != null) { - lookupPath.append(classpath); - } - - return new AntClassLoader(getTask().getProject(), lookupPath); - } - } - diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 00b2a0b7d..a7d1dad39 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java index 05e48e2e7..59feaa79d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index 0cc0cbe34..4f0b03227 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java index 29abf46f8..94e36815f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index a22a2617e..8075a71a6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -209,4 +209,4 @@ public class VAJExport extends VAJTask { overwrite = doOverwrite; } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java index 5f3115788..a26004192 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java @@ -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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index fbf6da54b..534ceae1d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -229,4 +229,4 @@ public class VAJImport extends VAJTask { importClasses, importResources, importSources, useDefaultExcludes); } -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java index 5e6057237..94ba4c81a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java @@ -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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java index 758f32193..d8a1d7848 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java index c193b7e73..953f946b7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java @@ -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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java index 10534dde4..fa002fdba 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java @@ -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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java index 2424462a3..a92f2590d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java index 0cd032455..ae0b8eefc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index d06fbf511..24c7d8076 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java index fc9b461ec..65c5827e4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java index 1cf7aad99..699975475 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index 43ab9fe5c..950ccad28 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index c2ea18b2e..cca305322 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2000 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java index 3edbb8dd1..d74a26eca 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java index c9f097398..53d82fc34 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index 292b7c177..6d82b4297 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java index 900d7ae9c..9a912bdb1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java index a985a69a6..07e662f60 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java index 8931ffb25..9bd8c5a6e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index a33252812..0c9c4e506 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java index f1ce16957..924f997cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java index 29027063f..42d9a54d2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java index 5fc75696f..a3a49a0ce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java index 96bf22a0d..0cb10df3a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java index 84757cd0a..b8b0edd33 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java index 77f8f07cf..97aeb9b48 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java index 040e46f68..a5fd07f9c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java index 3f51cd46a..affd88010 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index ddbaf3bc3..667fda3f0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java index 01c8e6832..bacb00005 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index 497dd8b19..0bdf4481e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java index 88dd6be1a..d5f6bdb11 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 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", "Tomcat", and "Apache Software + * 4. The names "The Jakarta Project", "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 apache@apache.org. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java index 9e3ccce28..da9a8315f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index a31c9d68d..ced4d0b72 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java index fa842335b..57a9d4ab8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index ffab91bac..e7ef534d9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 6cedd3b61..7977762dc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java index 859168d03..3b75fa7dc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java index 94f6ce606..fa36eef8a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java index 216e60174..253f0521c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java index ffbd5ca62..c86d0e20b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java index c95d36718..3f97e738f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 1999, 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java index 10f2c7283..c02ef9ef1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java index a39eca4e1..560a2a24d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java index 618cae448..3b91651a2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java index ac61a0c9d..16d01dc73 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java index 8b1cf4302..b52396bf1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java index a6283f9aa..f20c25f95 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java index 4f68da22e..6d9ebdf2e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html index 125fc2aaf..f15c9ab5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html +++ b/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html @@ -23,4 +23,7 @@ These tasks also require you to have the p4 (or p4.exe) client in your path. @author Les Hughes +
Copyright © 2000-2001 Apache Software Foundation. All rights +Reserved.