Submitted by: Larry Shatzer (larry dot shatzer at spirent dot com) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275270 13f79535-47bb-0310-9956-ffa450edef68master
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -154,7 +154,7 @@ public class DirectoryIterator implements ClassFileIterator { | |||||
* stack and a new iterator is created for the subdirectory. If the | * stack and a new iterator is created for the subdirectory. If the | ||||
* entry is a file, it is returned as the next element and the iterator | * entry is a file, it is returned as the next element and the iterator | ||||
* remains valid. If there are no more entries in the current directory, | * remains valid. If there are no more entries in the current directory, | ||||
* the topmost iterator on the statck is popped off to become the | |||||
* the topmost iterator on the stack is popped off to become the | |||||
* current iterator. | * current iterator. | ||||
* | * | ||||
* @return the next ClassFile in the iteration. | * @return the next ClassFile in the iteration. | ||||
@@ -69,10 +69,10 @@ public class JarFileIterator implements ClassFileIterator { | |||||
private ZipInputStream jarStream; | private ZipInputStream jarStream; | ||||
/** | /** | ||||
* Construct a iterartor over a jar stream | |||||
* Construct an iterator over a jar stream | |||||
* | * | ||||
* @param stream the basic input stream from which the Jar is recived | |||||
* @exception IOException if the jar stream connot be created | |||||
* @param stream the basic input stream from which the Jar is received | |||||
* @exception IOException if the jar stream cannot be created | |||||
*/ | */ | ||||
public JarFileIterator(InputStream stream) throws IOException { | public JarFileIterator(InputStream stream) throws IOException { | ||||
super(); | super(); | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -250,7 +250,7 @@ public class ConstantPool { | |||||
* @param methodClassName the name of the class which contains the | * @param methodClassName the name of the class which contains the | ||||
* method being referenced. | * method being referenced. | ||||
* @param methodName the name of the method being referenced. | * @param methodName the name of the method being referenced. | ||||
* @param methodType the type descriptor of the metho dbeing referenced. | |||||
* @param methodType the type descriptor of the method being referenced. | |||||
* @return the index at which the given method ref entry occurs in the | * @return the index at which the given method ref entry occurs in the | ||||
* constant pool or -1 if the value does not occur. | * constant pool or -1 if the value does not occur. | ||||
*/ | */ | ||||
@@ -282,7 +282,7 @@ public class ConstantPool { | |||||
* @param interfaceMethodClassName the name of the interface which | * @param interfaceMethodClassName the name of the interface which | ||||
* contains the method being referenced. | * contains the method being referenced. | ||||
* @param interfaceMethodName the name of the method being referenced. | * @param interfaceMethodName the name of the method being referenced. | ||||
* @param interfaceMethodType the type descriptor of the metho dbeing | |||||
* @param interfaceMethodType the type descriptor of the method being | |||||
* referenced. | * referenced. | ||||
* @return the index at which the given method ref entry occurs in the | * @return the index at which the given method ref entry occurs in the | ||||
* constant pool or -1 if the value does not occur. | * constant pool or -1 if the value does not occur. | ||||
@@ -57,7 +57,7 @@ import java.io.DataInputStream; | |||||
import java.io.IOException; | import java.io.IOException; | ||||
/** | /** | ||||
* An entry in the constant pool. This class contains a represenation of the | |||||
* An entry in the constant pool. This class contains a representation of the | |||||
* constant pool entries. It is an abstract base class for all the different | * constant pool entries. It is an abstract base class for all the different | ||||
* forms of constant pool entry. | * forms of constant pool entry. | ||||
* | * | ||||
@@ -111,12 +111,12 @@ public abstract class ConstantPoolEntry { | |||||
private int numEntries; | private int numEntries; | ||||
/** | /** | ||||
* A flag which indiciates if this entry has been resolved or not. | |||||
* A flag which indicates if this entry has been resolved or not. | |||||
*/ | */ | ||||
private boolean resolved; | private boolean resolved; | ||||
/** | /** | ||||
* Initialse the constant pool entry. | |||||
* Initialise the constant pool entry. | |||||
* | * | ||||
* @param tagValue the tag value which identifies which type of constant | * @param tagValue the tag value which identifies which type of constant | ||||
* pool entry this is. | * pool entry this is. | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -137,9 +137,9 @@ public class FieldRefCPInfo extends ConstantPoolEntry { | |||||
} | } | ||||
/** | /** | ||||
* Gets the name of the class definint the field | |||||
* Gets the name of the class defining the field | |||||
* | * | ||||
* @return the name of the class definint the field | |||||
* @return the name of the class defining the field | |||||
*/ | */ | ||||
public String getFieldClassName() { | public String getFieldClassName() { | ||||
return fieldClassName; | return fieldClassName; | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -62,7 +62,7 @@ import java.io.IOException; | |||||
* @author Conor MacNeill | * @author Conor MacNeill | ||||
*/ | */ | ||||
public class InterfaceMethodRefCPInfo extends ConstantPoolEntry { | public class InterfaceMethodRefCPInfo extends ConstantPoolEntry { | ||||
/** the class name of the class defining the interafce method */ | |||||
/** the class name of the class defining the interface method */ | |||||
private String interfaceMethodClassName; | private String interfaceMethodClassName; | ||||
/** the name of the interface nmethod */ | /** the name of the interface nmethod */ | ||||
private String interfaceMethodName; | private String interfaceMethodName; | ||||
@@ -298,7 +298,7 @@ public class CSharp extends DotnetCompile { | |||||
/** | /** | ||||
* query the incrementalflag | * query the incrementalflag | ||||
* | * | ||||
*@return true iff incremental compilation is turned on | |||||
*@return true if incremental compilation is turned on | |||||
*/ | */ | ||||
public boolean getIncremental() { | public boolean getIncremental() { | ||||
return incremental; | return incremental; | ||||
@@ -133,7 +133,7 @@ public abstract class DotnetCompile | |||||
private boolean failOnError; | private boolean failOnError; | ||||
/** | /** | ||||
* using the path approach didnt work as it could not handle the implicit | |||||
* using the path approach didn't work as it could not handle the implicit | |||||
* execution path. Perhaps that could be extracted from the runtime and | * execution path. Perhaps that could be extracted from the runtime and | ||||
* then the path approach would be viable | * then the path approach would be viable | ||||
*/ | */ | ||||
@@ -169,11 +169,11 @@ public abstract class DotnetCompile | |||||
* .dll;"+ extension and the poor developer has to know every library which | * .dll;"+ extension and the poor developer has to know every library which | ||||
* is included why the compiler cant find classes on the path or in a | * is included why the compiler cant find classes on the path or in a | ||||
* directory, is a mystery. To reduce the need to be explicit, here is a | * directory, is a mystery. To reduce the need to be explicit, here is a | ||||
* long list of the core libraries used in Beta-1 of .NET ommitting the | |||||
* long list of the core libraries used in Beta-1 of .NET omitting the | |||||
* blatantly non portable (MS.win32.interop) and the .designer libraries. | * blatantly non portable (MS.win32.interop) and the .designer libraries. | ||||
* (ripping out Com was tempting) Casing is chosen to match that of the | * (ripping out Com was tempting) Casing is chosen to match that of the | ||||
* file system <i>exactly</i> so may work on a unix box too. there is no | * file system <i>exactly</i> so may work on a unix box too. there is no | ||||
* need to reference mscorlib.dll, cos it is always there | |||||
* need to reference mscorlib.dll, because it is always there | |||||
*/ | */ | ||||
protected static final String[] DEFAULT_REFERENCE_LIST_DOTNET_10 = {"Accessibility.dll", | protected static final String[] DEFAULT_REFERENCE_LIST_DOTNET_10 = {"Accessibility.dll", | ||||
@@ -220,7 +220,7 @@ public class Ildasm extends Task { | |||||
} | } | ||||
/** | /** | ||||
* enable or disable (default) the orginal bytes as comments | |||||
* enable or disable (default) the original bytes as comments | |||||
* @param bytes | * @param bytes | ||||
*/ | */ | ||||
public void setBytes(boolean bytes) { | public void setBytes(boolean bytes) { | ||||
@@ -446,7 +446,7 @@ public class Ildasm extends Task { | |||||
} | } | ||||
/** | /** | ||||
* map from an encoding enum to an encoding opion | |||||
* map from an encoding enum to an encoding option | |||||
* @param enumValue | * @param enumValue | ||||
* @return | * @return | ||||
*/ | */ | ||||
@@ -65,14 +65,14 @@ import java.io.File; | |||||
* by generating a binary assembly (.dll) that contains all the binding | * by generating a binary assembly (.dll) that contains all the binding | ||||
* metadata. Uses date timestamps to minimise rebuilds. | * metadata. Uses date timestamps to minimise rebuilds. | ||||
* @since Ant 1.6 | * @since Ant 1.6 | ||||
* @uthor steve loughran | |||||
* @author steve loughran | |||||
* @ant.task name="ImportTypelib" category="dotnet" | * @ant.task name="ImportTypelib" category="dotnet" | ||||
*/ | */ | ||||
public class ImportTypelib extends Task { | public class ImportTypelib extends Task { | ||||
/** | /** | ||||
* input file; preceeds options | |||||
* input file; precedes options | |||||
*/ | */ | ||||
private File srcFile; | private File srcFile; | ||||
@@ -95,7 +95,7 @@ public class NetCommand { | |||||
protected Task owner; | protected Task owner; | ||||
/** | /** | ||||
* executabe | |||||
* executable | |||||
*/ | */ | ||||
protected Execute executable; | protected Execute executable; | ||||
@@ -190,7 +190,7 @@ public class NetCommand { | |||||
/** | /** | ||||
* verbose text log | * verbose text log | ||||
* | * | ||||
*@param msg string to add to log iff verbose is defined for the build | |||||
*@param msg string to add to log if verbose is defined for the build | |||||
*/ | */ | ||||
protected void logVerbose(String msg) { | protected void logVerbose(String msg) { | ||||
owner.getProject().log(msg, Project.MSG_VERBOSE); | owner.getProject().log(msg, Project.MSG_VERBOSE); | ||||
@@ -258,7 +258,7 @@ public class NetCommand { | |||||
/** | /** | ||||
* Run the command using the given Execute instance. | * Run the command using the given Execute instance. | ||||
* | * | ||||
*@exception BuildException iff something goes wrong and the | |||||
*@exception BuildException if something goes wrong and the | |||||
* failOnError flag is true | * failOnError flag is true | ||||
*/ | */ | ||||
public void runCommand() | public void runCommand() | ||||
@@ -204,7 +204,7 @@ public class VisualBasicCompile extends DotnetCompile { | |||||
} | } | ||||
/** | /** | ||||
* Forn the option string for optionStrict. | |||||
* For the option string for optionStrict. | |||||
* @return The parameter string. | * @return The parameter string. | ||||
*/ | */ | ||||
public String getOptionStrictParameter() { | public String getOptionStrictParameter() { | ||||
@@ -78,7 +78,7 @@ import org.apache.tools.ant.types.Path; | |||||
/** | /** | ||||
* BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and 4.5.1 | * BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and 4.5.1 | ||||
* This task generates and compiles the stubs and skeletons for all ejb described into the | * This task generates and compiles the stubs and skeletons for all ejb described into the | ||||
* Deployement Descriptor, builds the jar file including the support files and verify | |||||
* Deployment Descriptor, builds the jar file including the support files and verify | |||||
* whether the produced jar is valid or not. | * whether the produced jar is valid or not. | ||||
* The supported options are: | * The supported options are: | ||||
* <ul> | * <ul> | ||||
@@ -90,7 +90,7 @@ import org.apache.tools.ant.types.Path; | |||||
* (see vbj com.inprise.ejb.util.Verify)</li> | * (see vbj com.inprise.ejb.util.Verify)</li> | ||||
* <li>basdtd (String) : location of the BAS DTD </li> | * <li>basdtd (String) : location of the BAS DTD </li> | ||||
* <li>generateclient (boolean) : turn on the client jar file generation </li> | * <li>generateclient (boolean) : turn on the client jar file generation </li> | ||||
* <li>version (int) : tell what is the borland appserver version 4 or 5 </li> | |||||
* <li>version (int) : tell what is the Borland appserver version 4 or 5 </li> | |||||
* </ul> | * </ul> | ||||
* | * | ||||
*<PRE> | *<PRE> | ||||
@@ -144,12 +144,12 @@ public class BorlandDeploymentTool extends GenericDeploymentTool | |||||
/** store additional param for java2iiop command used to build EJB Stubs */ | /** store additional param for java2iiop command used to build EJB Stubs */ | ||||
private String java2iioparams = null; | private String java2iioparams = null; | ||||
/** Instance variable that determines whetger the client jar file is generated */ | |||||
/** Instance variable that determines whether the client jar file is generated */ | |||||
private boolean generateclient = false; | private boolean generateclient = false; | ||||
/** Borland Entreprise Server = version 5 */ | |||||
/** Borland Enterprise Server = version 5 */ | |||||
static final int BES = 5; | static final int BES = 5; | ||||
/** Borland Application Server or Inprise Applcation Server = version 4 */ | |||||
/** Borland Application Server or Inprise Application Server = version 4 */ | |||||
static final int BAS = 4; | static final int BAS = 4; | ||||
/** borland appserver version 4 or 5 */ | /** borland appserver version 4 or 5 */ | ||||
@@ -191,7 +191,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool | |||||
/** | /** | ||||
* sets some additional args to send to verify command | * sets some additional args to send to verify command | ||||
* @param args addtions command line parameters | |||||
* @param args additional command line parameters | |||||
*/ | */ | ||||
public void setVerifyArgs(String args) { | public void setVerifyArgs(String args) { | ||||
this.verifyArgs = args; | this.verifyArgs = args; | ||||
@@ -334,7 +334,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool | |||||
} | } | ||||
execTask.createArg().setValue("-verify"); | execTask.createArg().setValue("-verify"); | ||||
execTask.createArg().setValue("-src"); | execTask.createArg().setValue("-src"); | ||||
// ejb jar file to verfiy | |||||
// ejb jar file to verify | |||||
execTask.createArg().setValue(sourceJar.getPath()); | execTask.createArg().setValue(sourceJar.getPath()); | ||||
log("Calling iastool", Project.MSG_VERBOSE); | log("Calling iastool", Project.MSG_VERBOSE); | ||||
execTask.execute(); | execTask.execute(); | ||||
@@ -381,7 +381,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool | |||||
/** | /** | ||||
* Generate the client jar corresponding to the jar file passed as paremeter | |||||
* Generate the client jar corresponding to the jar file passed as parameter | |||||
* the method uses the BorlandGenerateClient task. | * the method uses the BorlandGenerateClient task. | ||||
* @param sourceJar java.io.File representing the produced jar file | * @param sourceJar java.io.File representing the produced jar file | ||||
*/ | */ | ||||
@@ -413,7 +413,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool | |||||
} | } | ||||
/** | /** | ||||
* Generate stubs & sketelton for each home found into the DD | |||||
* Generate stubs & skeleton for each home found into the DD | |||||
* Add all the generate class file into the ejb files | * Add all the generate class file into the ejb files | ||||
* @param ithomes : iterator on home class | * @param ithomes : iterator on home class | ||||
*/ | */ | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -69,7 +69,7 @@ import org.apache.tools.ant.types.Reference; | |||||
* input the EJB JAR file. | * input the EJB JAR file. | ||||
* | * | ||||
* Two mode are available: java mode (default) and fork mode. With the fork mode, | * Two mode are available: java mode (default) and fork mode. With the fork mode, | ||||
* it is impossible to add classpath to the commmand line. | |||||
* it is impossible to add classpath to the command line. | |||||
* | * | ||||
* @author <a href="mailto:benoit.moussaud@criltelecom.com">Benoit Moussaud</a> | * @author <a href="mailto:benoit.moussaud@criltelecom.com">Benoit Moussaud</a> | ||||
* | * | ||||
@@ -163,7 +163,7 @@ public class BorlandGenerateClient extends Task { | |||||
* | * | ||||
* The work is actually done by creating a separate JVM to run a java task. | * The work is actually done by creating a separate JVM to run a java task. | ||||
* | * | ||||
* @exception BuildException if someting goes wrong with the build | |||||
* @exception BuildException if something goes wrong with the build | |||||
*/ | */ | ||||
public void execute() throws BuildException { | public void execute() throws BuildException { | ||||
if (ejbjarfile == null || ejbjarfile.isDirectory()) { | if (ejbjarfile == null || ejbjarfile.isDirectory()) { | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000,2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -71,7 +71,7 @@ import org.apache.tools.ant.types.Path; | |||||
*/ | */ | ||||
public class DDCreator extends MatchingTask { | public class DDCreator extends MatchingTask { | ||||
/** | /** | ||||
* The root directory of the tree containing the textual deployment desciptors. The actual | |||||
* The root directory of the tree containing the textual deployment descriptors. The actual | |||||
* deployment descriptor files are selected using include and exclude constructs | * deployment descriptor files are selected using include and exclude constructs | ||||
* on the EJBC task, as supported by the MatchingTask superclass. | * on the EJBC task, as supported by the MatchingTask superclass. | ||||
*/ | */ | ||||
@@ -98,7 +98,7 @@ public class DDCreator extends MatchingTask { | |||||
* the classpath, this also avoids having to start ant with the class path of the | * the classpath, this also avoids having to start ant with the class path of the | ||||
* project it is building. | * project it is building. | ||||
* | * | ||||
* @exception BuildException if someting goes wrong with the build | |||||
* @exception BuildException if something goes wrong with the build | |||||
*/ | */ | ||||
public void execute() throws BuildException { | public void execute() throws BuildException { | ||||
if (descriptorDirectory == null | if (descriptorDirectory == null | ||||
@@ -1,7 +1,7 @@ | |||||
/* | /* | ||||
* The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
* | * | ||||
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
* Copyright (c) 2000-2003 The Apache Software Foundation. All rights | |||||
* reserved. | * reserved. | ||||
* | * | ||||
* Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
@@ -68,12 +68,12 @@ import javax.ejb.deployment.DeploymentDescriptor; | |||||
*/ | */ | ||||
public class DDCreatorHelper { | public class DDCreatorHelper { | ||||
/** | /** | ||||
* The root directory of the tree containing the textual deployment desciptors. | |||||
* The root directory of the tree containing the textual deployment descriptors. | |||||
*/ | */ | ||||
private File descriptorDirectory; | private File descriptorDirectory; | ||||
/** | /** | ||||
* The directory where generated serialised desployment descriptors are written. | |||||
* The directory where generated serialised deployment descriptors are written. | |||||
*/ | */ | ||||
private File generatedFilesDirectory; | private File generatedFilesDirectory; | ||||
@@ -377,7 +377,7 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase { | |||||
} | } | ||||
} | } | ||||
// Get the value of the <ejb-name> tag. Only the first occurence. | |||||
// Get the value of the <ejb-name> tag. Only the first occurrence. | |||||
if (currentElement.equals(EJB_NAME)) { | if (currentElement.equals(EJB_NAME)) { | ||||
if (ejbName == null) { | if (ejbName == null) { | ||||
ejbName = currentText.trim(); | ejbName = currentText.trim(); | ||||