-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) {
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowasegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowasegement may appear in the software itself,
+ * if and wherever such third-party acknowasegements normally appear.
+ *
+ * 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.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * -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); - } -} + } + + // 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); + } +} 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java Index: Translate.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Translate.java 3 Nov 2001 04:01:18 -0000 1.2 +++ Translate.java 10 Jan 2002 13:59:36 -0000 1.3 @@ -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 1.5 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java Index: VAJAntTool.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- VAJAntTool.java 27 Nov 2001 18:04:52 -0000 1.4 +++ VAJAntTool.java 10 Jan 2002 13:59:36 -0000 1.5 @@ -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. 1.6 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java Index: VAJAntToolGUI.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- VAJAntToolGUI.java 8 Jan 2002 19:56:55 -0000 1.5 +++ VAJAntToolGUI.java 10 Jan 2002 13:59:36 -0000 1.6 @@ -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. 1.5 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java Index: VAJBuildInfo.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- VAJBuildInfo.java 27 Nov 2001 18:04:52 -0000 1.4 +++ VAJBuildInfo.java 10 Jan 2002 13:59:36 -0000 1.5 @@ -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. 1.7 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java Index: VAJExport.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- VAJExport.java 27 Nov 2001 18:04:52 -0000 1.6 +++ VAJExport.java 10 Jan 2002 13:59:36 -0000 1.7 @@ -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 @@ overwrite = doOverwrite; } -} \ No newline at end of file +} 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java Index: VAJExportServlet.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExportServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VAJExportServlet.java 28 Oct 2001 21:30:21 -0000 1.2 +++ VAJExportServlet.java 10 Jan 2002 13:59:36 -0000 1.3 @@ -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. 1.11 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java Index: VAJImport.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- VAJImport.java 27 Nov 2001 18:04:52 -0000 1.10 +++ VAJImport.java 10 Jan 2002 13:59:36 -0000 1.11 @@ -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 @@ importClasses, importResources, importSources, useDefaultExcludes); } -} \ No newline at end of file +} 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java Index: VAJImportServlet.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VAJImportServlet.java 27 Nov 2001 18:04:52 -0000 1.2 +++ VAJImportServlet.java 10 Jan 2002 13:59:36 -0000 1.3 @@ -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. 1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java Index: VAJLoadProjects.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadProjects.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- VAJLoadProjects.java 28 Oct 2001 21:30:21 -0000 1.7 +++ VAJLoadProjects.java 10 Jan 2002 13:59:36 -0000 1.8 @@ -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 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java Index: VAJLoadServlet.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLoadServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VAJLoadServlet.java 28 Oct 2001 21:30:21 -0000 1.2 +++ VAJLoadServlet.java 10 Jan 2002 13:59:36 -0000 1.3 @@ -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. 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java Index: VAJToolsServlet.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- VAJToolsServlet.java 15 Dec 2001 00:29:43 -0000 1.4 +++ VAJToolsServlet.java 10 Jan 2002 13:59:36 -0000 1.5 @@ -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. 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java Index: VAJUtil.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJUtil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- VAJUtil.java 27 Nov 2001 18:04:52 -0000 1.6 +++ VAJUtil.java 10 Jan 2002 13:59:36 -0000 1.7 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java Index: VAJWorkspaceScanner.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- VAJWorkspaceScanner.java 27 Nov 2001 18:04:52 -0000 1.5 +++ VAJWorkspaceScanner.java 10 Jan 2002 13:59:36 -0000 1.6 @@ -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 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java Index: JJTree.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JJTree.java 26 Nov 2001 11:03:52 -0000 1.6 +++ JJTree.java 10 Jan 2002 13:59:36 -0000 1.7 @@ -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 1.11 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java Index: JavaCC.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- JavaCC.java 26 Nov 2001 11:03:52 -0000 1.10 +++ JavaCC.java 10 Jan 2002 13:59:36 -0000 1.11 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java Index: JDependTask.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- JDependTask.java 8 Jan 2002 22:44:56 -0000 1.5 +++ JDependTask.java 10 Jan 2002 13:59:37 -0000 1.6 @@ -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 1.7 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java Index: JspC.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JspC.java 8 Jan 2002 22:25:19 -0000 1.6 +++ JspC.java 10 Jan 2002 13:59:37 -0000 1.7 @@ -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 @@ -99,7 +99,7 @@ * </jspc> * * - * @version $Revision: 1.6 $ $Date: 2002/01/08 22:25:19 $ + * @version $Revision: 1.7 $ $Date: 2002/01/10 13:59:37 $ * @author Matthew Watson *
Large Amount of cutting and pasting from the Javac task... * @author James Davidson duncan@x180.com 1.4 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java Index: WLJspc.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- WLJspc.java 22 Nov 2001 08:46:55 -0000 1.3 +++ WLJspc.java 10 Jan 2002 13:59:37 -0000 1.4 @@ -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 1.10 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java Index: AggregateTransformer.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- AggregateTransformer.java 27 Nov 2001 18:04:53 -0000 1.9 +++ AggregateTransformer.java 10 Jan 2002 13:59:37 -0000 1.10 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java Index: BaseTest.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BaseTest.java 9 Dec 2001 13:38:18 -0000 1.5 +++ BaseTest.java 10 Jan 2002 13:59:37 -0000 1.6 @@ -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 1.10 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java Index: BatchTest.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- BatchTest.java 9 Dec 2001 13:38:18 -0000 1.9 +++ BatchTest.java 10 Jan 2002 13:59:37 -0000 1.10 @@ -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 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java Index: Enumerations.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Enumerations.java 1 Feb 2001 15:56:41 -0000 1.2 +++ Enumerations.java 10 Jan 2002 13:59:37 -0000 1.3 @@ -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 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java Index: FormatterElement.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- FormatterElement.java 24 Jul 2001 13:28:56 -0000 1.6 +++ FormatterElement.java 10 Jan 2002 13:59:37 -0000 1.7 @@ -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 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java Index: JUnitResultFormatter.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- JUnitResultFormatter.java 13 Sep 2001 09:19:37 -0000 1.6 +++ JUnitResultFormatter.java 10 Jan 2002 13:59:37 -0000 1.7 @@ -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 1.30 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java Index: JUnitTask.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- JUnitTask.java 8 Jan 2002 22:20:13 -0000 1.29 +++ JUnitTask.java 10 Jan 2002 13:59:37 -0000 1.30 @@ -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 1.10 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java Index: JUnitTest.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- JUnitTest.java 9 Dec 2001 13:38:18 -0000 1.9 +++ JUnitTest.java 10 Jan 2002 13:59:37 -0000 1.10 @@ -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 1.16 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java Index: JUnitTestRunner.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- JUnitTestRunner.java 15 Dec 2001 00:28:47 -0000 1.15 +++ JUnitTestRunner.java 10 Jan 2002 13:59:37 -0000 1.16 @@ -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 1.12 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java Index: PlainJUnitResultFormatter.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- PlainJUnitResultFormatter.java 9 Dec 2001 13:38:18 -0000 1.11 +++ PlainJUnitResultFormatter.java 10 Jan 2002 13:59:37 -0000 1.12 @@ -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 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java Index: SummaryJUnitResultFormatter.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SummaryJUnitResultFormatter.java 3 May 2001 15:04:01 -0000 1.6 +++ SummaryJUnitResultFormatter.java 10 Jan 2002 13:59:37 -0000 1.7 @@ -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 1.18 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java Index: XMLJUnitResultFormatter.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- XMLJUnitResultFormatter.java 5 Jan 2002 01:39:40 -0000 1.17 +++ XMLJUnitResultFormatter.java 10 Jan 2002 13:59:37 -0000 1.18 @@ -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 1.2 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java Index: Xalan1Executor.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan1Executor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Xalan1Executor.java 25 Nov 2001 19:28:51 -0000 1.1 +++ Xalan1Executor.java 10 Jan 2002 13:59:37 -0000 1.2 @@ -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 1.2 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java Index: Xalan2Executor.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Xalan2Executor.java 25 Nov 2001 19:28:51 -0000 1.1 +++ Xalan2Executor.java 10 Jan 2002 13:59:37 -0000 1.2 @@ -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 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java Index: XalanExecutor.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XalanExecutor.java 26 Nov 2001 13:29:43 -0000 1.2 +++ XalanExecutor.java 10 Jan 2002 13:59:37 -0000 1.3 @@ -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 1.4 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java Index: AbstractMetamataTask.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractMetamataTask.java 28 Oct 2001 21:24:41 -0000 1.3 +++ AbstractMetamataTask.java 10 Jan 2002 13:59:37 -0000 1.4 @@ -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. 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java Index: MAudit.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MAudit.java 28 Oct 2001 21:30:22 -0000 1.2 +++ MAudit.java 10 Jan 2002 13:59:37 -0000 1.3 @@ -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 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java Index: MAuditStreamHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MAuditStreamHandler.java 28 Oct 2001 21:30:22 -0000 1.2 +++ MAuditStreamHandler.java 10 Jan 2002 13:59:37 -0000 1.3 @@ -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 1.3 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java Index: MMetrics.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MMetrics.java 28 Oct 2001 21:30:22 -0000 1.2 +++ MMetrics.java 10 Jan 2002 13:59:37 -0000 1.3 @@ -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. 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java Index: MMetricsStreamHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- MMetricsStreamHandler.java 27 Nov 2001 18:04:53 -0000 1.4 +++ MMetricsStreamHandler.java 10 Jan 2002 13:59:37 -0000 1.5 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java Index: MParse.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- MParse.java 28 Oct 2001 21:30:22 -0000 1.5 +++ MParse.java 10 Jan 2002 13:59:37 -0000 1.6 @@ -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 1.16 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java Index: FTP.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- FTP.java 8 Jan 2002 20:21:58 -0000 1.15 +++ FTP.java 10 Jan 2002 13:59:37 -0000 1.16 @@ -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 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java Index: P4Add.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- P4Add.java 9 Jan 2002 00:02:56 -0000 1.4 +++ P4Add.java 10 Jan 2002 13:59:38 -0000 1.5 @@ -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 1.9 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java Index: P4Base.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- P4Base.java 9 Jan 2002 00:03:22 -0000 1.8 +++ P4Base.java 10 Jan 2002 13:59:38 -0000 1.9 @@ -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 1.9 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java Index: P4Change.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- P4Change.java 9 Jan 2002 00:03:22 -0000 1.8 +++ P4Change.java 10 Jan 2002 13:59:38 -0000 1.9 @@ -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 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java Index: P4Delete.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- P4Delete.java 9 Jan 2002 00:03:22 -0000 1.4 +++ P4Delete.java 10 Jan 2002 13:59:38 -0000 1.5 @@ -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 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java Index: P4Edit.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- P4Edit.java 9 Jan 2002 00:03:22 -0000 1.6 +++ P4Edit.java 10 Jan 2002 13:59:38 -0000 1.7 @@ -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 1.3 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java Index: P4Handler.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- P4Handler.java 9 Jan 2002 00:03:22 -0000 1.2 +++ P4Handler.java 10 Jan 2002 13:59:38 -0000 1.3 @@ -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 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java Index: P4HandlerAdapter.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- P4HandlerAdapter.java 9 Jan 2002 00:03:22 -0000 1.4 +++ P4HandlerAdapter.java 10 Jan 2002 13:59:38 -0000 1.5 @@ -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 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java Index: P4Have.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- P4Have.java 9 Jan 2002 00:03:22 -0000 1.4 +++ P4Have.java 10 Jan 2002 13:59:38 -0000 1.5 @@ -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 1.8 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java Index: P4Label.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- P4Label.java 9 Jan 2002 00:03:22 -0000 1.7 +++ P4Label.java 10 Jan 2002 13:59:38 -0000 1.8 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java Index: P4Reopen.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- P4Reopen.java 9 Jan 2002 00:03:22 -0000 1.5 +++ P4Reopen.java 10 Jan 2002 13:59:38 -0000 1.6 @@ -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 1.5 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java Index: P4Revert.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- P4Revert.java 9 Jan 2002 00:03:22 -0000 1.4 +++ P4Revert.java 10 Jan 2002 13:59:38 -0000 1.5 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java Index: P4Submit.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- P4Submit.java 9 Jan 2002 00:03:22 -0000 1.5 +++ P4Submit.java 10 Jan 2002 13:59:38 -0000 1.6 @@ -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 1.6 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java Index: P4Sync.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- P4Sync.java 9 Jan 2002 00:03:22 -0000 1.5 +++ P4Sync.java 10 Jan 2002 13:59:38 -0000 1.6 @@ -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 1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java Index: SimpleP4OutputHandler.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SimpleP4OutputHandler.java 9 Jan 2002 00:03:22 -0000 1.6 +++ SimpleP4OutputHandler.java 10 Jan 2002 13:59:38 -0000 1.7 @@ -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 1.3 +3 -0 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html Index: package.html =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/package.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- package.html 4 Apr 2001 09:12:48 -0000 1.2 +++ package.html 10 Jan 2002 13:59:38 -0000 1.3 @@ -23,4 +23,7 @@ @author Les Hughes +
Copyright © 2000-2001 Apache Software Foundation. All rights +Reserved.