FIX: Change spelling of 'occured' to 'occurred' (IVY-1123)

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@820811 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -94,6 +94,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
 	
    trunk
 =====================================
+- FIX: Change spelling of 'occured' to 'occurred' (IVY-1123)
 - FIX: Ivy deliver fails to replace dynamic revision when using extra attributes (IVY-1111) (thanks to Michael Scheetz)
 - FIX: IbiblioResolver not always correctly configured when using JRE 1.5 (IVY-1124) (thanks to Flavio Coutinho da Costa)
 - FIX: VstfpRepository.readResponse uses bad compare logic (IVY-1119) (thanks to Dave Brosius)

doc/samples/apache-hello-ivy-default.html

@@ -53,7 +53,7 @@
             (0 searched <img src="http://ivy.jayasoft.org/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved">,
             0 downloaded <img src="http://ivy.jayasoft.org/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver">,
             1 evicted <img src="http://ivy.jayasoft.org/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others">,
-            0 errors <img src="http://ivy.jayasoft.org/images/error.gif" alt="error" title="module revisions on which error occured">)</td>
+            0 errors <img src="http://ivy.jayasoft.org/images/error.gif" alt="error" title="module revisions on which error occurred">)</td>
 </tr>
 <tr>
 <td class="title">Artifacts</td><td class="value">3 

doc/samples/jayasoft-ivyrep-example-default.html

@@ -55,7 +55,7 @@
             (0 searched <img title="module revisions which required a search with a dependency resolver to be resolved" alt="searched" src="../images/searched.gif">,
             0 downloaded <img title="module revisions for which ivy file was downloaded by dependency resolver" alt="downloaded" src="../images/downloaded.gif">,
             1 evicted <img title="module revisions which were evicted by others" alt="evicted" src="../images/evicted.gif">,
-            0 errors <img title="module revisions on which error occured" alt="error" src="../images/error.gif">)</td>
+            0 errors <img title="module revisions on which error occurred" alt="error" src="../images/error.gif">)</td>
 </tr>
 <tr>
 <td class="title">Artifacts</td><td class="value">3 

src/example/multi-project/projects/version/src/version/Version.java

