提交 4cabee9f 编写于 作者: K kohsuke

typo fixes.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1396 71c3de6d-444a-0410-be80-ed276b4c234a
上级 753702a8
......@@ -147,7 +147,7 @@ public final class FilePath {
}
/**
* {@link FilePath} constant that can be used if the directory is not importatn.
* {@link FilePath} constant that can be used if the directory is not important.
*/
public static final FilePath RANDOM = new FilePath(new File("."));
}
......@@ -19,7 +19,7 @@ import java.util.Map;
* <h2>'env' parameter</h2>
* <p>
* To allow important environment variables to be copied over to the remote machine,
* the 'env' parameter shouldn't contain default inherited environment varialbles
* the 'env' parameter shouldn't contain default inherited environment variables
* (which often contains machine-specific information, like PATH, TIMEZONE, etc.)
*
* <p>
......
......@@ -44,7 +44,7 @@ public final class PluginManager {
* (and including the classloader that loads Hudson itself.)
*
*/
// implementation is minmal --- just enough to run XStream
// implementation is minimal --- just enough to run XStream
// and load plugin-contributed classes.
public final ClassLoader uberClassLoader = new UberClassLoader();
......
......@@ -34,7 +34,7 @@ import org.apache.tools.ant.BuildException;
public class Util {
/**
* Replaces the occurence of '$key' by <tt>properties.get('key')</tt>.
* Replaces the occurrence of '$key' by <tt>properties.get('key')</tt>.
*
* <p>
* This is a rather naive implementation that causes somewhat unexpected
......@@ -245,7 +245,7 @@ public class Util {
}
/**
* Combines numer and unit, with a plural suffix if needed.
* Combines number and unit, with a plural suffix if needed.
*/
public static String combine(long n, String suffix) {
String s = Long.toString(n)+' '+suffix;
......
......@@ -45,7 +45,7 @@ public class WebAppMain implements ServletContextListener {
ServletContext context = event.getServletContext();
// make sure that we are using XStream in the "enhenced" (JVM-specific) mode
// make sure that we are using XStream in the "enhanced" (JVM-specific) mode
if(new JVM().bestReflectionProvider().getClass()==PureJavaReflectionProvider.class) {
// nope
context.setAttribute("app",new IncompatibleVMDetected());
......@@ -154,7 +154,7 @@ public class WebAppMain implements ServletContextListener {
if(root!=null) {
File ws = new File(root.trim());
if(ws.exists())
// Hudson <1.42 used to prefer this betfore ~/.hudson, so
// Hudson <1.42 used to prefer this before ~/.hudson, so
// check the existence and if it's there, use it.
// otherwise if this is a new installation, prefer ~/.hudson
return ws.getAbsoluteFile();
......
......@@ -2,11 +2,13 @@ package hudson;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.ConversionException;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.io.StreamException;
import com.thoughtworks.xstream.io.xml.XppReader;
import hudson.util.AtomicFileWriter;
import hudson.util.IOException2;
import hudson.util.XStream2;
import hudson.model.Descriptor;
import java.io.BufferedReader;
import java.io.File;
......@@ -54,13 +56,13 @@ import java.io.Reader;
*
* <p>
* In some limited cases (specifically when the class is the root object
* to be read from XML, such as {@link Descriptor}), it is posible
* to be read from XML, such as {@link Descriptor}), it is possible
* to completely and drastically change the data format. See
* {@link Descriptor#load()} for more about this technique.
*
* <p>
* There's a few other possibilities, such as implementing a custom
* {@link Converter} for XStream, or {@link XStream#alias(String, Class) registering an alias}.
* {@link Converter} for XStream, or {@link XStream#alias(String, Class) registering an alias}.
*
* @author Kohsuke Kawaguchi
*/
......
......@@ -183,7 +183,7 @@ public final class Build extends Run<Project,Build> implements Runnable {
/**
* Gets the downstream builds of this build, which are the builds of the
* downstream project sthat use artifacts of this build.
* downstream projects that use artifacts of this build.
*
* @return
* For each project with fingerprinting enabled, returns the range
......@@ -204,7 +204,7 @@ public final class Build extends Run<Project,Build> implements Runnable {
*
* @return
* Build number of the upstream build that feed into this build,
* or -1 if no record is avilable.
* or -1 if no record is available.
*/
public int getUpstreamRelationship(Project that) {
FingerprintAction f = getAction(FingerprintAction.class);
......
......@@ -19,7 +19,7 @@ import java.util.logging.Logger;
* <p>
* {@link Descriptor} is an object that has metadata about a {@link Describable}
* object, and also serves as a factory. A {@link Descriptor}/{@link Describable}
* combination is used throghout in Hudson to implement a
* combination is used throughout in Hudson to implement a
* configuration/extensibility mechanism.
*
* <p>
......@@ -121,7 +121,7 @@ public abstract class Descriptor<T extends Describable<T>> {
/**
* Invoked when the global configuration page is submitted.
*
* Can be overrided to store descriptor-specific information.
* Can be overriden to store descriptor-specific information.
*
* @return false
* to keep the client in the same config page.
......
......@@ -262,7 +262,7 @@ public class Fingerprint implements ModelObject {
Range m = lr.combine(rr);
rhs++;
// since ranges[lhs] is explanded, it might overlap with others in this.ranges
// since ranges[lhs] is expanded, it might overlap with others in this.ranges
while(lhs+1<this.ranges.size() && !m.isIndependent(this.ranges.get(lhs+1))) {
m = m.combine(this.ranges.get(lhs+1));
this.ranges.remove(lhs+1);
......
......@@ -147,7 +147,7 @@ public final class Hudson extends JobCollection implements Node {
public transient final PluginManager pluginManager;
/**
* List of reigstered {@link JobListener}s.
* List of registered {@link JobListener}s.
*/
private transient final List<JobListener> jobListeners = new Vector<JobListener>();
......@@ -643,7 +643,7 @@ public final class Hudson extends JobCollection implements Node {
return fingerprintMap;
}
// if no fingrer print matches, display "not found page".
// if no finger print matches, display "not found page".
public Object getFingerprint( String md5sum ) throws IOException {
Fingerprint r = fingerprintMap.get(md5sum);
if(r==null) return new NoFingerprintMatch(md5sum);
......@@ -1133,7 +1133,7 @@ public final class Hudson extends JobCollection implements Node {
}
/**
* For debugging. Expose URL to perfrom GC.
* For debugging. Expose URL to perform GC.
*/
public void doGc( StaplerRequest req, StaplerResponse rsp ) throws IOException {
System.gc();
......@@ -1144,7 +1144,7 @@ public final class Hudson extends JobCollection implements Node {
/**
* For system diagnostics.
* Run arbitraary Groovy script.
* Run arbitrary Groovy script.
*/
public void doScript( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
if(!adminCheck(req,rsp))
......
......@@ -71,7 +71,7 @@ public abstract class Job<JobT extends Job<JobT,RunT>, RunT extends Run<JobT,Run
protected transient File root;
/**
* Next bulid number.
* Next build number.
* Kept in a separate file because this is the only information
* that gets updated often. This allows the rest of the configuration
* to be in the VCS.
......
......@@ -80,7 +80,7 @@ public class LargeText {
/**
* Points to the start of the region that's not committed
* to the ouput yet.
* to the output yet.
*/
private static final class HeadMark extends Mark {
public HeadMark(ByteBuf buf) {
......
......@@ -208,7 +208,7 @@ public class Queue {
}
/**
* Returns true if this queue contaisn the said project.
* Returns true if this queue contains the said project.
*/
public synchronized boolean contains(Project p) {
// if this project is already scheduled,
......@@ -241,7 +241,7 @@ public class Queue {
assert !parked.containsKey(exec);
parked.put(exec,offer);
// reuse executor thread to do a queue maintainance.
// reuse executor thread to do a queue maintenance.
// at the end of this we get all the buildable jobs
// in the buildables field.
maintain();
......@@ -316,7 +316,7 @@ public class Queue {
}
/**
* Choses the executor to carry out the build for the given project.
* Chooses the executor to carry out the build for the given project.
*
* @return
* null if no {@link Executor} can run it.
......@@ -393,7 +393,7 @@ public class Queue {
/**
* Queue maintainance.
* Queue maintenance.
*
* Move projects between {@link #queue}, {@link #blockedProjects}, and {@link #buildables}
* appropriately.
......
......@@ -547,7 +547,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
result = Result.FAILURE;
}
// even if the main buidl fails fatally, try to run post build processing
// even if the main build fails fatally, try to run post build processing
job.post(listener);
} catch (ThreadDeath t) {
......@@ -582,7 +582,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
}
/**
* Handles a fatal build problem (exception) that occured during the build.
* Handles a fatal build problem (exception) that occurred during the build.
*/
private void handleFatalBuildProblem(BuildListener listener, Throwable e) {
if(listener!=null) {
......@@ -693,7 +693,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
AbstractTestResultAction trP = prev==null ? null : ((Build) prev).getTestResultAction();
if(trP==null) {
if(trN!=null && trN.getFailCount()>0)
return new Summary(false,combine(trN.getFailCount(),"test faliure"));
return new Summary(false,combine(trN.getFailCount(),"test failure"));
else // ???
return new Summary(false,"unstable");
}
......@@ -783,7 +783,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
// due to dependencies!
String why = getWhyKeepLog();
if (why!=null) {
sendError("Unabled to delete "+toString()+": "+why,req,rsp);
sendError("Unable to delete "+toString()+": "+why,req,rsp);
return;
}
......
......@@ -15,7 +15,7 @@ public abstract class UserPropertyDescriptor extends Descriptor<UserProperty> {
* with {@link User} that doesn't have any back up data store.
*
* @return null
* if the implementation choose not to add any proeprty object for such user.
* if the implementation choose not to add any property object for such user.
*/
public abstract UserProperty newInstance(User user);
}
......@@ -783,7 +783,7 @@ public class CVSSCM extends AbstractCVSFamilySCM {
* Runs cvs login command.
*
* TODO: this apparently doesn't work. Probably related to the fact that
* cvs does some tty magic to disable ecoback or whatever.
* cvs does some tty magic to disable echo back or whatever.
*/
public void doPostPassword(StaplerRequest req, StaplerResponse rsp) throws IOException {
if(!Hudson.adminCheck(req,rsp))
......
......@@ -282,7 +282,7 @@ public class SubversionSCM extends AbstractCVSFamilySCM {
// failed. to allow user to diagnose the problem, send output to log
listener.getLogger().write(baos.toByteArray());
e.printStackTrace(listener.fatalError("Failed to parse Subversion output"));
throw new IOException("Unabled to parse svn info output");
throw new IOException("Unable to parse svn info output");
}
if(!info.isComplete())
......
......@@ -190,7 +190,7 @@ public class Fingerprinter extends Publisher {
}
/**
* Map from file names of the fingeprinted file to its fingerprint record.
* Map from file names of the fingerprinted file to its fingerprint record.
*/
public synchronized Map<String,Fingerprint> getFingerprints() {
if(ref!=null) {
......
......@@ -53,7 +53,7 @@ public class LogRotator implements Describable<LogRotator> {
if(daysToKeep!=-1) {
Calendar cal = new GregorianCalendar();
cal.add(Calendar.DAY_OF_YEAR,-daysToKeep);
// copy it to the array becaues we'll be deleting builds as we go.
// copy it to the array because we'll be deleting builds as we go.
for( Run r : job.getBuilds().toArray(new Run[0]) ) {
if(r.getTimestamp().before(cal) && !r.isKeepLog() && r!=lsb)
r.delete();
......
......@@ -302,7 +302,7 @@ public class Mailer extends Publisher {
/**
* The e-mail address that Hudson puts to "From:" field in outgoing e-mails.
* Null if unconfigured.
* Null if not configured.
*/
private String adminAddress;
......
......@@ -22,7 +22,7 @@ public class ArgumentListBuilder {
* This is necessary only in a rare circumstance,
* such as when adding argument for ssh and rsh.
*
* Normal process invcations don't need it, because each
* Normal process invocations don't need it, because each
* argument is treated as its own string and never merged into one.
*/
public ArgumentListBuilder addQuoted(String a) {
......
......@@ -3,7 +3,7 @@ package hudson.util;
import java.awt.Color;
/**
* Color constants consistend with the Hudson color palette.
* Color constants consistent with the Hudson color palette.
*
* @author Kohsuke Kawaguchi
*/
......
......@@ -15,7 +15,7 @@
<div style="float:right">
<j:set var="tr" value="${it.lastSuccessfulBuild.testResultAction}" />
<j:if test="${tr.previousResult!=null}">
<!-- at least two data points are requierd for a trend report -->
<!-- at least two data points are required for a trend report -->
<div align="right">
<j:set var="mode" value="${h.getCookie(request,'TestResultAction_failureOnly').value}" />
<j:if test="${mode!=null}">
......
......@@ -13,7 +13,7 @@
<li>Password will be stored in a clear text in Hudson</li>
</ol>
<p>
A preferrable approach is to do the following steps:
A preferable approach is to do the following steps:
</p>
<ol>
<li>Logon to the server that runs Hudson, by using the same user account Hudson uses</li>
......
<!--
Displays the toggle button to keep/unkeep the log file.
Displays the toggle button to keep/don't-keep the log file.
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<j:if test="${it.parent.logRotator!=null}">
......
<!--
Repetable blocks where duplicates can be added/removed at client.
Repeatable blocks where duplicates can be added/removed at client.
<%@attribute name="var" required="true" rtexprvalue="false" %>
<%@attribute name="varStatus" required="false" rtexprvalue="false" %>
......
<!--
Show a long bar that shows how many tests have failed and suceeded.
Show a long bar that shows how many tests have failed and succeeded.
Attributes
==========
......
......@@ -6,7 +6,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintStream;
/**
* TODO: junit-ize
* TODO: make it a junit test
*
* @author jglick
*/
......
......@@ -315,7 +315,7 @@ public class Channel implements VirtualChannel {
logger.fine("Received "+cmd);
cmd.execute(Channel.this);
} catch (ClassNotFoundException e) {
logger.log(Level.SEVERE, "Unabled to read a command",e);
logger.log(Level.SEVERE, "Unable to read a command",e);
}
}
ois.close();
......
......@@ -24,7 +24,7 @@ import java.util.logging.Logger;
* <p>
* Once created, {@link Pipe} can be sent to the remote system as a part of a serialization of
* {@link Callable} between {@link Channel}s.
* Once re-instanciated on the remote {@link Channel}, pipe automatically connects
* Once re-instantiated on the remote {@link Channel}, pipe automatically connects
* back to the local instance and perform necessary set up.
*
* <p>
......
......@@ -80,7 +80,7 @@ abstract class Request<RSP extends Serializable,EXC extends Throwable> extends C
/**
* Makes an invocation but immediately returns without waiting for the completion
* (AKA aysnchronous invocation.)
* (AKA asynchronous invocation.)
*
* @param channel
* The channel from which the request will be sent.
......
......@@ -11,7 +11,7 @@ import java.io.FileOutputStream;
import java.net.URL;
/**
* Used to load a dummay class <tt>hudson.remoting.test.TestCallable</tt>
* Used to load a dummy class <tt>hudson.remoting.test.TestCallable</tt>
* out of nowhere, to test {@link RemoteClassLoader}.
*
* @author Kohsuke Kawaguchi
......
......@@ -46,7 +46,7 @@ public abstract class RmiTestBase extends TestCase {
/**
* Can be used in the suite method of the derived class to build a
* {@link TestSuite} to run the test witih all the available
* {@link TestSuite} to run the test with all the available
* {@link ChannelRunner} configuration.
*/
protected static Test buildSuite(Class<? extends RmiTestBase> testClass) {
......
......@@ -16,7 +16,7 @@
for how to do this.
<br/>
</j:if>
<!-- TODO: this doesn't owk
<!-- TODO: this doesn't work
You can also <a href="scm/CVSSCM/enterPassword">interactively enter password into the cvs password list</a>.
<j:if test="${h.isWindows()}">This works even with CVSNT.</j:if>
-->
......
<div>
Hudson 1.20 and earlier used to create redudant directories inside the workspace.
Hudson 1.20 and earlier used to create redundant directories inside the workspace.
For example, if the CVS module name is "foo/bar", it first created "foo/bar" and
then put everything below. With this option checked off, there will be no more
such unnecessary intermediate directories.
<p>
This affects other path specifiers, such as artifact archiverers --- you now specify
This affects other path specifiers, such as artifact archivers --- you now specify
"build/foo.jar" instead of "foo/build/foo.jar".
</div>
\ No newline at end of file
......@@ -6,9 +6,9 @@
This feature is primarily for using Hudson as a cron replacement,
and it is <b>not ideal for continuously building software project</b>.
When people first start continous integration, they are often so used to
When people first start continuous integration, they are often so used to
the idea of regularly scheduled builds like nightly/weekly that they use
this feature. However, the point of continous integration is to start
this feature. However, the point of continuous integration is to start
a build as soon as a change is made, to provide a quick feedback to the change.
To do that you need to
<a href="https://hudson.dev.java.net/build.html">hook up SCM change notification to Hudson.</a>.
......
......@@ -12,5 +12,5 @@
<p>
If you are exposing Hudson to the internet, you must turn this on. Hudson launches
processes, so unsecure Hudson is a sure way of being hacked.
processes, so insecure Hudson is a sure way of being hacked.
</div>
\ No newline at end of file
<div>
Command to be used to execute a program on this slave, such as
'ssh slave1' or 'rsh slave2'. Hudson appends the actual command it wants to run
after this and then execute it locally, and then expects the command you spplied
after this and then execute it locally, and then expects the command you supplied
to do the remote job submission.
<p>
......
......@@ -9,6 +9,6 @@
for I/O.
<p>
Setting this value to 0 is useful to remove a disabled slave from Hudson temporalily without
Setting this value to 0 is useful to remove a disabled slave from Hudson temporarily without
losing other configuration information.
</div>
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册