You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ar...@apache.org on 2021/01/08 09:57:49 UTC

[metamodel] branch master updated: Fix spelling errors

This is an automated email from the ASF dual-hosted git repository.

arjansh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e1c8aa  Fix spelling errors
4e1c8aa is described below

commit 4e1c8aa95f45af2370e489a05bb5fd8d978fb835
Author: William Edmisten <wc...@gmail.com>
AuthorDate: Thu Jan 7 17:18:23 2021 -0500

    Fix spelling errors
---
 .../org/apache/metamodel/AbstractDataContext.java  | 10 ++++----
 .../apache/metamodel/AbstractUpdateCallback.java   |  4 ++--
 .../java/org/apache/metamodel/DataContext.java     |  6 ++---
 .../org/apache/metamodel/MetaModelException.java   |  2 +-
 .../java/org/apache/metamodel/MetaModelHelper.java |  4 ++--
 .../metamodel/QueryPostprocessDataContext.java     |  2 +-
 .../metamodel/convert/ColumnTypeDetector.java      |  2 +-
 .../metamodel/create/ColumnCreationBuilder.java    |  2 +-
 .../apache/metamodel/data/RowPublisherDataSet.java |  4 ++--
 .../apache/metamodel/data/WhereClauseBuilder.java  |  2 +-
 .../intercept/InterceptableUpdateCallback.java     |  6 ++---
 .../apache/metamodel/intercept/Interceptor.java    |  2 +-
 .../org/apache/metamodel/query/FilterClause.java   |  2 +-
 .../org/apache/metamodel/query/OperatorType.java   |  4 ++--
 .../apache/metamodel/query/OperatorTypeImpl.java   |  2 +-
 .../apache/metamodel/query/parser/QueryParser.java |  6 ++---
 .../query/parser/QueryPartCollectionProcessor.java |  2 +-
 .../metamodel/query/parser/QueryPartParser.java    |  4 ++--
 .../metamodel/query/parser/QueryPartProcessor.java |  4 ++--
 .../org/apache/metamodel/schema/ColumnType.java    |  2 +-
 .../apache/metamodel/schema/ImmutableColumn.java   |  2 +-
 .../metamodel/schema/MutableRelationship.java      |  2 +-
 .../java/org/apache/metamodel/schema/Table.java    |  4 ++--
 .../org/apache/metamodel/util/FormatHelper.java    |  2 +-
 .../java/org/apache/metamodel/util/Resource.java   |  2 +-
 .../org/apache/metamodel/util/UnicodeWriter.java   |  2 +-
 .../org/apache/metamodel/query/SelectItemTest.java |  2 +-
 .../org/apache/metamodel/schema/Java5Types.java    |  2 +-
 .../org/apache/metamodel/schema/Java6Types.java    |  4 ++--
 .../couchdb/CouchDbTableCreationBuilder.java       |  2 +-
 .../java/org/apache/metamodel/csv/CsvDataSet.java  |  3 +--
 .../metamodel/dynamodb/DynamoDbDataContext.java    |  4 ++--
 .../AbstractElasticSearchDataSet.java              |  2 +-
 .../nativeclient/ElasticSearchDataContextTest.java |  2 +-
 .../apache/metamodel/excel/ExcelInsertBuilder.java |  3 +--
 .../metamodel/excel/ExcelDataContextTest.java      |  2 +-
 .../metamodel/excel/ExcelUpdateCallbackTest.java   |  3 +--
 .../org/apache/metamodel/DataContextFactory.java   | 28 +++++++++++-----------
 .../apache/metamodel/hbase/CreateTableTest.java    |  2 +-
 .../org/apache/metamodel/hbase/DropTableTest.java  |  2 +-
 .../org/apache/metamodel/hbase/InsertRowTest.java  |  4 ++--
 .../org/apache/metamodel/jdbc/JdbcDataContext.java |  8 +++----
 .../java/org/apache/metamodel/jdbc/JdbcUtils.java  |  2 +-
 .../metamodel/jdbc/RolledBackUpdateException.java  |  2 +-
 .../metamodel/jdbc/dialects/IQueryRewriter.java    |  4 ++--
 .../org/apache/metamodel/jdbc/JdbcColumnTest.java  |  2 +-
 .../org/apache/metamodel/jdbc/JdbcSchemaTest.java  |  2 +-
 .../apache/metamodel/jdbc/JdbcTestTemplates.java   |  2 +-
 .../java/org/apache/metamodel/jdbc/SqliteTest.java |  2 +-
 .../integrationtests/SQLServerJtdsDriverTest.java  |  2 +-
 .../salesforce/SalesforceUpdateCallback.java       |  2 +-
 .../spring/DataContextFactoryBeanDelegate.java     |  2 +-
 .../apache/metamodel/xml/XmlDomDataContext.java    |  4 ++--
 .../apache/metamodel/xml/XmlSaxDataContext.java    |  4 ++--
 54 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