@@ -40,7 +40,7 @@ public final class Version {
             versions.put(module, version);
             System.out.println("--- using " + module + " v" + version);
         } catch (Exception ex) {
-            System.err.println("an error occured while registering " + module + ": "
+            System.err.println("an error occurred while registering " + module + ": "
                     + ex.getMessage());
             ex.printStackTrace();
         }

src/java/org/apache/ivy/core/cache/RepositoryCacheManager.java

@@ -127,7 +127,7 @@ public interface RepositoryCacheManager {
      * @return a {@link ResolvedModuleRevision} representing the local cached module descriptor, or
      *         null if it failed
      * @throws ParseException
-     *             if an exception occured while parsing the module descriptor
+     *             if an exception occurred while parsing the module descriptor
      */
     public ResolvedModuleRevision cacheModuleDescriptor(DependencyResolver resolver,
             ResolvedResource orginalMetadataRef, DependencyDescriptor dd, 

src/java/org/apache/ivy/core/resolve/ResolveEngine.java

@@ -462,7 +462,7 @@ public class ResolveEngine {
      *            the date to which resolution must be done - may be null
      * @return an array of the resolved dependencies
      * @throws ParseException
-     *             if a parsing problem occured in the ivy file
+     *             if a parsing problem occurred in the ivy file
      * @throws IOException
      *             if an IO problem was raised during ivy file parsing
      */
@@ -1009,7 +1009,7 @@ public class ResolveEngine {
      *            the configuration of the node in which conflicts should be computed
      * @param toevict
      *            a collection of nodes which have been evicted during conflict resolution at lower
-     *            level. It may be empty if no conflict resolution has occured for this node yet, or
+     *            level. It may be empty if no conflict resolution has occurred for this node yet, or
      *            if no node has been evicted.
      * @param selectedNodes
      *            a collection of nodes selected during previous conflict resolution for the given

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

@@ -148,7 +148,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
                         .setUpdateBranch(false)
                         .setNamespace(ns));
         } catch (SAXException e) {
-            ParseException ex = new ParseException("exception occured while parsing " + res, 0);
+            ParseException ex = new ParseException("exception occurred while parsing " + res, 0);
             ex.initCause(e);
             throw ex;
         } finally {
@@ -334,7 +334,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
                 if (ex instanceof SAXException) {
                     throw (SAXException) ex;
                 }
-                SAXException sax = new SAXException("Problem occured while parsing ivy file: "
+                SAXException sax = new SAXException("Problem occurred while parsing ivy file: "
                         + ex.getMessage(), ex);
                 sax.initCause(ex);
                 throw sax;

src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java

@@ -551,7 +551,7 @@ public final class XmlModuleDescriptorUpdater {
                     }
                 });
             } catch (Exception e) {
-                Message.warn("exception occured while importing configurations: "
+                Message.warn("exception occurred while importing configurations: "
                         + e.getMessage());
                 throw new SAXException(e);
             }

src/java/org/apache/ivy/plugins/report/ivy-report.xsl

@@ -293,7 +293,7 @@
             (<xsl:value-of select="count($searcheds)"/> searched <img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved"/>,
             <xsl:value-of select="count($downloadeds)"/> downloaded <img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver"/>,
             <xsl:value-of select="count($evicteds)"/> evicted <img src="http://ant.apache.org/ivy/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others"/>,
-            <xsl:value-of select="count($errors)"/> errors <img src="http://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occured"/>)</td></tr>
+            <xsl:value-of select="count($errors)"/> errors <img src="http://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occurred"/>)</td></tr>
           <tr><td class="title">Artifacts</td><td class="value"><xsl:value-of select="count($artifacts)"/> 
             (<xsl:value-of select="count($dlartifacts)"/> downloaded,
             <xsl:value-of select="count($faileds)"/> failed)</td></tr>

src/java/org/apache/ivy/plugins/repository/TransferEvent.java

@@ -68,7 +68,7 @@ public class TransferEvent extends IvyEvent {
     public static final int TRANSFER_PROGRESS = 3;
 
     /**
-     * An error occured during transfer
+     * An error occurred during transfer
      */
     public static final int TRANSFER_ERROR = 4;
 

src/java/org/apache/ivy/plugins/resolver/ChainResolver.java

@@ -132,7 +132,7 @@ public class ChainResolver extends AbstractResolver {
                     mr = forcedRevision(mr);
                 }
             } catch (Exception ex) {
-                Message.verbose("problem occured while resolving " + dd + " with " + resolver
+                Message.verbose("problem occurred while resolving " + dd + " with " + resolver
                         + ": " + StringUtils.getStackTrace(ex));
                 errors.add(ex);
             } finally {
@@ -159,7 +159,7 @@ public class ChainResolver extends AbstractResolver {
                     err.append("\t").append(StringUtils.getErrorMessage(ex)).append("\n");
                 }
                 err.setLength(err.length() - 1);
-                throw new RuntimeException("several problems occured while resolving " + dd + ":\n"
+                throw new RuntimeException("several problems occurred while resolving " + dd + ":\n"
                         + err);
             }
         }

src/java/org/apache/ivy/util/CredentialsUtil.java

@@ -115,7 +115,7 @@ public final class CredentialsUtil {
                     fos = new FileOutputStream(passfile);
                     props.store(fos, "");
                 } catch (Exception e) {
-                    Message.warn("error occured while saving password file " + passfile + ": " + e);
+                    Message.warn("error occurred while saving password file " + passfile + ": " + e);
                 } finally {
                     if (fos != null) {
                         try {
@@ -148,7 +148,7 @@ public final class CredentialsUtil {
                 }
                 return new Credentials(c.getRealm(), c.getHost(), username, passwd);
             } catch (IOException e) {
-                Message.warn("error occured while loading password file " + passfile + ": " + e);
+                Message.warn("error occurred while loading password file " + passfile + ": " + e);
             } finally {
                 if (fis != null) {
                     try {

src/java/org/apache/ivy/util/PropertiesFile.java

@@ -40,7 +40,7 @@ public class PropertiesFile extends Properties {
                 fis = new FileInputStream(file);
                 load(fis);
             } catch (Exception ex) {
-                Message.warn("exception occured while reading properties file " + file + ": "
+                Message.warn("exception occurred while reading properties file " + file + ": "
                         + ex.getMessage());
             }
             try {
@@ -62,7 +62,7 @@ public class PropertiesFile extends Properties {
             fos = new FileOutputStream(file);
             store(fos, header);
         } catch (Exception ex) {
-            Message.warn("exception occured while writing properties file " + file + ": "
+            Message.warn("exception occurred while writing properties file " + file + ": "
                     + ex.getMessage());
         }
         try {