You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by an...@apache.org on 2003/09/20 18:40:42 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb BorlandDeploymentTool.java BorlandGenerateClient.java DDCreator.java DDCreatorHelper.java DescriptorHandler.java
antoine 2003/09/20 09:40:42
Modified: src/main/org/apache/tools/ant/taskdefs/optional/depend
DirectoryIterator.java JarFileIterator.java
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool
ConstantPool.java ConstantPoolEntry.java
FieldRefCPInfo.java InterfaceMethodRefCPInfo.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java DotnetCompile.java Ildasm.java
ImportTypelib.java NetCommand.java
VisualBasicCompile.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java
BorlandGenerateClient.java DDCreator.java
DDCreatorHelper.java DescriptorHandler.java
Log:
Spelling corrections.
Submitted by: Larry Shatzer (larry dot shatzer at spirent dot com)
Revision Changes Path
1.11 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java
Index: DirectoryIterator.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DirectoryIterator.java 19 Jul 2003 08:11:03 -0000 1.10
+++ DirectoryIterator.java 20 Sep 2003 16:40:42 -0000 1.11
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -154,7 +154,7 @@
* 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
* 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.
*
* @return the next ClassFile in the iteration.
1.11 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java
Index: JarFileIterator.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JarFileIterator.java 22 Apr 2003 07:35:15 -0000 1.10
+++ JarFileIterator.java 20 Sep 2003 16:40:42 -0000 1.11
@@ -69,10 +69,10 @@
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 {
super();
1.10 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java
Index: ConstantPool.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConstantPool.java 19 Jul 2003 08:11:03 -0000 1.9
+++ ConstantPool.java 20 Sep 2003 16:40:42 -0000 1.10
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -250,7 +250,7 @@
* @param methodClassName the name of the class which contains 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
* constant pool or -1 if the value does not occur.
*/
@@ -282,7 +282,7 @@
* @param interfaceMethodClassName the name of the interface which
* contains 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.
* @return the index at which the given method ref entry occurs in the
* constant pool or -1 if the value does not occur.
1.10 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java
Index: ConstantPoolEntry.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConstantPoolEntry.java 5 Jul 2003 14:34:12 -0000 1.9
+++ ConstantPoolEntry.java 20 Sep 2003 16:40:42 -0000 1.10
@@ -57,7 +57,7 @@
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
* forms of constant pool entry.
*
@@ -111,12 +111,12 @@
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;
/**
- * Initialse the constant pool entry.
+ * Initialise the constant pool entry.
*
* @param tagValue the tag value which identifies which type of constant
* pool entry this is.
1.10 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java
Index: FieldRefCPInfo.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FieldRefCPInfo.java 17 Jul 2003 10:36:28 -0000 1.9
+++ FieldRefCPInfo.java 20 Sep 2003 16:40:42 -0000 1.10
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -137,9 +137,9 @@
}
/**
- * 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() {
return fieldClassName;
1.9 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java
Index: InterfaceMethodRefCPInfo.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InterfaceMethodRefCPInfo.java 10 Feb 2003 14:13:47 -0000 1.8
+++ InterfaceMethodRefCPInfo.java 20 Sep 2003 16:40:42 -0000 1.9
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,7 @@
* @author Conor MacNeill
*/
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;
/** the name of the interface nmethod */
private String interfaceMethodName;
1.36 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- CSharp.java 1 Aug 2003 05:55:16 -0000 1.35
+++ CSharp.java 20 Sep 2003 16:40:42 -0000 1.36
@@ -298,7 +298,7 @@
/**
* query the incrementalflag
*
- *@return true iff incremental compilation is turned on
+ *@return true if incremental compilation is turned on
*/
public boolean getIncremental() {
return incremental;
1.15 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
Index: DotnetCompile.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DotnetCompile.java 14 Aug 2003 07:02:34 -0000 1.14
+++ DotnetCompile.java 20 Sep 2003 16:40:42 -0000 1.15
@@ -133,7 +133,7 @@
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
* then the path approach would be viable
*/
@@ -169,11 +169,11 @@
* .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
* 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.
* (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
- * 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",
1.2 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
Index: Ildasm.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ildasm.java 6 Sep 2003 07:09:59 -0000 1.1
+++ Ildasm.java 20 Sep 2003 16:40:42 -0000 1.2
@@ -220,7 +220,7 @@
}
/**
- * enable or disable (default) the orginal bytes as comments
+ * enable or disable (default) the original bytes as comments
* @param bytes
*/
public void setBytes(boolean bytes) {
@@ -446,7 +446,7 @@
}
/**
- * map from an encoding enum to an encoding opion
+ * map from an encoding enum to an encoding option
* @param enumValue
* @return
*/
1.6 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
Index: ImportTypelib.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ImportTypelib.java 18 Jul 2003 14:21:23 -0000 1.5
+++ ImportTypelib.java 20 Sep 2003 16:40:42 -0000 1.6
@@ -65,14 +65,14 @@
* by generating a binary assembly (.dll) that contains all the binding
* metadata. Uses date timestamps to minimise rebuilds.
* @since Ant 1.6
- * @uthor steve loughran
+ * @author steve loughran
* @ant.task name="ImportTypelib" category="dotnet"
*/
public class ImportTypelib extends Task {
/**
- * input file; preceeds options
+ * input file; precedes options
*/
private File srcFile;
1.24 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
Index: NetCommand.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- NetCommand.java 6 Sep 2003 07:09:59 -0000 1.23
+++ NetCommand.java 20 Sep 2003 16:40:42 -0000 1.24
@@ -95,7 +95,7 @@
protected Task owner;
/**
- * executabe
+ * executable
*/
protected Execute executable;
@@ -190,7 +190,7 @@
/**
* 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) {
owner.getProject().log(msg, Project.MSG_VERBOSE);
@@ -258,7 +258,7 @@
/**
* 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
*/
public void runCommand()
1.8 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java
Index: VisualBasicCompile.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VisualBasicCompile.java 1 Aug 2003 05:55:16 -0000 1.7
+++ VisualBasicCompile.java 20 Sep 2003 16:40:42 -0000 1.8
@@ -204,7 +204,7 @@
}
/**
- * Forn the option string for optionStrict.
+ * For the option string for optionStrict.
* @return The parameter string.
*/
public String getOptionStrictParameter() {
1.28 +9 -9 ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- BorlandDeploymentTool.java 25 Jul 2003 12:14:43 -0000 1.27
+++ BorlandDeploymentTool.java 20 Sep 2003 16:40:42 -0000 1.28
@@ -78,7 +78,7 @@
/**
* 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
- * 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.
* The supported options are:
* <ul>
@@ -90,7 +90,7 @@
* (see vbj com.inprise.ejb.util.Verify)</li>
* <li>basdtd (String) : location of the BAS DTD </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>
*
*<PRE>
@@ -144,12 +144,12 @@
/** store additional param for java2iiop command used to build EJB Stubs */
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;
- /** Borland Entreprise Server = version 5 */
+ /** Borland Enterprise Server = version 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;
/** borland appserver version 4 or 5 */
@@ -191,7 +191,7 @@
/**
* 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) {
this.verifyArgs = args;
@@ -334,7 +334,7 @@
}
execTask.createArg().setValue("-verify");
execTask.createArg().setValue("-src");
- // ejb jar file to verfiy
+ // ejb jar file to verify
execTask.createArg().setValue(sourceJar.getPath());
log("Calling iastool", Project.MSG_VERBOSE);
execTask.execute();
@@ -381,7 +381,7 @@
/**
- * 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.
* @param sourceJar java.io.File representing the produced jar file
*/
@@ -413,7 +413,7 @@
}
/**
- * 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
* @param ithomes : iterator on home class
*/
1.16 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
Index: BorlandGenerateClient.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BorlandGenerateClient.java 19 Jul 2003 08:11:03 -0000 1.15
+++ BorlandGenerateClient.java 20 Sep 2003 16:40:42 -0000 1.16
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,7 @@
* input the EJB JAR file.
*
* 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>
*
@@ -163,7 +163,7 @@
*
* 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 {
if (ejbjarfile == null || ejbjarfile.isDirectory()) {
1.23 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
Index: DDCreator.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DDCreator.java 19 Jul 2003 11:20:16 -0000 1.22
+++ DDCreator.java 20 Sep 2003 16:40:42 -0000 1.23
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,7 @@
*/
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
* on the EJBC task, as supported by the MatchingTask superclass.
*/
@@ -98,7 +98,7 @@
* the classpath, this also avoids having to start ant with the class path of the
* 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 {
if (descriptorDirectory == null
1.14 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
Index: DDCreatorHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DDCreatorHelper.java 17 Jul 2003 10:36:28 -0000 1.13
+++ DDCreatorHelper.java 20 Sep 2003 16:40:42 -0000 1.14
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,12 +68,12 @@
*/
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;
/**
- * The directory where generated serialised desployment descriptors are written.
+ * The directory where generated serialised deployment descriptors are written.
*/
private File generatedFilesDirectory;
1.30 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
Index: DescriptorHandler.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- DescriptorHandler.java 19 Jul 2003 11:20:16 -0000 1.29
+++ DescriptorHandler.java 20 Sep 2003 16:40:42 -0000 1.30
@@ -377,7 +377,7 @@
}
}
- // 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 (ejbName == null) {
ejbName = currentText.trim();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org