index c1ff8e3..87a3035 100644
--- a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
@@ -279,8 +279,8 @@ public abstract class AbstractDataContext implements DataContext {
         for (final String schemaName : schemaNames) {
             if (schemaName != null) {
                 // search case-insensitive
-                String schameNameInLowerCase = schemaName.toLowerCase();
-                Column col = searchColumn(schameNameInLowerCase, columnName, columnNameInLowerCase);
+                String schemaNameInLowerCase = schemaName.toLowerCase();
+                Column col = searchColumn(schemaNameInLowerCase, columnName, columnNameInLowerCase);
                 if (col != null) {
                     return col;
                 }
@@ -465,18 +465,18 @@ public abstract class AbstractDataContext implements DataContext {
                 currentToken.setLength(0);
 
                 if (tokens.size() > expectedParts) {
-                    // unsuccesfull - return null
+                    // unsuccessful - return null
                     return null;
                 }
             } else if (c == '"') {
                 if (inQuotes) {
                     if (i + 1 < path.length() && path.charAt(i + 1) != '.') {
-                        // unsuccesfull - return null
+                        // unsuccessful - return null
                         return null;
                     }
                 } else {
                     if (currentToken.length() > 0) {
-                        // unsuccesfull - return null
+                        // unsuccessful - return null
                         return null;
                     }
                 }
diff --git a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java b/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
index 4ff7279..f05a52a 100644
--- a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
+++ b/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
@@ -132,13 +132,13 @@ public abstract class AbstractUpdateCallback implements UpdateCallback {
 
     @Override
     public boolean isCreateTableSupported() {
-        // since 2.0 all updateable datacontext have create table support
+        // since 2.0 all updatable datacontext have create table support
         return true;
     }
 
     @Override
     public boolean isInsertSupported() {
-        // since 2.0 all updateable datacontext have insert into table support
+        // since 2.0 all updatable datacontext have insert into table support
         return true;
     }
 
diff --git a/core/src/main/java/org/apache/metamodel/DataContext.java b/core/src/main/java/org/apache/metamodel/DataContext.java
index f91204b..db0137f 100644
--- a/core/src/main/java/org/apache/metamodel/DataContext.java
+++ b/core/src/main/java/org/apache/metamodel/DataContext.java
@@ -110,7 +110,7 @@ public interface DataContext {
      *            the SQL query to parse
      * @return a {@link Query} object corresponding to the SQL query.
      * @throws MetaModelException
-     *             in case the parsing was unsuccesful.
+     *             in case the parsing was unsuccessful.
      */
     public Query parseQuery(String queryString) throws MetaModelException;
 
@@ -129,7 +129,7 @@ public interface DataContext {
     /**
      * Compiles a query, preparing it for reuse. Often times compiled queries
      * have a performance improvement when executed, but at the cost of a
-     * preparation time penalty. Therefore it is adviced to use compiled queries
+     * preparation time penalty. Therefore it is advised to use compiled queries
      * when the same query is to be fired multiple times.
      * 
      * Compiled queries can contain {@link QueryParameter}s as operands in the
@@ -145,7 +145,7 @@ public interface DataContext {
      * @return the {@link CompiledQuery} after preparing the query
      * 
      * @throws MetaModelException
-     *             if preparing the query is unsuccesful
+     *             if preparing the query is unsuccessful
      */
     public CompiledQuery compileQuery(Query query) throws MetaModelException;
 
diff --git a/core/src/main/java/org/apache/metamodel/MetaModelException.java b/core/src/main/java/org/apache/metamodel/MetaModelException.java
index dca6c23..2a9befb 100644
--- a/core/src/main/java/org/apache/metamodel/MetaModelException.java
+++ b/core/src/main/java/org/apache/metamodel/MetaModelException.java
@@ -19,7 +19,7 @@
 package org.apache.metamodel;
 
 /**
- * Unchecked exception used to signal errors occuring in MetaModel.
+ * Unchecked exception used to signal errors occurring in MetaModel.
  * 
  * All MetaModelExceptions represent errors discovered withing the MetaModel
  * framework. Typically these will occur if you have put together a query that
diff --git a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
index f633918..68541c1 100644
--- a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
+++ b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
@@ -90,7 +90,7 @@ public final class MetaModelHelper {
     }
 
     /**
-     * Creates an array of tables where all occurences of tables in the provided list of tables and columns are included
+     * Creates an array of tables where all occurrences of tables in the provided list of tables and columns are included
      */
     public static Table[] getTables(Collection<Table> tableList, Iterable<Column> columnList) {
         HashSet<Table> set = new HashSet<Table>();
@@ -184,7 +184,7 @@ public final class MetaModelHelper {
 
     public static DataSet getCarthesianProduct(DataSet[] fromDataSets, Iterable<FilterItem> whereItems) {
         assert (fromDataSets.length > 0);
-        // First check if carthesian product is even nescesary
+        // First check if carthesian product is even necessary
         if (fromDataSets.length == 1) {
             return getFiltered(fromDataSets[0], whereItems);
         }
diff --git a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java b/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
index a873a32..d5a956f 100644
--- a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
@@ -360,7 +360,7 @@ public abstract class QueryPostprocessDataContext extends AbstractDataContext im
             throw new IllegalArgumentException("FromItem type not supported: " + fromItem);
         }
         if (dataSet == null) {
-            throw new IllegalStateException("FromItem was not succesfully materialized: " + fromItem);
+            throw new IllegalStateException("FromItem was not successfully materialized: " + fromItem);
         }
         
         return dataSet;
diff --git a/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java b/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java
index 7ff75f2..94dc461 100644
--- a/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java
+++ b/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java
@@ -51,7 +51,7 @@ final class ColumnTypeDetector {
 				_integerPossible = false;
 			}
 			// If integer is possible, double will always also be possible,
-			// but not nescesarily the other way around
+			// but not necessarily the other way around
 			if (_integerPossible) {
 				try {
 					Integer.parseInt(stringValue);
diff --git a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java b/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java
index 8fcc49a..7827392 100644
--- a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java
@@ -21,7 +21,7 @@ package org.apache.metamodel.create;
 import org.apache.metamodel.schema.Column;
 
 /**
- * Builder object for creating {@link Column}s. This class also extendsthe
+ * Builder object for creating {@link Column}s. This class also extends the
  * {@link TableCreationBuilder} (allowing to step immediately out of the column
  * building and back to the table building immediately).
  */
diff --git a/core/src/main/java/org/apache/metamodel/data/RowPublisherDataSet.java b/core/src/main/java/org/apache/metamodel/data/RowPublisherDataSet.java
index 0c1d38d..93254e4 100644
--- a/core/src/main/java/org/apache/metamodel/data/RowPublisherDataSet.java
+++ b/core/src/main/java/org/apache/metamodel/data/RowPublisherDataSet.java
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Abstract {@link DataSet} implementation for use in scenarios where a
  * pull-oriented style of reading data is not supported. This implementation
- * instead allows a publshing action to publish rows to the dataset in a
+ * instead allows a publishing action to publish rows to the dataset in a
  * blocking manner, and thereby to adapt without having to load all rows into
  * memory.
  */
@@ -93,7 +93,7 @@ public final class RowPublisherDataSet extends AbstractDataSet {
                     boolean successful = false;
                     try {
                         _publishAction.run(_rowPublisher);
-                        logger.debug("Publshing action finished!");
+                        logger.debug("Publishing action finished!");
                         successful = true;
                     } catch (Exception e) {
                         _rowPublisher.failed(e);
diff --git a/core/src/main/java/org/apache/metamodel/data/WhereClauseBuilder.java b/core/src/main/java/org/apache/metamodel/data/WhereClauseBuilder.java
index b2864b3..bee479b 100644
--- a/core/src/main/java/org/apache/metamodel/data/WhereClauseBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/data/WhereClauseBuilder.java
@@ -44,7 +44,7 @@ public interface WhereClauseBuilder<T> {
      * Defines a where item to set as a criteria
      * 
      * @param columnName
-     *            the name of the colum to which the criteria will be applied
+     *            the name of the column to which the criteria will be applied
      * @return a builder object for further building the where item
      */
     public FilterBuilder<T> where(String columnName);
diff --git a/core/src/main/java/org/apache/metamodel/intercept/InterceptableUpdateCallback.java b/core/src/main/java/org/apache/metamodel/intercept/InterceptableUpdateCallback.java
index 1c9b80f..b3d3edd 100644
--- a/core/src/main/java/org/apache/metamodel/intercept/InterceptableUpdateCallback.java
+++ b/core/src/main/java/org/apache/metamodel/intercept/InterceptableUpdateCallback.java
@@ -58,11 +58,11 @@ final class InterceptableUpdateCallback extends AbstractUpdateCallback implement
     @Override
     public TableCreationBuilder createTable(Schema schema, String name) throws IllegalArgumentException,
             IllegalStateException {
-        TableCreationBuilder tabelCreationBuilder = _updateCallback.createTable(schema, name);
+        TableCreationBuilder tableCreationBuilder = _updateCallback.createTable(schema, name);
         if (_tableCreationInterceptors.isEmpty()) {
-            return tabelCreationBuilder;
+            return tableCreationBuilder;
         }
-        return new InterceptableTableCreationBuilder(tabelCreationBuilder, _tableCreationInterceptors);
+        return new InterceptableTableCreationBuilder(tableCreationBuilder, _tableCreationInterceptors);
     }
 
     @Override
diff --git a/core/src/main/java/org/apache/metamodel/intercept/Interceptor.java b/core/src/main/java/org/apache/metamodel/intercept/Interceptor.java
index 2fcf6e8..8a71ba0 100644
--- a/core/src/main/java/org/apache/metamodel/intercept/Interceptor.java
+++ b/core/src/main/java/org/apache/metamodel/intercept/Interceptor.java
@@ -21,7 +21,7 @@ package org.apache.metamodel.intercept;
 /**
  * Defines a high-level interface for interceptors in MetaModel.
  * 
- * An intereptor can touch, modify, enhance or do other operations on certain
+ * An interceptor can touch, modify, enhance or do other operations on certain
  * object types as they are passed around for execution in MetaModel. There are
  * 5 types of concrete interceptors:
  * 
diff --git a/core/src/main/java/org/apache/metamodel/query/FilterClause.java b/core/src/main/java/org/apache/metamodel/query/FilterClause.java
index 703e2de..7662a85 100644
--- a/core/src/main/java/org/apache/metamodel/query/FilterClause.java
+++ b/core/src/main/java/org/apache/metamodel/query/FilterClause.java
@@ -28,7 +28,7 @@ import org.apache.metamodel.schema.Column;
  * the WHERE and HAVING parts of an SQL query.
  * 
  * Each provided FilterItem will be evaluated with the logical AND operator,
- * which requires that all filters are applied. Alternatively, if you wan't to
+ * which requires that all filters are applied. Alternatively, if you want to
  * use an OR operator, then use the appropriate constructor of FilterItem to
  * create a composite filter.
  * 
diff --git a/core/src/main/java/org/apache/metamodel/query/OperatorType.java b/core/src/main/java/org/apache/metamodel/query/OperatorType.java
index a0daccc..51bf796 100644
--- a/core/src/main/java/org/apache/metamodel/query/OperatorType.java
+++ b/core/src/main/java/org/apache/metamodel/query/OperatorType.java
@@ -51,8 +51,8 @@ public interface OperatorType extends Serializable {
             NOT_LIKE, GREATER_THAN, GREATER_THAN_OR_EQUAL, LESS_THAN, LESS_THAN_OR_EQUAL, IN, NOT_IN };
 
 /**
-     * Determines if this operator requires a space delimitor. Operators that are written using letters usually require
-     * space delimitation whereas sign-based operators such as "=" and "&lt;" can be applied even without any delimitaton.
+     * Determines if this operator requires a space delimiter. Operators that are written using letters usually require
+     * space delimitation whereas sign-based operators such as "=" and "&lt;" can be applied even without any delimitation.
      * 
      * @return
      */
diff --git a/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java b/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java
index 753dc37..50667df 100644
--- a/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java
+++ b/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java
@@ -54,7 +54,7 @@ public class OperatorTypeImpl implements OperatorType {
             return true;
         }
         if (obj instanceof OperatorType) {
-            // we only require another OperatorType, not necesarily an _Impl_.
+            // we only require another OperatorType, not necessarily an _Impl_.
             // This is to allow other implementations that wrap this. For
             // instance the implementation provided by
             // LegacyDeserializationObjectInputStream.
diff --git a/core/src/main/java/org/apache/metamodel/query/parser/QueryParser.java b/core/src/main/java/org/apache/metamodel/query/parser/QueryParser.java
index 69dd355..4bdbbc3 100644
--- a/core/src/main/java/org/apache/metamodel/query/parser/QueryParser.java
+++ b/core/src/main/java/org/apache/metamodel/query/parser/QueryParser.java
@@ -161,7 +161,7 @@ public class QueryParser {
     }
 
     private void parseWhereClause(Query query, String whereClause) {
-        // only parse "AND" delimitors, since "OR" will be taken care of as
+        // only parse "AND" delimiters, since "OR" will be taken care of as
         // compound filter items at 2nd level parsing
         QueryPartParser clauseParser = new QueryPartParser(new WhereItemParser(query), whereClause, " AND ");
         clauseParser.parse();
@@ -173,7 +173,7 @@ public class QueryParser {
     }
 
     private void parseHavingClause(Query query, String havingClause) {
-        // only parse "AND" delimitors, since "OR" will be taken care of as
+        // only parse "AND" delimiters, since "OR" will be taken care of as
         // compound filter items at 2nd level parsing
         QueryPartParser clauseParser = new QueryPartParser(new HavingItemParser(query), havingClause, " AND ");
         clauseParser.parse();
@@ -201,7 +201,7 @@ public class QueryParser {
         if (!offsetClause.isEmpty()) {
             try {
                 final int offset = Integer.parseInt(offsetClause);
-                // ofset is 0-based, but first-row is 1-based
+                // offset is 0-based, but first-row is 1-based
                 final int firstRow = offset + 1;
                 query.setFirstRow(firstRow);
             } catch (NumberFormatException e) {
diff --git a/core/src/main/java/org/apache/metamodel/query/parser/QueryPartCollectionProcessor.java b/core/src/main/java/org/apache/metamodel/query/parser/QueryPartCollectionProcessor.java
index 3c3f17d..dc5c931 100644
--- a/core/src/main/java/org/apache/metamodel/query/parser/QueryPartCollectionProcessor.java
+++ b/core/src/main/java/org/apache/metamodel/query/parser/QueryPartCollectionProcessor.java
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * Simple implementation of {@link QueryPartProcessor} which simply adds all
  * elements to a collection. Use {@link #getTokens()} to retrieve the 'processed'
- * tokens and {@link #getDelims()} for the corresponding delimitors.
+ * tokens and {@link #getDelims()} for the corresponding delimiters.
  */
 public class QueryPartCollectionProcessor implements QueryPartProcessor {
 
diff --git a/core/src/main/java/org/apache/metamodel/query/parser/QueryPartParser.java b/core/src/main/java/org/apache/metamodel/query/parser/QueryPartParser.java
index c65db94..b70f269 100644
--- a/core/src/main/java/org/apache/metamodel/query/parser/QueryPartParser.java
+++ b/core/src/main/java/org/apache/metamodel/query/parser/QueryPartParser.java
@@ -20,7 +20,7 @@ package org.apache.metamodel.query.parser;
 
 /**
  * Parser of query parts. This parser is aware of parenthesis symbols '(' and
- * ')' and only yields tokens that have balanced parentheses. Delimitors are
+ * ')' and only yields tokens that have balanced parentheses. Delimiters are
  * configurable.
  */
 public final class QueryPartParser {
@@ -34,7 +34,7 @@ public final class QueryPartParser {
             throw new IllegalArgumentException("Clause cannot be null");
         }
         if (itemDelims == null || itemDelims.length == 0) {
-            throw new IllegalArgumentException("Item delimitors cannot be null or empty");
+            throw new IllegalArgumentException("Item delimiters cannot be null or empty");
         }
         _processor = processor;
         _clause = clause;
diff --git a/core/src/main/java/org/apache/metamodel/query/parser/QueryPartProcessor.java b/core/src/main/java/org/apache/metamodel/query/parser/QueryPartProcessor.java
index 1057bde..c28d8d4 100644
--- a/core/src/main/java/org/apache/metamodel/query/parser/QueryPartProcessor.java
+++ b/core/src/main/java/org/apache/metamodel/query/parser/QueryPartProcessor.java
@@ -19,7 +19,7 @@
 package org.apache.metamodel.query.parser;
 
 /**
- * Callback of the {@link QueryPartParser}, which recieves notifications
+ * Callback of the {@link QueryPartParser}, which receives notifications
  * whenever a token is identified/parsed. A {@link QueryPartProcessor} is used
  * to perform the actual processing of identified tokens.
  */
@@ -29,7 +29,7 @@ public interface QueryPartProcessor {
      * Method invoked whenever the {@link QueryPartParser} identifies a token.
      * 
      * @param delim
-     *            the (previous) delimitor identified before the token. This
+     *            the (previous) delimiter identified before the token. This
      *            will always be null in case of the first token.
      * @param token
      *            the token identified.
diff --git a/core/src/main/java/org/apache/metamodel/schema/ColumnType.java b/core/src/main/java/org/apache/metamodel/schema/ColumnType.java
index 589e88b..d2f43c6 100644
--- a/core/src/main/java/org/apache/metamodel/schema/ColumnType.java
+++ b/core/src/main/java/org/apache/metamodel/schema/ColumnType.java
@@ -145,7 +145,7 @@ public interface ColumnType extends HasName, Serializable {
      * @return an int representing one of the constants in the {@link Types}
      *         class.
      * @throws IllegalStateException
-     *             in case getting the JDBC type was unsuccesful.
+     *             in case getting the JDBC type was unsuccessful.
      */
     public int getJdbcType() throws IllegalStateException;
 }
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/metamodel/schema/ImmutableColumn.java b/core/src/main/java/org/apache/metamodel/schema/ImmutableColumn.java
index d5f3727..aac20f3 100644
--- a/core/src/main/java/org/apache/metamodel/schema/ImmutableColumn.java
+++ b/core/src/main/java/org/apache/metamodel/schema/ImmutableColumn.java
@@ -125,7 +125,7 @@ public final class ImmutableColumn extends AbstractColumn implements Serializabl
      * table.
      * 
      * @param column
-     *            the column to immitate
+     *            the column to imitate
      * @param table
      *            the table that the constructed column will pertain to
      */
diff --git a/core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java b/core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java
index 9e72f90..25a0aae 100644
--- a/core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java
+++ b/core/src/main/java/org/apache/metamodel/schema/MutableRelationship.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
  * Immutable implementation of the Relationship interface.
  * 
  * The immutability help ensure integrity of object-relationships. To create
- * relationsips use the <code>createRelationship</code> method.
+ * relationships use the <code>createRelationship</code> method.
  */
 public class MutableRelationship extends AbstractRelationship implements
 		Serializable, Relationship {
diff --git a/core/src/main/java/org/apache/metamodel/schema/Table.java b/core/src/main/java/org/apache/metamodel/schema/Table.java
index 5e92d4b..f4cbdc8 100644
--- a/core/src/main/java/org/apache/metamodel/schema/Table.java
+++ b/core/src/main/java/org/apache/metamodel/schema/Table.java
@@ -95,7 +95,7 @@ public interface Table extends Comparable<Table>, Serializable, NamedStructure {
     /**
      * Gets all relationships for this table.
      * 
-     * @return all relationsips for this table. To add relations use
+     * @return all relationships for this table. To add relations use
      *         TableRelation.createRelation();
      */
     public Collection<Relationship> getRelationships();
@@ -105,7 +105,7 @@ public interface Table extends Comparable<Table>, Serializable, NamedStructure {
      * 
      * @param otherTable
      *            another table for which to find relationships to and from.
-     * @return an array of relationsips between this and the other table.
+     * @return an array of relationships between this and the other table.
      */
     public Collection<Relationship> getRelationships(Table otherTable);
 
diff --git a/core/src/main/java/org/apache/metamodel/util/FormatHelper.java b/core/src/main/java/org/apache/metamodel/util/FormatHelper.java
index 22efc8e..8c55087 100644
--- a/core/src/main/java/org/apache/metamodel/util/FormatHelper.java
+++ b/core/src/main/java/org/apache/metamodel/util/FormatHelper.java
@@ -185,7 +185,7 @@ public final class FormatHelper {
             }
         }
 
-        throw new IllegalArgumentException("String value '" + value + "' not parseable as a " + columnType);
+        throw new IllegalArgumentException("String value '" + value + "' not parsable as a " + columnType);
     }
 
     public static String formatSqlValue(ColumnType columnType, Object value) {
diff --git a/core/src/main/java/org/apache/metamodel/util/Resource.java b/core/src/main/java/org/apache/metamodel/util/Resource.java
index fe5386f..121c2c9 100644
--- a/core/src/main/java/org/apache/metamodel/util/Resource.java
+++ b/core/src/main/java/org/apache/metamodel/util/Resource.java
@@ -36,7 +36,7 @@ public interface Resource extends HasName {
 
     /**
      * Gets the qualified path of the resource, which typically includes slash
-     * or backslash separated nodes in a hierarical tree structure.
+     * or backslash separated nodes in a hierarchical tree structure.
      *
      * @return
      */
diff --git a/core/src/main/java/org/apache/metamodel/util/UnicodeWriter.java b/core/src/main/java/org/apache/metamodel/util/UnicodeWriter.java
index a8c2fbc..9fa3de9 100644
--- a/core/src/main/java/org/apache/metamodel/util/UnicodeWriter.java
+++ b/core/src/main/java/org/apache/metamodel/util/UnicodeWriter.java
@@ -28,7 +28,7 @@ import java.io.Writer;
 import java.nio.charset.Charset;
 
 /**
- * Writes Unicode text to an output stream. If the specified encoding is a Unicode, then the text is preceeded by the
+ * Writes Unicode text to an output stream. If the specified encoding is a Unicode, then the text is preceded by the
  * proper Unicode BOM. If it is any other encoding, this class behaves just like <code>OutputStreamWriter</code>. This
  * class is here because Java's <code>OutputStreamWriter</code> apparently doesn't believe in writing BOMs.
  * <p>
diff --git a/core/src/test/java/org/apache/metamodel/query/SelectItemTest.java b/core/src/test/java/org/apache/metamodel/query/SelectItemTest.java
index dd46094..a3aaaf0 100644
--- a/core/src/test/java/org/apache/metamodel/query/SelectItemTest.java
+++ b/core/src/test/java/org/apache/metamodel/query/SelectItemTest.java
@@ -62,7 +62,7 @@ public class SelectItemTest extends MetaModelTestCase {
         assertEquals("project.project_id", selectItem.toSql());
     }
     
-    public void testToSqlFuntionApproximation() throws Exception {
+    public void testToSqlFunctionApproximation() throws Exception {
         SelectItem selectItem = new SelectItem(FunctionType.MAX, _schema.getTableByName(TABLE_PROJECT).getColumns().get(0));
         selectItem.setFunctionApproximationAllowed(true);
         assertEquals("APPROXIMATE MAX(project.project_id)", selectItem.toSql());
diff --git a/core/src/test/java/org/apache/metamodel/schema/Java5Types.java b/core/src/test/java/org/apache/metamodel/schema/Java5Types.java
index bbbfd32..f0d5efa 100644
--- a/core/src/test/java/org/apache/metamodel/schema/Java5Types.java
+++ b/core/src/test/java/org/apache/metamodel/schema/Java5Types.java
@@ -229,7 +229,7 @@ class Java5Types {
 	public final static int REF = 2006;
 
 	/**
-	 * The constant in the Java programming language, somtimes referred to as a
+	 * The constant in the Java programming language, sometimes referred to as a
 	 * type code, that identifies the generic SQL type <code>DATALINK</code>.
 	 * 
 	 * @since 1.4
diff --git a/core/src/test/java/org/apache/metamodel/schema/Java6Types.java b/core/src/test/java/org/apache/metamodel/schema/Java6Types.java
index a5e1a40..f4c5b59 100644
--- a/core/src/test/java/org/apache/metamodel/schema/Java6Types.java
+++ b/core/src/test/java/org/apache/metamodel/schema/Java6Types.java
@@ -229,7 +229,7 @@ class Java6Types {
 	public final static int REF = 2006;
 
 	/**
-	 * The constant in the Java programming language, somtimes referred to as a
+	 * The constant in the Java programming language, sometimes referred to as a
 	 * type code, that identifies the generic SQL type <code>DATALINK</code>.
 	 * 
 	 * @since 1.4
@@ -237,7 +237,7 @@ class Java6Types {
 	public final static int DATALINK = 70;
 
 	/**
-	 * The constant in the Java programming language, somtimes referred to as a
+	 * The constant in the Java programming language, sometimes referred to as a
 	 * type code, that identifies the generic SQL type <code>BOOLEAN</code>.
 	 * 
 	 * @since 1.4
diff --git a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbTableCreationBuilder.java b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbTableCreationBuilder.java
index d81f768..4c87c2e 100644
--- a/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbTableCreationBuilder.java
+++ b/couchdb/src/main/java/org/apache/metamodel/couchdb/CouchDbTableCreationBuilder.java
@@ -52,7 +52,7 @@ final class CouchDbTableCreationBuilder extends AbstractTableCreationBuilder<Cou
     }
 
     /**
-     * Verifies, and adds if nescesary, the two mandatory columns: _id and _rev.
+     * Verifies, and adds if necessary, the two mandatory columns: _id and _rev.
      * 
      * @param table
      */
diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvDataSet.java b/csv/src/main/java/org/apache/metamodel/csv/CsvDataSet.java
index 779da7f..45caf1b 100644
--- a/csv/src/main/java/org/apache/metamodel/csv/CsvDataSet.java
+++ b/csv/src/main/java/org/apache/metamodel/csv/CsvDataSet.java
@@ -112,8 +112,7 @@ final class CsvDataSet extends AbstractDataSet {
             if (columnNumber < csvValues.length) {
                 rowValues[i] = csvValues[columnNumber];
             } else {
-                // Ticket #125: Missing values should be enterpreted as
-                // null.
+                // Ticket #125: Missing values should be interpreted as null.
                 rowValues[i] = null;
             }
         }
diff --git a/dynamodb/src/main/java/org/apache/metamodel/dynamodb/DynamoDbDataContext.java b/dynamodb/src/main/java/org/apache/metamodel/dynamodb/DynamoDbDataContext.java
index 74c22ff..54ca9c6 100644
--- a/dynamodb/src/main/java/org/apache/metamodel/dynamodb/DynamoDbDataContext.java
+++ b/dynamodb/src/main/java/org/apache/metamodel/dynamodb/DynamoDbDataContext.java
@@ -135,8 +135,8 @@ public class DynamoDbDataContext extends QueryPostprocessDataContext implements
             final MutableTable table = new MutableTable(tableName, schema);
             schema.addTable(table);
 
-            final DescribeTableResult descripeTableResult = _dynamoDb.describeTable(tableName);
-            final TableDescription tableDescription = descripeTableResult.getTable();
+            final DescribeTableResult describeTableResult = _dynamoDb.describeTable(tableName);
+            final TableDescription tableDescription = describeTableResult.getTable();
 
             // add primary keys
             addColumnFromKeySchema("Primary index", tableDescription.getKeySchema(), table, true);
diff --git a/elasticsearch/common/src/main/java/org/apache/metamodel/elasticsearch/AbstractElasticSearchDataSet.java b/elasticsearch/common/src/main/java/org/apache/metamodel/elasticsearch/AbstractElasticSearchDataSet.java
index fdbffaf..7b0bd2a 100644
--- a/elasticsearch/common/src/main/java/org/apache/metamodel/elasticsearch/AbstractElasticSearchDataSet.java
+++ b/elasticsearch/common/src/main/java/org/apache/metamodel/elasticsearch/AbstractElasticSearchDataSet.java
@@ -89,7 +89,7 @@ public abstract class AbstractElasticSearchDataSet extends AbstractDataSet {
 
         final String scrollId = _searchResponse.getScrollId();
         if (scrollId == null) {
-            // this search response is not scrolleable - then it's the end.
+            // this search response is not scrollable - then it's the end.
             _currentHit = null;
             return false;
         }
diff --git a/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContextTest.java b/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContextTest.java
index 53f8866..16ef28a 100644
--- a/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContextTest.java
+++ b/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContextTest.java
@@ -484,7 +484,7 @@ public class ElasticSearchDataContextTest extends ESSingleNodeTestCase {
     }
 
     @Test
-    public void testNonDynamicMapingTableNames() throws Exception {
+    public void testNonDynamicMappingTableNames() throws Exception {
         CreateIndexRequest cir = new CreateIndexRequest(indexName2);
         client.admin().indices().create(cir).actionGet();
 
diff --git a/excel/src/main/java/org/apache/metamodel/excel/ExcelInsertBuilder.java b/excel/src/main/java/org/apache/metamodel/excel/ExcelInsertBuilder.java
index b584e76..5407f0e 100644
--- a/excel/src/main/java/org/apache/metamodel/excel/ExcelInsertBuilder.java
+++ b/excel/src/main/java/org/apache/metamodel/excel/ExcelInsertBuilder.java
@@ -60,8 +60,7 @@ final class ExcelInsertBuilder extends
 				int columnNumber = columns[i].getColumnNumber();
 				Cell cell = row.createCell(columnNumber);
 
-				// use a lazyref and the isFetched method to only create style
-				// if nescesary
+				// use a lazyref and the isFetched method to only create style if necessary
 				LazyRef<CellStyle> cellStyle = new LazyRef<CellStyle>() {
 					@Override
 					protected CellStyle fetch() {
diff --git a/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java b/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java
index ed37de0..2b4f54d 100644
--- a/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java
+++ b/excel/src/test/java/org/apache/metamodel/excel/ExcelDataContextTest.java
@@ -64,7 +64,7 @@ public class ExcelDataContextTest extends TestCase {
         return destFile;
     }
 
-    public void testErrornousConstructors() throws Exception {
+    public void testErroneousConstructors() throws Exception {
         try {
             new ExcelDataContext(null);
             fail("Exception expected");
diff --git a/excel/src/test/java/org/apache/metamodel/excel/ExcelUpdateCallbackTest.java b/excel/src/test/java/org/apache/metamodel/excel/ExcelUpdateCallbackTest.java
index 6a18e98..a86c710 100644
--- a/excel/src/test/java/org/apache/metamodel/excel/ExcelUpdateCallbackTest.java
+++ b/excel/src/test/java/org/apache/metamodel/excel/ExcelUpdateCallbackTest.java
@@ -62,8 +62,7 @@ public class ExcelUpdateCallbackTest extends TestCase {
 					.get(sheet);
 			assertEquals(0, rows.size());
 
-			// create 5x the amound of rows as the streaming sheet will hold in
-			// memory
+			// create 5x the amount of rows as the streaming sheet will hold in memory
 			for (int i = 0; i < windowSize * 5; i++) {
 				Row row = sheet.createRow(i);
 				Cell cell = row.createCell(0);
diff --git a/full/src/main/java/org/apache/metamodel/DataContextFactory.java b/full/src/main/java/org/apache/metamodel/DataContextFactory.java
index eeb7df5..9d644a6 100644
--- a/full/src/main/java/org/apache/metamodel/DataContextFactory.java
+++ b/full/src/main/java/org/apache/metamodel/DataContextFactory.java
@@ -326,7 +326,7 @@ public class DataContextFactory {
     }
 
     /**
-     * Creates a DataContet based on an Excel spreadsheet file
+     * Creates a DataContext based on an Excel spreadsheet file
      * 
      * @param file
      *            an excel spreadsheet file
@@ -353,9 +353,9 @@ public class DataContextFactory {
      * Creates a DataContext based on XML-content from an input source.
      * 
      * Tables are created by examining the data in the XML file, NOT by reading
-     * XML Schemas (xsd/dtd's). This enables compliancy with ALL xml formats but
-     * also raises a risk that two XML files with the same format wont
-     * nescesarily yield the same table model if some optional attributes or
+     * XML Schemas (xsd/dtd's). This enables compliance with ALL xml formats but
+     * also raises a risk that two XML files with the same format won't
+     * necessarily yield the same table model if some optional attributes or
      * tags are omitted in one of the files.
      * 
      * @param inputSource
@@ -379,9 +379,9 @@ public class DataContextFactory {
      * Creates a DataContext based on XML-content from a File.
      * 
      * Tables are created by examining the data in the XML file, NOT by reading
-     * XML Schemas (xsd/dtd's). This enables compliancy with ALL xml formats but
-     * also raises a risk that two XML files with the same format wont
-     * nescesarily yield the same table model if some optional attributes or
+     * XML Schemas (xsd/dtd's). This enables compliance with ALL xml formats but
+     * also raises a risk that two XML files with the same format won't
+     * necessarily yield the same table model if some optional attributes or
      * tags are omitted in one of the files.
      * 
      * @param file
@@ -402,9 +402,9 @@ public class DataContextFactory {
      * Creates a DataContext based on XML-content from a URL.
      * 
      * Tables are created by examining the data in the XML file, NOT by reading
-     * XML Schemas (xsd/dtd's). This enables compliancy with ALL xml formats but
-     * also raises a risk that two XML files with the same format wont
-     * nescesarily yield the same table model if some optional attributes or
+     * XML Schemas (xsd/dtd's). This enables compliance with ALL xml formats but
+     * also raises a risk that two XML files with the same format won't
+     * necessarily yield the same table model if some optional attributes or
      * tags are omitted in one of the files.
      * 
      * @param url
@@ -551,7 +551,7 @@ public class DataContextFactory {
      * @param username
      *            the username, or null if unauthenticated access should be used
      * @param password
-     *            the password, or null if unathenticated access should be used
+     *            the password, or null if unauthenticated access should be used
      * @param tableDefs
      *            an array of table definitions, or null if table definitions
      *            should be autodetected.
@@ -602,7 +602,7 @@ public class DataContextFactory {
      * @param username
      *            the username, or null if unauthenticated access should be used
      * @param password
-     *            the password, or null if unathenticated access should be used
+     *            the password, or null if unauthenticated access should be used
      * @return a DataContext object that matches the request
      */
     public static UpdateableDataContext createMongoDbDataContext(String hostname, Integer port, String databaseName,
@@ -621,7 +621,7 @@ public class DataContextFactory {
      * @param username
      *            the username, or null if unauthenticated access should be used
      * @param password
-     *            the password, or null if unathenticated access should be used
+     *            the password, or null if unauthenticated access should be used
      * @return a DataContext object that matches the request
      */
     public static UpdateableDataContext createCouchDbDataContext(String hostname, Integer port, String username,
@@ -640,7 +640,7 @@ public class DataContextFactory {
      * @param username
      *            the username, or null if unauthenticated access should be used
      * @param password
-     *            the password, or null if unathenticated access should be used
+     *            the password, or null if unauthenticated access should be used
      * @param tableDefs
      *            an array of table definitions, or null if table definitions
      *            should be autodetected.
diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java
index 4e6adb8..f079633 100644
--- a/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java
+++ b/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java
@@ -175,7 +175,7 @@ public class CreateTableTest extends HBaseUpdateCallbackTest {
      * @throws IOException
      */
     @Test
-    public void testCreateTableColumnFamiliesInConstrutor() throws IOException {
+    public void testCreateTableColumnFamiliesInConstructor() throws IOException {
         final HBaseCreateTableBuilder hBaseCreateTableBuilder = (HBaseCreateTableBuilder) getUpdateCallback()
                 .createTable(getSchema(), TABLE_NAME);
 
diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java
index c94febc..d59e5a2 100644
--- a/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java
+++ b/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java
@@ -60,7 +60,7 @@ public class DropTableTest extends HBaseUpdateCallbackTest {
      * @throws IOException
      */
     @Test
-    public void testDropTableSuccesfully() throws IOException {
+    public void testDropTableSuccessfully() throws IOException {
         final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO,
                 CF_BAR);
         getUpdateCallback().dropTable(existingTable).execute();
diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java
index b380d33..ffb36bc 100644
--- a/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java
+++ b/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java
@@ -184,12 +184,12 @@ public class InsertRowTest extends HBaseUpdateCallbackTest {
     }
 
     /**
-     * Goodflow. Inserting a row succesfully (with values set)
+     * Goodflow. Inserting a row successfully (with values set)
      *
      * @throws IOException
      */
     @Test
-    public void testInsertingSuccesfully() throws IOException {
+    public void testInsertingSuccessfully() throws IOException {
         final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO,
                 CF_BAR);
         final Map<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, false);
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
index d8bbf20..1491f14 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
@@ -128,7 +128,7 @@ public class JdbcDataContext extends AbstractDataContext implements UpdateableDa
     private final String _databaseVersion;
 
     /**
-     * There are some confusion as to the definition of catalogs and schemas. Some databases seperate "groups of tables"
+     * There are some confusion as to the definition of catalogs and schemas. Some databases separate "groups of tables"
      * by using schemas, others by catalogs. This variable indicates whether a MetaModel schema really represents a
      * catalog.
      */
@@ -140,7 +140,7 @@ public class JdbcDataContext extends AbstractDataContext implements UpdateableDa
     /**
      * Creates the strategy based on a data source, some table types and an optional catalogName
      * 
-     * @param dataSource the datasource objcet to use for making connections
+     * @param dataSource the datasource object to use for making connections
      * @param tableTypes the types of tables to include
      * @param catalogName a catalog name to use, can be null
      */
@@ -643,7 +643,7 @@ public class JdbcDataContext extends AbstractDataContext implements UpdateableDa
     private void closeIfNecessary(Connection con) {
         if (con != null) {
             if (_dataSource != null) {
-                // closing connections after individual usage is only nescesary
+                // closing connections after individual usage is only necessary
                 // when they are being pulled from a DataSource.
                 FileHelper.safeClose(con);
             }
@@ -893,7 +893,7 @@ public class JdbcDataContext extends AbstractDataContext implements UpdateableDa
     /**
      * {@inheritDoc}
      * 
-     * @throws RolledBackUpdateException when a potentially retriable {@link SQLException} was thrown during the
+     * @throws RolledBackUpdateException when a potentially retryable {@link SQLException} was thrown during the
      *             execution of the update script.
      */
     @Override
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUtils.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUtils.java
index b99c32d..c930b53 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUtils.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUtils.java
@@ -116,7 +116,7 @@ public final class JdbcUtils {
 
     /**
      * Determines if a particular {@link FilterItem} will have it's parameter (operand) replaced during SQL generation.
-     * Such filter items should succesively have their parameters set at execution time.
+     * Such filter items should successively have their parameters set at execution time.
      * 
      * @param whereItem
      * @return
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/RolledBackUpdateException.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/RolledBackUpdateException.java
index 0524276..5d75ff0 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/RolledBackUpdateException.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/RolledBackUpdateException.java
@@ -24,7 +24,7 @@ import org.apache.metamodel.MetaModelException;
 
 /**
  * Represents an exception during {@link JdbcDataContext#executeUpdate(org.apache.metamodel.UpdateScript)} which was
- * rolled back at the JDBC layer. This particular exception type can typically be catched and the update can be retried
+ * rolled back at the JDBC layer. This particular exception type can typically be caught and the update can be retried
  * to retry the transaction (assuming that the script is designed in a way that makes it idempotent and has not
  * side-effects on state outside of the {@link JdbcDataContext}).
  * 
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/IQueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/IQueryRewriter.java
index 6af603a..1acde52 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/IQueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/IQueryRewriter.java
@@ -34,8 +34,8 @@ import org.apache.metamodel.schema.ColumnType;
 
 /**
  * A query rewriter can be used for rewriting (part of) a query's string
- * representation. This is usefull for databases that deviate from the SQL 99
- * compliant syntax which is delievered by the query and it's query item's
+ * representation. This is useful for databases that deviate from the SQL 99
+ * compliant syntax which is delivered by the query and it's query item's
  * toString() methods.
  * 
  * @see AbstractQueryRewriter
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcColumnTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcColumnTest.java
index b2c33b1..32d2a28 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcColumnTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcColumnTest.java
@@ -27,7 +27,7 @@ import org.apache.metamodel.schema.Column;
 
 public class JdbcColumnTest extends JdbcTestCase {
 
-	public void testEqualsDisconected() throws Exception {
+	public void testEqualsDisconnected() throws Exception {
 		Connection con1 = getTestDbConnection();
 		DataContext dc = new JdbcDataContext(con1);
 		Column col1 = dc.getDefaultSchema().getTableByName("EMPLOYEES").getColumnByName("EMPLOYEENUMBER");
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcSchemaTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcSchemaTest.java
index 8654679..72504c2 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcSchemaTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcSchemaTest.java
@@ -33,7 +33,7 @@ import org.apache.metamodel.schema.Table;
 public class JdbcSchemaTest extends JdbcTestCase {
 
 	/**
-	 * Ticket #248: Tables and Schemas need to be Serialiazable
+	 * Ticket #248: Tables and Schemas need to be Serializable
 	 */
 	public void testSerialize() throws Exception {
 		Connection connection = getTestDbConnection();
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
index aca3780..f87190b 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
@@ -305,7 +305,7 @@ public class JdbcTestTemplates {
         assertNotNull(conn);
 
         try {
-            // clean up, if nescesary
+            // clean up, if necessary
             conn.createStatement().execute("DROP TABLE test_table");
         } catch (SQLException e) {
             // do nothing
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/SqliteTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/SqliteTest.java
index 6e4b417..053135c 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/SqliteTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/SqliteTest.java
@@ -211,7 +211,7 @@ public class SqliteTest extends TestCase {
         assertNotNull(connection);
 
         try {
-            // clean up, if nescesary
+            // clean up, if necessary
             connection.createStatement().execute("DROP TABLE test_table");
         } catch (SQLException e) {
             // do nothing
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/SQLServerJtdsDriverTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/SQLServerJtdsDriverTest.java
index 9a3cd8c..607a141 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/SQLServerJtdsDriverTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/SQLServerJtdsDriverTest.java
@@ -133,7 +133,7 @@ public class SQLServerJtdsDriverTest extends AbstractJdbIntegrationTest {
         assertNotNull(connection);
 
         try {
-            // clean up, if nescesary
+            // clean up, if necessary
             connection.createStatement().execute("DROP TABLE Person.test_table");
         } catch (SQLException e) {
             // do nothing
diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
index b745267..f4ff02c 100644
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java
@@ -132,7 +132,7 @@ final class SalesforceUpdateCallback extends AbstractUpdateCallback implements C
         for (final SaveResult saveResult : saveResults) {
             boolean success = saveResult.getSuccess();
             if (success) {
-                logger.debug("Succesfully {}ed record with id={}", action, saveResult.getId());
+                logger.debug("Successfully {}ed record with id={}", action, saveResult.getId());
                 successes++;
             } else {
                 final com.sforce.soap.partner.Error[] errorArray = saveResult.getErrors();
diff --git a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
index 5183877..0cd93c6 100644
--- a/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
+++ b/spring/src/main/java/org/apache/metamodel/spring/DataContextFactoryBeanDelegate.java
@@ -26,7 +26,7 @@ import org.apache.metamodel.DataContext;
  * 
  * This component helps separate the configuration code (in
  * {@link DataContextFactoryBean}) from the actual instantiation of objects.
- * This is necesary to ensure that the {@link DataContextFactoryBean} is
+ * This is necessary to ensure that the {@link DataContextFactoryBean} is
  * functional for only a subset of MetaModel's modules, since otherwise import
  * statements would hinder use of the class when not all MetaModel modules are
  * available.
diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java
index b35b630..a95e321 100644
--- a/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java
+++ b/xml/src/main/java/org/apache/metamodel/xml/XmlDomDataContext.java
@@ -75,8 +75,8 @@ import org.xml.sax.InputSource;
  * A DataContext strategy that reads XML content and maps it to a table-based
  * model similar to the rest of MetaModel. Tables are created by examining the
  * data in the XML file, NOT by reading XML Schemas (xsd/dtd's). This enables
- * compliancy with ALL xml formats but also raises a risk that two XML files
- * with the same format wont nescesarily yield the same table model if some
+ * compliance with ALL xml formats but also raises a risk that two XML files
+ * with the same format wont necessarily yield the same table model if some
  * optional attributes or tags are omitted in one of the files.
  * 
  * The parsing method applied in this datacontext is DOM based, which means that
diff --git a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
index 98b956d..6edc2be 100644
--- a/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
+++ b/xml/src/main/java/org/apache/metamodel/xml/XmlSaxDataContext.java
@@ -57,11 +57,11 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
 /**
- * XML datacontext which uses SAX parsing for fast and memory effecient reading
+ * XML datacontext which uses SAX parsing for fast and memory efficient reading
  * of XML files.
  * 
  * The DataContext requires the user to specify a set of (simplified) XPaths to
- * define which elements are row delimitors and which elements or attributes are
+ * define which elements are row delimiters and which elements or attributes are
  * value/column definitions.
  */
 public class XmlSaxDataContext extends QueryPostprocessDataContext {