You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2013/07/22 10:11:12 UTC

[59/64] git commit: Renamed all import and package statements from 'org.eobjects' to 'org.apache'.

Renamed all import and package statements from 'org.eobjects' to
'org.apache'.

Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/587d518a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/587d518a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/587d518a

Branch: refs/heads/master
Commit: 587d518a880e5353ddc329e78781f391dab5960c
Parents: e2e2b37
Author: kaspers <ka...@kaspers-think.humaninference.com>
Authored: Fri Jul 19 10:13:28 2013 +0200
Committer: kaspers <ka...@kaspers-think.humaninference.com>
Committed: Fri Jul 19 10:13:28 2013 +0200

----------------------------------------------------------------------
 .../metamodel/access/AccessDataContext.java     | 38 +++++------
 .../apache/metamodel/access/package-info.java   |  2 +-
 .../metamodel/access/AccessDataContextTest.java | 16 ++---
 .../apache/metamodel/AbstractDataContext.java   | 22 +++----
 .../metamodel/AbstractUpdateCallback.java       | 16 ++---
 .../org/apache/metamodel/BatchUpdateScript.java |  2 +-
 .../apache/metamodel/CompositeDataContext.java  | 16 ++---
 .../metamodel/CompositeQueryDelegate.java       | 12 ++--
 .../java/org/apache/metamodel/DataContext.java  | 20 +++---
 .../metamodel/DeleteAndInsertBuilder.java       | 22 +++----
 .../InconsistentRowFormatException.java         |  6 +-
 .../apache/metamodel/MetaModelException.java    |  2 +-
 .../org/apache/metamodel/MetaModelHelper.java   | 60 +++++++++---------
 .../metamodel/QueryPostprocessDataContext.java  | 66 ++++++++++----------
 .../metamodel/QueryPostprocessDelegate.java     |  4 +-
 .../apache/metamodel/SchemaNameComparator.java  |  2 +-
 .../org/apache/metamodel/UpdateCallback.java    | 12 ++--
 .../java/org/apache/metamodel/UpdateScript.java |  4 +-
 .../apache/metamodel/UpdateableDataContext.java |  2 +-
 .../metamodel/convert/ColumnTypeDetector.java   |  6 +-
 .../metamodel/convert/ConvertedDataSet.java     | 10 +--
 .../convert/ConvertedDataSetInterceptor.java    | 10 +--
 .../ConvertedRowInsertionInterceptor.java       |  8 +--
 .../ConvertedRowUpdationInterceptor.java        |  8 +--
 .../apache/metamodel/convert/Converters.java    | 28 ++++-----
 .../convert/HasReadTypeConverters.java          |  6 +-
 .../convert/StringToBooleanConverter.java       |  4 +-
 .../convert/StringToDateConverter.java          |  6 +-
 .../convert/StringToDoubleConverter.java        |  2 +-
 .../convert/StringToIntegerConverter.java       |  2 +-
 .../apache/metamodel/convert/TypeConverter.java |  2 +-
 .../apache/metamodel/convert/package-info.java  |  2 +-
 .../metamodel/create/AbstractColumnBuilder.java |  8 +--
 .../create/AbstractTableCreationBuilder.java    | 18 +++---
 .../apache/metamodel/create/ColumnBuilder.java  |  8 +--
 .../metamodel/create/ColumnCreationBuilder.java |  4 +-
 .../create/ColumnCreationBuilderImpl.java       |  8 +--
 .../apache/metamodel/create/CreateTable.java    | 20 +++---
 .../create/CreateTableColumnBuilder.java        |  8 +--
 .../apache/metamodel/create/TableCreatable.java |  4 +-
 .../metamodel/create/TableCreationBuilder.java  |  8 +--
 .../apache/metamodel/create/package-info.java   |  2 +-
 .../apache/metamodel/data/AbstractDataSet.java  | 10 +--
 .../org/apache/metamodel/data/AbstractRow.java  |  6 +-
 .../metamodel/data/AbstractRowBuilder.java      |  6 +-
 .../metamodel/data/CachingDataSetHeader.java    |  6 +-
 .../org/apache/metamodel/data/ColorImpl.java    |  6 +-
 .../java/org/apache/metamodel/data/DataSet.java |  4 +-
 .../apache/metamodel/data/DataSetHeader.java    |  6 +-
 .../apache/metamodel/data/DataSetIterator.java  |  2 +-
 .../metamodel/data/DataSetTableModel.java       |  6 +-
 .../org/apache/metamodel/data/DefaultRow.java   |  4 +-
 .../org/apache/metamodel/data/EmptyDataSet.java |  6 +-
 .../apache/metamodel/data/FilteredDataSet.java  |  2 +-
 .../apache/metamodel/data/FirstRowDataSet.java  |  2 +-
 .../org/apache/metamodel/data/IRowFilter.java   |  2 +-
 .../apache/metamodel/data/InMemoryDataSet.java  |  4 +-
 .../apache/metamodel/data/MaxRowsDataSet.java   |  2 +-
 .../java/org/apache/metamodel/data/Row.java     |  6 +-
 .../org/apache/metamodel/data/RowBuilder.java   | 10 +--
 .../org/apache/metamodel/data/RowPublisher.java |  2 +-
 .../metamodel/data/RowPublisherDataSet.java     |  8 +--
 .../apache/metamodel/data/RowPublisherImpl.java |  4 +-
 .../metamodel/data/SimpleDataSetHeader.java     |  8 +--
 .../java/org/apache/metamodel/data/Style.java   |  2 +-
 .../org/apache/metamodel/data/StyleBuilder.java | 10 +--
 .../org/apache/metamodel/data/StyleImpl.java    |  4 +-
 .../metamodel/data/SubSelectionDataSet.java     |  4 +-
 .../metamodel/data/WhereClauseBuilder.java      |  8 +--
 .../org/apache/metamodel/data/package-info.java |  2 +-
 .../delete/AbstractRowDeletionBuilder.java      | 18 +++---
 .../org/apache/metamodel/delete/DeleteFrom.java | 24 +++----
 .../apache/metamodel/delete/RowDeletable.java   |  4 +-
 .../metamodel/delete/RowDeletionBuilder.java    | 10 +--
 .../apache/metamodel/delete/package-info.java   |  2 +-
 .../drop/AbstractTableDropBuilder.java          |  4 +-
 .../org/apache/metamodel/drop/DropTable.java    | 14 ++---
 .../apache/metamodel/drop/TableDropBuilder.java |  6 +-
 .../apache/metamodel/drop/TableDroppable.java   |  6 +-
 .../org/apache/metamodel/drop/package-info.java |  2 +-
 .../insert/AbstractRowInsertionBuilder.java     | 14 ++---
 .../org/apache/metamodel/insert/InsertInto.java | 20 +++---
 .../apache/metamodel/insert/RowInsertable.java  |  4 +-
 .../metamodel/insert/RowInsertionBuilder.java   | 12 ++--
 .../apache/metamodel/insert/package-info.java   |  2 +-
 .../metamodel/intercept/DataSetInterceptor.java |  4 +-
 .../InterceptableColumnCreationBuilder.java     | 14 ++---
 .../intercept/InterceptableDataContext.java     | 40 ++++++------
 .../InterceptableRowDeletionBuilder.java        | 18 +++---
 .../InterceptableRowInsertionBuilder.java       | 14 ++---
 .../InterceptableRowUpdationBuilder.java        | 24 +++----
 .../InterceptableTableCreationBuilder.java      | 10 +--
 .../InterceptableTableDropBuilder.java          |  8 +--
 .../intercept/InterceptableUpdateCallback.java  | 20 +++---
 .../intercept/InterceptableUpdateScript.java    | 16 ++---
 .../apache/metamodel/intercept/Interceptor.java |  2 +-
 .../metamodel/intercept/InterceptorList.java    |  2 +-
 .../metamodel/intercept/Interceptors.java       |  4 +-
 .../metamodel/intercept/QueryInterceptor.java   |  4 +-
 .../intercept/RowDeletionInterceptor.java       |  4 +-
 .../intercept/RowInsertionInterceptor.java      |  4 +-
 .../intercept/RowUpdationInterceptor.java       |  4 +-
 .../metamodel/intercept/SchemaInterceptor.java  |  4 +-
 .../intercept/TableCreationInterceptor.java     |  4 +-
 .../intercept/TableDropInterceptor.java         |  4 +-
 .../java/org/apache/metamodel/package-info.java |  2 +-
 .../metamodel/query/AbstractQueryClause.java    |  4 +-
 .../query/AverageAggregateBuilder.java          |  6 +-
 .../apache/metamodel/query/CompiledQuery.java   |  4 +-
 .../metamodel/query/CountAggregateBuilder.java  |  4 +-
 .../metamodel/query/DefaultCompiledQuery.java   |  2 +-
 .../apache/metamodel/query/FilterClause.java    |  4 +-
 .../org/apache/metamodel/query/FilterItem.java  | 20 +++---
 .../org/apache/metamodel/query/FromClause.java  |  4 +-
 .../org/apache/metamodel/query/FromItem.java    | 10 +--
 .../apache/metamodel/query/FunctionType.java    |  8 +--
 .../apache/metamodel/query/GroupByClause.java   |  2 +-
 .../org/apache/metamodel/query/GroupByItem.java |  4 +-
 .../org/apache/metamodel/query/JoinType.java    |  2 +-
 .../apache/metamodel/query/LogicalOperator.java |  2 +-
 .../metamodel/query/MaxAggregateBuilder.java    |  6 +-
 .../metamodel/query/MinAggregateBuilder.java    |  6 +-
 .../apache/metamodel/query/OperatorType.java    |  2 +-
 .../apache/metamodel/query/OrderByClause.java   |  2 +-
 .../org/apache/metamodel/query/OrderByItem.java |  4 +-
 .../java/org/apache/metamodel/query/Query.java  | 32 +++++-----
 .../org/apache/metamodel/query/QueryClause.java |  2 +-
 .../org/apache/metamodel/query/QueryItem.java   |  2 +-
 .../apache/metamodel/query/QueryParameter.java  |  4 +-
 .../apache/metamodel/query/SelectClause.java    |  4 +-
 .../org/apache/metamodel/query/SelectItem.java  | 14 ++---
 .../metamodel/query/SumAggregateBuilder.java    |  6 +-
 .../query/builder/AbstractFilterBuilder.java    | 10 +--
 .../builder/AbstractQueryFilterBuilder.java     |  8 +--
 .../query/builder/ColumnSelectBuilder.java      |  2 +-
 .../query/builder/ColumnSelectBuilderImpl.java  |  8 +--
 .../query/builder/CountSelectBuilder.java       |  2 +-
 .../query/builder/CountSelectBuilderImpl.java   |  6 +-
 .../metamodel/query/builder/FilterBuilder.java  |  4 +-
 .../query/builder/FunctionSelectBuilder.java    |  2 +-
 .../builder/FunctionSelectBuilderImpl.java      | 10 +--
 .../query/builder/GroupedQueryBuilder.java      |  6 +-
 .../builder/GroupedQueryBuilderCallback.java    | 16 ++---
 .../query/builder/GroupedQueryBuilderImpl.java  | 24 +++----
 .../metamodel/query/builder/HavingBuilder.java  |  2 +-
 .../query/builder/HavingBuilderImpl.java        | 12 ++--
 .../query/builder/InitFromBuilder.java          |  6 +-
 .../query/builder/InitFromBuilderImpl.java      | 12 ++--
 .../query/builder/JoinFromBuilder.java          |  4 +-
 .../query/builder/JoinFromBuilderImpl.java      | 16 ++---
 .../query/builder/SatisfiedFromBuilder.java     |  8 +--
 .../builder/SatisfiedFromBuilderCallback.java   | 16 ++---
 .../query/builder/SatisfiedHavingBuilder.java   |  6 +-
 .../query/builder/SatisfiedOrderByBuilder.java  |  4 +-
 .../builder/SatisfiedOrderByBuilderImpl.java    | 14 ++---
 .../query/builder/SatisfiedQueryBuilder.java    | 18 +++---
 .../query/builder/SatisfiedSelectBuilder.java   |  6 +-
 .../builder/SatisfiedSelectBuilderImpl.java     |  6 +-
 .../query/builder/SatisfiedWhereBuilder.java    |  4 +-
 .../query/builder/TableFromBuilder.java         |  4 +-
 .../query/builder/TableFromBuilderImpl.java     | 12 ++--
 .../metamodel/query/builder/WhereBuilder.java   |  6 +-
 .../query/builder/WhereBuilderImpl.java         | 14 ++---
 .../metamodel/query/builder/package-info.java   |  2 +-
 .../apache/metamodel/query/package-info.java    |  2 +-
 .../metamodel/query/parser/FromItemParser.java  | 16 ++---
 .../query/parser/GroupByItemParser.java         |  4 +-
 .../query/parser/HavingItemParser.java          |  4 +-
 .../query/parser/OrderByItemParser.java         |  4 +-
 .../metamodel/query/parser/QueryParser.java     |  6 +-
 .../query/parser/QueryParserException.java      |  4 +-
 .../parser/QueryPartCollectionProcessor.java    |  2 +-
 .../metamodel/query/parser/QueryPartParser.java |  2 +-
 .../query/parser/QueryPartProcessor.java        |  2 +-
 .../query/parser/SelectItemParser.java          | 16 ++---
 .../metamodel/query/parser/WhereItemParser.java |  4 +-
 .../apache/metamodel/schema/AbstractColumn.java |  2 +-
 .../metamodel/schema/AbstractRelationship.java  |  4 +-
 .../apache/metamodel/schema/AbstractSchema.java | 12 ++--
 .../apache/metamodel/schema/AbstractTable.java  | 12 ++--
 .../org/apache/metamodel/schema/Column.java     |  2 +-
 .../org/apache/metamodel/schema/ColumnType.java | 22 +++----
 .../metamodel/schema/CompositeSchema.java       |  6 +-
 .../metamodel/schema/ImmutableColumn.java       |  2 +-
 .../metamodel/schema/ImmutableRelationship.java |  2 +-
 .../metamodel/schema/ImmutableSchema.java       |  2 +-
 .../apache/metamodel/schema/ImmutableTable.java |  2 +-
 .../org/apache/metamodel/schema/JdbcTypes.java  |  2 +-
 .../apache/metamodel/schema/MutableColumn.java  |  2 +-
 .../metamodel/schema/MutableRelationship.java   |  2 +-
 .../apache/metamodel/schema/MutableSchema.java  |  2 +-
 .../apache/metamodel/schema/MutableTable.java   |  2 +-
 .../apache/metamodel/schema/NamedStructure.java |  4 +-
 .../apache/metamodel/schema/Relationship.java   |  2 +-
 .../org/apache/metamodel/schema/Schema.java     |  4 +-
 .../metamodel/schema/SuperColumnType.java       |  2 +-
 .../java/org/apache/metamodel/schema/Table.java |  2 +-
 .../org/apache/metamodel/schema/TableType.java  |  2 +-
 .../apache/metamodel/schema/package-info.java   |  2 +-
 .../update/AbstractRowUpdationBuilder.java      | 18 +++---
 .../apache/metamodel/update/RowUpdateable.java  |  4 +-
 .../metamodel/update/RowUpdationBuilder.java    | 12 ++--
 .../org/apache/metamodel/update/Update.java     | 28 ++++-----
 .../apache/metamodel/update/package-info.java   |  2 +-
 .../java/org/apache/metamodel/util/Action.java  |  2 +-
 .../apache/metamodel/util/AggregateBuilder.java |  2 +-
 .../metamodel/util/AlphabeticSequence.java      |  2 +-
 .../org/apache/metamodel/util/BaseObject.java   |  2 +-
 .../metamodel/util/BooleanComparator.java       |  2 +-
 .../metamodel/util/ClasspathResource.java       |  2 +-
 .../apache/metamodel/util/CollectionUtils.java  |  2 +-
 .../org/apache/metamodel/util/ConstantFunc.java |  2 +-
 .../org/apache/metamodel/util/DateUtils.java    |  2 +-
 .../apache/metamodel/util/EqualsBuilder.java    |  2 +-
 .../metamodel/util/ExclusionPredicate.java      |  2 +-
 .../apache/metamodel/util/FalsePredicate.java   |  2 +-
 .../org/apache/metamodel/util/FileHelper.java   |  2 +-
 .../org/apache/metamodel/util/FileResource.java |  2 +-
 .../org/apache/metamodel/util/FormatHelper.java |  6 +-
 .../java/org/apache/metamodel/util/Func.java    |  2 +-
 .../java/org/apache/metamodel/util/HasName.java |  2 +-
 .../apache/metamodel/util/HasNameMapper.java    |  2 +-
 .../apache/metamodel/util/ImmutableDate.java    |  2 +-
 .../org/apache/metamodel/util/ImmutableRef.java |  2 +-
 .../apache/metamodel/util/InMemoryResource.java |  2 +-
 .../metamodel/util/InclusionPredicate.java      |  2 +-
 .../java/org/apache/metamodel/util/LazyRef.java |  2 +-
 .../java/org/apache/metamodel/util/Month.java   |  2 +-
 .../org/apache/metamodel/util/MutableRef.java   |  2 +-
 .../apache/metamodel/util/NumberComparator.java |  2 +-
 .../apache/metamodel/util/ObjectComparator.java |  2 +-
 .../org/apache/metamodel/util/Predicate.java    |  2 +-
 .../java/org/apache/metamodel/util/Ref.java     |  2 +-
 .../org/apache/metamodel/util/Resource.java     |  2 +-
 .../metamodel/util/ResourceException.java       |  4 +-
 .../apache/metamodel/util/SerializableRef.java  |  2 +-
 .../metamodel/util/SharedExecutorService.java   |  2 +-
 .../apache/metamodel/util/SimpleTableDef.java   | 16 ++---
 .../apache/metamodel/util/TimeComparator.java   |  2 +-
 .../metamodel/util/ToStringComparator.java      |  2 +-
 .../apache/metamodel/util/TruePredicate.java    |  2 +-
 .../apache/metamodel/util/UnicodeWriter.java    |  2 +-
 .../org/apache/metamodel/util/UrlResource.java  |  2 +-
 .../java/org/apache/metamodel/util/Weekday.java |  2 +-
 .../apache/metamodel/util/WildcardPattern.java  |  4 +-
 .../org/apache/metamodel/util/package-info.java |  2 +-
 .../metamodel/AbstractDataContextTest.java      | 18 +++---
 .../metamodel/CompositeDataContextTest.java     | 12 ++--
 .../apache/metamodel/MetaModelHelperTest.java   | 44 ++++++-------
 .../org/apache/metamodel/MetaModelTestCase.java | 32 +++++-----
 .../org/apache/metamodel/MockDataContext.java   | 32 +++++-----
 .../metamodel/MockUpdateableDataContext.java    | 44 ++++++-------
 .../QueryPostprocessDataContextTest.java        | 46 +++++++-------
 .../metamodel/SchemaNameComparatorTest.java     |  2 +-
 .../convert/ColumnTypeDetectorTest.java         |  2 +-
 .../ConvertedDataSetInterceptorTest.java        | 18 +++---
 .../ConvertedRowInsertionInterceptorTest.java   | 12 ++--
 .../metamodel/convert/ConvertersTest.java       | 18 +++---
 .../convert/StringToBooleanConverterTest.java   |  2 +-
 .../convert/StringToDateConverterTest.java      |  6 +-
 .../convert/StringToDoubleConverterTest.java    |  2 +-
 .../convert/StringToIntegerConverterTest.java   |  2 +-
 .../create/AbstractCreateTableBuilderTest.java  | 20 +++---
 .../metamodel/create/SyntaxExamplesTest.java    |  8 +--
 .../metamodel/data/DataSetIteratorTest.java     |  2 +-
 .../metamodel/data/DataSetTableModelTest.java   |  8 +--
 .../apache/metamodel/data/DefaultRowTest.java   |  8 +--
 .../metamodel/data/FirstRowDataSetTest.java     |  6 +-
 .../metamodel/data/RowPublisherDataSetTest.java |  8 +--
 .../java/org/apache/metamodel/data/RowTest.java | 10 +--
 .../apache/metamodel/data/StyleBuilderTest.java |  4 +-
 .../delete/AbstractRowDeletionCallbackTest.java | 12 ++--
 .../insert/AbstractInsertBuilderTest.java       | 14 ++---
 .../metamodel/insert/SyntaxExamplesTest.java    | 12 ++--
 .../intercept/InterceptableDataContextTest.java | 18 +++---
 .../intercept/InterceptorListTest.java          | 10 +--
 .../metamodel/intercept/InterceptorsTest.java   |  4 +-
 .../query/DefaultCompiledQueryTest.java         | 10 +--
 .../apache/metamodel/query/FilterItemTest.java  | 38 +++++------
 .../apache/metamodel/query/FromClauseTest.java  |  8 +--
 .../apache/metamodel/query/FromItemTest.java    | 12 ++--
 .../metamodel/query/FunctionTypeTest.java       |  2 +-
 .../apache/metamodel/query/GroupByItemTest.java |  2 +-
 .../metamodel/query/OperatorTypeTest.java       |  2 +-
 .../apache/metamodel/query/OrderByItemTest.java |  4 +-
 .../org/apache/metamodel/query/QueryTest.java   | 26 ++++----
 .../metamodel/query/SelectClauseTest.java       | 10 +--
 .../apache/metamodel/query/SelectItemTest.java  | 12 ++--
 .../builder/GroupedQueryBuilderImplTest.java    | 22 +++----
 .../query/builder/SyntaxExamplesTest.java       | 18 +++---
 .../query/builder/WhereBuilderImplTest.java     |  8 +--
 .../metamodel/query/parser/QueryParserTest.java | 28 ++++-----
 .../query/parser/QueryPartParserTest.java       |  2 +-
 .../apache/metamodel/schema/ColumnTypeTest.java |  2 +-
 .../apache/metamodel/schema/DataTypeTest.java   |  2 +-
 .../metamodel/schema/ImmutableSchemaTest.java   |  4 +-
 .../org/apache/metamodel/schema/Java5Types.java |  2 +-
 .../org/apache/metamodel/schema/Java6Types.java |  2 +-
 .../apache/metamodel/schema/JavaTypesTest.java  |  2 +-
 .../metamodel/schema/MutableColumnTest.java     |  2 +-
 .../metamodel/schema/MutableSchemaTest.java     |  2 +-
 .../metamodel/schema/MutableTableTest.java      |  2 +-
 .../metamodel/schema/SchemaModelTest.java       |  4 +-
 .../apache/metamodel/schema/TableTypeTest.java  |  2 +-
 .../metamodel/util/AlphabeticSequenceTest.java  |  2 +-
 .../apache/metamodel/util/BaseObjectTest.java   |  2 +-
 .../metamodel/util/BooleanComparatorTest.java   |  2 +-
 .../metamodel/util/ClasspathResourceTest.java   |  2 +-
 .../metamodel/util/CollectionUtilsTest.java     |  2 +-
 .../apache/metamodel/util/DateUtilsTest.java    |  2 +-
 .../metamodel/util/EqualsBuilderTest.java       |  2 +-
 .../metamodel/util/ExclusionPredicateTest.java  |  2 +-
 .../apache/metamodel/util/FileHelperTest.java   |  2 +-
 .../apache/metamodel/util/FormatHelperTest.java |  4 +-
 .../metamodel/util/InMemoryResourceTest.java    |  2 +-
 .../metamodel/util/InclusionPredicateTest.java  |  2 +-
 .../org/apache/metamodel/util/LazyRefTest.java  |  2 +-
 .../org/apache/metamodel/util/MonthTest.java    |  2 +-
 .../metamodel/util/NumberComparatorTest.java    |  2 +-
 .../metamodel/util/ObjectComparatorTest.java    |  2 +-
 .../metamodel/util/SerializableRefTest.java     |  2 +-
 .../apache/metamodel/util/SimpleRefTest.java    |  2 +-
 .../metamodel/util/TimeComparatorTest.java      |  2 +-
 .../metamodel/util/ToStringComparatorTest.java  |  4 +-
 .../apache/metamodel/util/UrlResourceTest.java  |  2 +-
 .../org/apache/metamodel/util/WeekdayTest.java  |  2 +-
 .../metamodel/util/WildcardPatternTest.java     |  2 +-
 .../metamodel/couchdb/CouchDbDataContext.java   | 32 +++++-----
 .../metamodel/couchdb/CouchDbDataSet.java       | 10 +--
 .../couchdb/CouchDbInsertionBuilder.java        | 10 +--
 .../couchdb/CouchDbRowDeletionBuilder.java      | 14 ++---
 .../couchdb/CouchDbRowUpdationBuilder.java      | 14 ++---
 .../couchdb/CouchDbTableCreationBuilder.java    | 18 +++---
 .../couchdb/CouchDbTableDropBuilder.java        | 10 +--
 .../couchdb/CouchDbUpdateCallback.java          | 20 +++---
 .../apache/metamodel/couchdb/package-info.java  |  2 +-
 .../couchdb/CouchDbDataContextTest.java         | 24 +++----
 .../apache/metamodel/csv/CsvConfiguration.java  |  6 +-
 .../metamodel/csv/CsvCreateTableBuilder.java    | 10 +--
 .../apache/metamodel/csv/CsvDataContext.java    | 28 ++++-----
 .../org/apache/metamodel/csv/CsvDataSet.java    | 14 ++---
 .../apache/metamodel/csv/CsvDeleteBuilder.java  | 20 +++---
 .../apache/metamodel/csv/CsvInsertBuilder.java  |  6 +-
 .../org/apache/metamodel/csv/CsvSchema.java     |  6 +-
 .../java/org/apache/metamodel/csv/CsvTable.java | 20 +++---
 .../metamodel/csv/CsvTableDropBuilder.java      |  6 +-
 .../apache/metamodel/csv/CsvUpdateCallback.java | 32 +++++-----
 .../org/apache/metamodel/csv/CsvWriter.java     |  4 +-
 .../csv/InconsistentRowLengthException.java     |  8 +--
 .../org/apache/metamodel/csv/package-info.java  |  2 +-
 .../metamodel/csv/CsvBigFileMemoryTest.java     | 16 ++---
 .../metamodel/csv/CsvConfigurationTest.java     |  2 +-
 .../metamodel/csv/CsvDataContextTest.java       | 46 +++++++-------
 .../csv/DefaultExampleValueGenerator.java       |  2 +-
 .../metamodel/csv/ExampleDataGenerator.java     |  2 +-
 .../metamodel/csv/ExampleValueGenerator.java    |  2 +-
 .../csv/RandomizedExampleValueGenerator.java    |  2 +-
 .../apache/metamodel/csv/UnicodeWriterTest.java |  4 +-
 .../InterceptionCsvIntegrationTest.java         | 18 +++---
 .../excel/DefaultSpreadsheetReaderDelegate.java | 26 ++++----
 .../metamodel/excel/ExcelConfiguration.java     |  4 +-
 .../metamodel/excel/ExcelDataContext.java       | 32 +++++-----
 .../metamodel/excel/ExcelDeleteBuilder.java     | 18 +++---
 .../metamodel/excel/ExcelDropTableBuilder.java  | 12 ++--
 .../metamodel/excel/ExcelInsertBuilder.java     | 20 +++---
 .../excel/ExcelTableCreationBuilder.java        | 16 ++---
 .../metamodel/excel/ExcelUpdateCallback.java    | 22 +++----
 .../org/apache/metamodel/excel/ExcelUtils.java  | 34 +++++-----
 .../excel/SpreadsheetReaderDelegate.java        | 12 ++--
 .../org/apache/metamodel/excel/XlsDataSet.java  | 10 +--
 .../apache/metamodel/excel/XlsxRowCallback.java |  4 +-
 .../metamodel/excel/XlsxRowPublisherAction.java | 12 ++--
 .../metamodel/excel/XlsxSheetToRowsHandler.java | 10 +--
 .../excel/XlsxSpreadsheetReaderDelegate.java    | 30 ++++-----
 .../excel/XlsxStopParsingException.java         |  2 +-
 .../excel/XlsxWorkbookToTablesHandler.java      | 12 ++--
 .../metamodel/excel/ZeroBasedRowIterator.java   |  2 +-
 .../apache/metamodel/excel/package-info.java    |  2 +-
 .../DefaultSpreadsheetReaderDelegateTest.java   | 16 ++---
 .../metamodel/excel/ExcelConfigurationTest.java |  4 +-
 .../metamodel/excel/ExcelDataContextTest.java   | 32 +++++-----
 .../excel/ExcelUpdateCallbackTest.java          |  6 +-
 .../excel/ZeroBasedRowIteratorTest.java         |  4 +-
 .../fixedwidth/FixedWidthConfiguration.java     |  8 +--
 .../fixedwidth/FixedWidthDataContext.java       | 32 +++++-----
 .../metamodel/fixedwidth/FixedWidthDataSet.java | 12 ++--
 .../metamodel/fixedwidth/FixedWidthReader.java  |  2 +-
 .../InconsistentValueWidthException.java        |  6 +-
 .../metamodel/fixedwidth/package-info.java      |  2 +-
 .../fixedwidth/FixedWidthConfigurationTest.java |  4 +-
 .../fixedwidth/FixedWidthDataContextTest.java   | 18 +++---
 .../apache/metamodel/DataContextFactory.java    | 34 +++++-----
 .../metamodel/DataContextFactoryTest.java       |  6 +-
 .../metamodel/jdbc/FetchSizeCalculator.java     | 10 +--
 .../metamodel/jdbc/JdbcBatchUpdateCallback.java |  6 +-
 .../org/apache/metamodel/jdbc/JdbcColumn.java   |  8 +--
 .../metamodel/jdbc/JdbcCompiledQuery.java       | 12 ++--
 .../metamodel/jdbc/JdbcCompiledQueryLease.java  |  2 +-
 .../jdbc/JdbcCompiledQueryLeaseFactory.java     |  2 +-
 .../metamodel/jdbc/JdbcCreateTableBuilder.java  | 16 ++---
 .../apache/metamodel/jdbc/JdbcDataContext.java  | 44 ++++++-------
 .../org/apache/metamodel/jdbc/JdbcDataSet.java  | 20 +++---
 .../metamodel/jdbc/JdbcDeleteBuilder.java       | 18 +++---
 .../metamodel/jdbc/JdbcDropTableBuilder.java    | 14 ++---
 .../metamodel/jdbc/JdbcInsertBuilder.java       | 16 ++---
 .../metamodel/jdbc/JdbcMetadataLoader.java      | 18 +++---
 .../org/apache/metamodel/jdbc/JdbcSchema.java   |  8 +--
 .../jdbc/JdbcSimpleUpdateCallback.java          |  8 +--
 .../org/apache/metamodel/jdbc/JdbcTable.java    | 12 ++--
 .../metamodel/jdbc/JdbcUpdateBuilder.java       | 20 +++---
 .../metamodel/jdbc/JdbcUpdateCallback.java      | 20 +++---
 .../org/apache/metamodel/jdbc/JdbcUtils.java    | 22 +++----
 .../apache/metamodel/jdbc/MetadataLoader.java   |  2 +-
 .../apache/metamodel/jdbc/QuerySplitter.java    | 30 ++++-----
 .../metamodel/jdbc/SplitQueriesDataSet.java     | 16 ++---
 .../org/apache/metamodel/jdbc/SqlKeywords.java  |  2 +-
 .../jdbc/dialects/AbstractQueryRewriter.java    | 32 +++++-----
 .../jdbc/dialects/DB2QueryRewriter.java         | 20 +++---
 .../jdbc/dialects/DefaultQueryRewriter.java     | 16 ++---
 .../jdbc/dialects/H2QueryRewriter.java          |  4 +-
 .../jdbc/dialects/HsqldbQueryRewriter.java      | 16 ++---
 .../metamodel/jdbc/dialects/IQueryRewriter.java | 12 ++--
 .../jdbc/dialects/LimitOffsetQueryRewriter.java |  6 +-
 .../jdbc/dialects/MysqlQueryRewriter.java       |  4 +-
 .../jdbc/dialects/PostgresqlQueryRewriter.java  | 14 ++---
 .../jdbc/dialects/SQLServerQueryRewriter.java   |  8 +--
 .../org/apache/metamodel/jdbc/package-info.java |  2 +-
 .../org/apache/metamodel/DB2Test.java           | 14 ++---
 .../org/apache/metamodel/FirebirdTest.java      | 20 +++---
 .../org/apache/metamodel/MysqlTest.java         | 32 +++++-----
 .../org/apache/metamodel/OracleTest.java        | 22 +++----
 .../org/apache/metamodel/PostgresqlTest.java    | 36 +++++------
 .../metamodel/SQLServerJtdsDriverTest.java      | 24 +++----
 .../metamodel/SQLServerMicrosoftDriverTest.java | 20 +++---
 .../metamodel/dbmains/PostgresqlMain.java       | 20 +++---
 .../dialects/AbstractQueryRewriterTest.java     | 20 +++---
 .../dialects/DB2QueryRewriterTest.java          | 20 +++---
 .../dialects/MysqlQueryRewriterTest.java        | 12 ++--
 .../dialects/PostgresqlQueryRewriterTest.java   | 16 ++---
 .../dialects/SQLServerQueryRewriterTest.java    | 16 ++---
 .../jdbc/CloseableConnectionWrapper.java        |  2 +-
 .../org/apache/metamodel/jdbc/DerbyTest.java    | 28 ++++-----
 .../metamodel/jdbc/FetchSizeCalculatorTest.java | 14 ++---
 .../metamodel/jdbc/FilteredDataSetTest.java     | 16 ++---
 .../apache/metamodel/jdbc/H2databaseTest.java   | 40 ++++++------
 .../org/apache/metamodel/jdbc/HsqldbTest.java   | 36 +++++------
 .../apache/metamodel/jdbc/JdbcColumnTest.java   | 10 +--
 .../metamodel/jdbc/JdbcDataContextTest.java     | 42 ++++++-------
 .../metamodel/jdbc/JdbcDeleteBuilderTest.java   |  6 +-
 .../metamodel/jdbc/JdbcInsertBuilderTest.java   |  6 +-
 .../apache/metamodel/jdbc/JdbcSchemaTest.java   |  8 +--
 .../org/apache/metamodel/jdbc/JdbcTestCase.java |  2 +-
 .../metamodel/jdbc/JdbcTestTemplates.java       | 28 ++++-----
 .../metamodel/jdbc/JdbcUpdateBuilderTest.java   |  6 +-
 .../apache/metamodel/jdbc/JdbcUtilsTest.java    |  4 +-
 .../metamodel/jdbc/QuerySplitterTest.java       | 22 +++----
 .../org/apache/metamodel/jdbc/SqliteTest.java   | 28 ++++-----
 .../mongodb/DefaultWriteConcernAdvisor.java     |  2 +-
 .../metamodel/mongodb/MongoDbDataContext.java   | 36 +++++------
 .../metamodel/mongodb/MongoDbDataSet.java       | 12 ++--
 .../metamodel/mongodb/MongoDbDeleteBuilder.java |  8 +--
 .../mongodb/MongoDbDropTableBuilder.java        | 10 +--
 .../mongodb/MongoDbInsertionBuilder.java        | 12 ++--
 .../mongodb/MongoDbTableCreationBuilder.java    | 18 +++---
 .../metamodel/mongodb/MongoDbTableDef.java      |  6 +-
 .../mongodb/MongoDbUpdateCallback.java          | 18 +++---
 .../mongodb/SimpleWriteConcernAdvisor.java      |  2 +-
 .../metamodel/mongodb/WriteConcernAdvisor.java  |  2 +-
 .../apache/metamodel/mongodb/package-info.java  |  2 +-
 .../mongodb/MongoDbDataContextTest.java         | 22 +++----
 .../metamodel/mongodb/MongoDbDataCopyer.java    | 24 +++----
 .../openoffice/OpenOfficeDataContext.java       | 18 +++---
 .../metamodel/openoffice/package-info.java      |  2 +-
 .../openoffice/OpenOfficeDataContextTest.java   | 14 ++---
 .../metamodel/pojo/ArrayTableDataProvider.java  |  4 +-
 .../metamodel/pojo/MapTableDataProvider.java    |  4 +-
 .../metamodel/pojo/ObjectTableDataProvider.java |  6 +-
 .../apache/metamodel/pojo/PojoDataContext.java  | 32 +++++-----
 .../org/apache/metamodel/pojo/PojoDataSet.java  | 12 ++--
 .../metamodel/pojo/PojoUpdateCallback.java      | 40 ++++++------
 .../metamodel/pojo/TableDataProvider.java       |  6 +-
 .../org/apache/metamodel/pojo/FoobarBean.java   |  2 +-
 .../pojo/ObjectTableDataProviderTest.java       |  4 +-
 .../metamodel/pojo/PojoDataContextTest.java     | 16 ++---
 .../salesforce/SalesforceDataContext.java       | 32 +++++-----
 .../metamodel/salesforce/SalesforceDataSet.java | 18 +++---
 .../salesforce/SalesforceDeleteBuilder.java     | 10 +--
 .../salesforce/SalesforceInsertBuilder.java     | 10 +--
 .../metamodel/salesforce/SalesforceSchema.java  | 10 +--
 .../metamodel/salesforce/SalesforceTable.java   | 20 +++---
 .../salesforce/SalesforceUpdateBuilder.java     | 12 ++--
 .../salesforce/SalesforceUpdateCallback.java    | 28 ++++-----
 .../metamodel/salesforce/SalesforceUtils.java   |  2 +-
 .../salesforce/SalesforceDataContextTest.java   | 32 +++++-----
 .../salesforce/SalesforceTestCase.java          |  2 +-
 .../sugarcrm/LoggingMessageHandler.java         |  2 +-
 .../metamodel/sugarcrm/SugarCrmDataContext.java | 20 +++---
 .../metamodel/sugarcrm/SugarCrmDataSet.java     | 22 +++----
 .../metamodel/sugarcrm/SugarCrmSchema.java      |  8 +--
 .../metamodel/sugarcrm/SugarCrmTable.java       | 20 +++---
 .../metamodel/sugarcrm/SugarCrmXmlHelper.java   |  4 +-
 .../sugarcrm/SugarCrmDataContextTest.java       | 20 +++---
 .../metamodel/sugarcrm/SugarCrmTestCase.java    |  2 +-
 .../apache/metamodel/xml/XmlDataContext.java    |  2 +-
 .../apache/metamodel/xml/XmlDomDataContext.java | 60 +++++++++---------
 .../metamodel/xml/XmlSaxContentHandler.java     |  4 +-
 .../apache/metamodel/xml/XmlSaxDataContext.java | 38 +++++------
 .../apache/metamodel/xml/XmlSaxTableDef.java    |  4 +-
 .../metamodel/xml/XmlStopParsingException.java  |  2 +-
 .../org/apache/metamodel/xml/package-info.java  |  2 +-
 .../metamodel/xml/XmlDomDataContextTest.java    | 20 +++---
 .../metamodel/xml/XmlSaxContentHandlerTest.java |  8 +--
 .../metamodel/xml/XmlSaxDataContextTest.java    | 14 ++---
 513 files changed, 2571 insertions(+), 2571 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/access/src/main/java/org/apache/metamodel/access/AccessDataContext.java
----------------------------------------------------------------------
diff --git a/access/src/main/java/org/apache/metamodel/access/AccessDataContext.java b/access/src/main/java/org/apache/metamodel/access/AccessDataContext.java
index 0b3875a..310611a 100644
--- a/access/src/main/java/org/apache/metamodel/access/AccessDataContext.java
+++ b/access/src/main/java/org/apache/metamodel/access/AccessDataContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.access;
+package org.apache.metamodel.access;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,24 +25,24 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.eobjects.metamodel.MetaModelException;
-import org.eobjects.metamodel.QueryPostprocessDataContext;
-import org.eobjects.metamodel.data.CachingDataSetHeader;
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.DataSetHeader;
-import org.eobjects.metamodel.data.DefaultRow;
-import org.eobjects.metamodel.data.InMemoryDataSet;
-import org.eobjects.metamodel.data.Row;
-import org.eobjects.metamodel.query.FilterItem;
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.ColumnType;
-import org.eobjects.metamodel.schema.MutableColumn;
-import org.eobjects.metamodel.schema.MutableSchema;
-import org.eobjects.metamodel.schema.MutableTable;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.schema.TableType;
+import org.apache.metamodel.MetaModelException;
+import org.apache.metamodel.QueryPostprocessDataContext;
+import org.apache.metamodel.data.CachingDataSetHeader;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.DataSetHeader;
+import org.apache.metamodel.data.DefaultRow;
+import org.apache.metamodel.data.InMemoryDataSet;
+import org.apache.metamodel.data.Row;
+import org.apache.metamodel.query.FilterItem;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
+import org.apache.metamodel.schema.MutableColumn;
+import org.apache.metamodel.schema.MutableSchema;
+import org.apache.metamodel.schema.MutableTable;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.schema.TableType;
 
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.Index;

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/access/src/main/java/org/apache/metamodel/access/package-info.java
----------------------------------------------------------------------
diff --git a/access/src/main/java/org/apache/metamodel/access/package-info.java b/access/src/main/java/org/apache/metamodel/access/package-info.java
index d64d867..bd4a54f 100644
--- a/access/src/main/java/org/apache/metamodel/access/package-info.java
+++ b/access/src/main/java/org/apache/metamodel/access/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Module package for MS Access database files
  */
-package org.eobjects.metamodel.access;
+package org.apache.metamodel.access;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/access/src/test/java/org/eobjects/metamodel/access/AccessDataContextTest.java
----------------------------------------------------------------------
diff --git a/access/src/test/java/org/eobjects/metamodel/access/AccessDataContextTest.java b/access/src/test/java/org/eobjects/metamodel/access/AccessDataContextTest.java
index 51dd39e..9050e1a 100644
--- a/access/src/test/java/org/eobjects/metamodel/access/AccessDataContextTest.java
+++ b/access/src/test/java/org/eobjects/metamodel/access/AccessDataContextTest.java
@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.access;
+package org.apache.metamodel.access;
 
 import java.util.Arrays;
 import java.util.Date;
 
 import junit.framework.TestCase;
 
-import org.eobjects.metamodel.DataContext;
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.Row;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.Row;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
 
 public class AccessDataContextTest extends TestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
index 3300e17..77ab3c1 100644
--- a/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/AbstractDataContext.java
@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.query.CompiledQuery;
-import org.eobjects.metamodel.query.DefaultCompiledQuery;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.query.builder.InitFromBuilder;
-import org.eobjects.metamodel.query.builder.InitFromBuilderImpl;
-import org.eobjects.metamodel.query.parser.QueryParser;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.query.CompiledQuery;
+import org.apache.metamodel.query.DefaultCompiledQuery;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.query.builder.InitFromBuilder;
+import org.apache.metamodel.query.builder.InitFromBuilderImpl;
+import org.apache.metamodel.query.parser.QueryParser;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
 
 /**
  * Abstract implementation of the DataContext interface. Provides convenient

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java b/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
index 602a412..896dd48 100644
--- a/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
+++ b/core/src/main/java/org/apache/metamodel/AbstractUpdateCallback.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.Arrays;
 
-import org.eobjects.metamodel.create.TableCreationBuilder;
-import org.eobjects.metamodel.delete.RowDeletionBuilder;
-import org.eobjects.metamodel.drop.TableDropBuilder;
-import org.eobjects.metamodel.insert.RowInsertionBuilder;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.update.RowUpdationBuilder;
+import org.apache.metamodel.create.TableCreationBuilder;
+import org.apache.metamodel.delete.RowDeletionBuilder;
+import org.apache.metamodel.drop.TableDropBuilder;
+import org.apache.metamodel.insert.RowInsertionBuilder;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.update.RowUpdationBuilder;
 
 /**
  * Abstract implementation of the {@link UpdateCallback} interface. Implements

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/BatchUpdateScript.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/BatchUpdateScript.java b/core/src/main/java/org/apache/metamodel/BatchUpdateScript.java
index d7b567c..1f8a97f 100644
--- a/core/src/main/java/org/apache/metamodel/BatchUpdateScript.java
+++ b/core/src/main/java/org/apache/metamodel/BatchUpdateScript.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 /**
  * Indicator sub-interface of {@link UpdateScript}. Implementing your updates

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/CompositeDataContext.java b/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
index 82d6c01..4c9db10 100644
--- a/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/CompositeDataContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,13 +28,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.query.FromItem;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.schema.CompositeSchema;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.util.Func;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.query.FromItem;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.schema.CompositeSchema;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.util.Func;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/CompositeQueryDelegate.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/CompositeQueryDelegate.java b/core/src/main/java/org/apache/metamodel/CompositeQueryDelegate.java
index 70b19f1..9a3517a 100644
--- a/core/src/main/java/org/apache/metamodel/CompositeQueryDelegate.java
+++ b/core/src/main/java/org/apache/metamodel/CompositeQueryDelegate.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.util.Func;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.util.Func;
 
 final class CompositeQueryDelegate extends QueryPostprocessDelegate {
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/DataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/DataContext.java b/core/src/main/java/org/apache/metamodel/DataContext.java
index b536d7d..bdd3a6e 100644
--- a/core/src/main/java/org/apache/metamodel/DataContext.java
+++ b/core/src/main/java/org/apache/metamodel/DataContext.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
-
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.query.CompiledQuery;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.query.QueryParameter;
-import org.eobjects.metamodel.query.builder.InitFromBuilder;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
+package org.apache.metamodel;
+
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.query.CompiledQuery;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.query.QueryParameter;
+import org.apache.metamodel.query.builder.InitFromBuilder;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
 
 /**
  * A DataContext represents the central entry point for interactions with

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java b/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java
index 36e4b3e..1b4670b 100644
--- a/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/DeleteAndInsertBuilder.java
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.List;
 import java.util.ListIterator;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.DefaultRow;
-import org.eobjects.metamodel.data.Row;
-import org.eobjects.metamodel.data.SimpleDataSetHeader;
-import org.eobjects.metamodel.query.FilterItem;
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.update.AbstractRowUpdationBuilder;
-import org.eobjects.metamodel.update.RowUpdationBuilder;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.DefaultRow;
+import org.apache.metamodel.data.Row;
+import org.apache.metamodel.data.SimpleDataSetHeader;
+import org.apache.metamodel.query.FilterItem;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.update.AbstractRowUpdationBuilder;
+import org.apache.metamodel.update.RowUpdationBuilder;
 
 /**
  * Simple implementation of the {@link RowUpdationBuilder} interface, which

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/InconsistentRowFormatException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/InconsistentRowFormatException.java b/core/src/main/java/org/apache/metamodel/InconsistentRowFormatException.java
index b3baff9..490b725 100644
--- a/core/src/main/java/org/apache/metamodel/InconsistentRowFormatException.java
+++ b/core/src/main/java/org/apache/metamodel/InconsistentRowFormatException.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.Row;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.Row;
 
 /**
  * Abstract exception type that represents exceptions that occur when reading a

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/MetaModelException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/MetaModelException.java b/core/src/main/java/org/apache/metamodel/MetaModelException.java
index 787b8c5..dca6c23 100644
--- a/core/src/main/java/org/apache/metamodel/MetaModelException.java
+++ b/core/src/main/java/org/apache/metamodel/MetaModelException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 /**
  * Unchecked exception used to signal errors occuring in MetaModel.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
index a105973..c4dbd8d 100644
--- a/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
+++ b/core/src/main/java/org/apache/metamodel/MetaModelHelper.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,35 +29,35 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.eobjects.metamodel.data.CachingDataSetHeader;
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.DataSetHeader;
-import org.eobjects.metamodel.data.DefaultRow;
-import org.eobjects.metamodel.data.EmptyDataSet;
-import org.eobjects.metamodel.data.FilteredDataSet;
-import org.eobjects.metamodel.data.IRowFilter;
-import org.eobjects.metamodel.data.InMemoryDataSet;
-import org.eobjects.metamodel.data.Row;
-import org.eobjects.metamodel.data.SimpleDataSetHeader;
-import org.eobjects.metamodel.data.SubSelectionDataSet;
-import org.eobjects.metamodel.query.FilterItem;
-import org.eobjects.metamodel.query.FromItem;
-import org.eobjects.metamodel.query.GroupByItem;
-import org.eobjects.metamodel.query.OrderByItem;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.query.parser.QueryParser;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.ColumnType;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.SuperColumnType;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.util.AggregateBuilder;
-import org.eobjects.metamodel.util.CollectionUtils;
-import org.eobjects.metamodel.util.EqualsBuilder;
-import org.eobjects.metamodel.util.Func;
-import org.eobjects.metamodel.util.ObjectComparator;
-import org.eobjects.metamodel.util.Predicate;
+import org.apache.metamodel.data.CachingDataSetHeader;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.DataSetHeader;
+import org.apache.metamodel.data.DefaultRow;
+import org.apache.metamodel.data.EmptyDataSet;
+import org.apache.metamodel.data.FilteredDataSet;
+import org.apache.metamodel.data.IRowFilter;
+import org.apache.metamodel.data.InMemoryDataSet;
+import org.apache.metamodel.data.Row;
+import org.apache.metamodel.data.SimpleDataSetHeader;
+import org.apache.metamodel.data.SubSelectionDataSet;
+import org.apache.metamodel.query.FilterItem;
+import org.apache.metamodel.query.FromItem;
+import org.apache.metamodel.query.GroupByItem;
+import org.apache.metamodel.query.OrderByItem;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.query.parser.QueryParser;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.SuperColumnType;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.util.AggregateBuilder;
+import org.apache.metamodel.util.CollectionUtils;
+import org.apache.metamodel.util.EqualsBuilder;
+import org.apache.metamodel.util.Func;
+import org.apache.metamodel.util.ObjectComparator;
+import org.apache.metamodel.util.Predicate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java b/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
index d84da6a..1cdca87 100644
--- a/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/QueryPostprocessDataContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,38 +24,38 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.eobjects.metamodel.convert.ConvertedDataSetInterceptor;
-import org.eobjects.metamodel.convert.Converters;
-import org.eobjects.metamodel.convert.HasReadTypeConverters;
-import org.eobjects.metamodel.convert.TypeConverter;
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.DataSetHeader;
-import org.eobjects.metamodel.data.DefaultRow;
-import org.eobjects.metamodel.data.EmptyDataSet;
-import org.eobjects.metamodel.data.FirstRowDataSet;
-import org.eobjects.metamodel.data.InMemoryDataSet;
-import org.eobjects.metamodel.data.MaxRowsDataSet;
-import org.eobjects.metamodel.data.Row;
-import org.eobjects.metamodel.data.SimpleDataSetHeader;
-import org.eobjects.metamodel.query.FilterItem;
-import org.eobjects.metamodel.query.FromItem;
-import org.eobjects.metamodel.query.GroupByItem;
-import org.eobjects.metamodel.query.JoinType;
-import org.eobjects.metamodel.query.OperatorType;
-import org.eobjects.metamodel.query.OrderByItem;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.ColumnType;
-import org.eobjects.metamodel.schema.MutableColumn;
-import org.eobjects.metamodel.schema.MutableRelationship;
-import org.eobjects.metamodel.schema.MutableSchema;
-import org.eobjects.metamodel.schema.MutableTable;
-import org.eobjects.metamodel.schema.Relationship;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.schema.TableType;
-import org.eobjects.metamodel.util.CollectionUtils;
+import org.apache.metamodel.convert.ConvertedDataSetInterceptor;
+import org.apache.metamodel.convert.Converters;
+import org.apache.metamodel.convert.HasReadTypeConverters;
+import org.apache.metamodel.convert.TypeConverter;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.DataSetHeader;
+import org.apache.metamodel.data.DefaultRow;
+import org.apache.metamodel.data.EmptyDataSet;
+import org.apache.metamodel.data.FirstRowDataSet;
+import org.apache.metamodel.data.InMemoryDataSet;
+import org.apache.metamodel.data.MaxRowsDataSet;
+import org.apache.metamodel.data.Row;
+import org.apache.metamodel.data.SimpleDataSetHeader;
+import org.apache.metamodel.query.FilterItem;
+import org.apache.metamodel.query.FromItem;
+import org.apache.metamodel.query.GroupByItem;
+import org.apache.metamodel.query.JoinType;
+import org.apache.metamodel.query.OperatorType;
+import org.apache.metamodel.query.OrderByItem;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
+import org.apache.metamodel.schema.MutableColumn;
+import org.apache.metamodel.schema.MutableRelationship;
+import org.apache.metamodel.schema.MutableSchema;
+import org.apache.metamodel.schema.MutableTable;
+import org.apache.metamodel.schema.Relationship;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.schema.TableType;
+import org.apache.metamodel.util.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/QueryPostprocessDelegate.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/QueryPostprocessDelegate.java b/core/src/main/java/org/apache/metamodel/QueryPostprocessDelegate.java
index 7d8dde3..0d69333 100644
--- a/core/src/main/java/org/apache/metamodel/QueryPostprocessDelegate.java
+++ b/core/src/main/java/org/apache/metamodel/QueryPostprocessDelegate.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
-import org.eobjects.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Schema;
 
 /**
  * A simple subclass of {@link QueryPostprocessDataContext} which provides less

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/SchemaNameComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/SchemaNameComparator.java b/core/src/main/java/org/apache/metamodel/SchemaNameComparator.java
index 14a2f82..cf36ecb 100644
--- a/core/src/main/java/org/apache/metamodel/SchemaNameComparator.java
+++ b/core/src/main/java/org/apache/metamodel/SchemaNameComparator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 import java.util.Comparator;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/UpdateCallback.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/UpdateCallback.java b/core/src/main/java/org/apache/metamodel/UpdateCallback.java
index c19f03f..fffe755 100644
--- a/core/src/main/java/org/apache/metamodel/UpdateCallback.java
+++ b/core/src/main/java/org/apache/metamodel/UpdateCallback.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
-import org.eobjects.metamodel.create.TableCreatable;
-import org.eobjects.metamodel.delete.RowDeletable;
-import org.eobjects.metamodel.drop.TableDroppable;
-import org.eobjects.metamodel.insert.RowInsertable;
-import org.eobjects.metamodel.update.RowUpdateable;
+import org.apache.metamodel.create.TableCreatable;
+import org.apache.metamodel.delete.RowDeletable;
+import org.apache.metamodel.drop.TableDroppable;
+import org.apache.metamodel.insert.RowInsertable;
+import org.apache.metamodel.update.RowUpdateable;
 
 /**
  * An {@link UpdateCallback} is used by an {@link UpdateScript} to perform

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/UpdateScript.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/UpdateScript.java b/core/src/main/java/org/apache/metamodel/UpdateScript.java
index b10318e..101303f 100644
--- a/core/src/main/java/org/apache/metamodel/UpdateScript.java
+++ b/core/src/main/java/org/apache/metamodel/UpdateScript.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
-import org.eobjects.metamodel.util.Action;
+import org.apache.metamodel.util.Action;
 
 /**
  * Represents any updating operation or update script that can be executed on a

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/UpdateableDataContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/UpdateableDataContext.java b/core/src/main/java/org/apache/metamodel/UpdateableDataContext.java
index 3153f75..5042451 100644
--- a/core/src/main/java/org/apache/metamodel/UpdateableDataContext.java
+++ b/core/src/main/java/org/apache/metamodel/UpdateableDataContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel;
+package org.apache.metamodel;
 
 /**
  * Represents a {@link DataContext} that supports updating write-operations.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java
----------------------------------------------------------------------
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 1355c95..7ff75f2 100644
--- a/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java
+++ b/core/src/main/java/org/apache/metamodel/convert/ColumnTypeDetector.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
-import org.eobjects.metamodel.util.BooleanComparator;
-import org.eobjects.metamodel.util.TimeComparator;
+import org.apache.metamodel.util.BooleanComparator;
+import org.apache.metamodel.util.TimeComparator;
 
 /**
  * A class capable of detecting/narrowing a string column type to something more

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSet.java b/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSet.java
index ff0cf79..ffd85ab 100644
--- a/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSet.java
+++ b/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSet.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
-import org.eobjects.metamodel.data.AbstractDataSet;
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.DefaultRow;
-import org.eobjects.metamodel.data.Row;
+import org.apache.metamodel.data.AbstractDataSet;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.DefaultRow;
+import org.apache.metamodel.data.Row;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSetInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSetInterceptor.java b/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSetInterceptor.java
index 159c469..d5746de 100644
--- a/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSetInterceptor.java
+++ b/core/src/main/java/org/apache/metamodel/convert/ConvertedDataSetInterceptor.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.intercept.DataSetInterceptor;
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.schema.Column;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.intercept.DataSetInterceptor;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
 
 /**
  * A {@link DataSetInterceptor} used for intercepting values in {@link DataSet}s

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/ConvertedRowInsertionInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/ConvertedRowInsertionInterceptor.java b/core/src/main/java/org/apache/metamodel/convert/ConvertedRowInsertionInterceptor.java
index b7ea3ad..2ef21b0 100644
--- a/core/src/main/java/org/apache/metamodel/convert/ConvertedRowInsertionInterceptor.java
+++ b/core/src/main/java/org/apache/metamodel/convert/ConvertedRowInsertionInterceptor.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eobjects.metamodel.insert.RowInsertionBuilder;
-import org.eobjects.metamodel.intercept.RowInsertionInterceptor;
-import org.eobjects.metamodel.schema.Column;
+import org.apache.metamodel.insert.RowInsertionBuilder;
+import org.apache.metamodel.intercept.RowInsertionInterceptor;
+import org.apache.metamodel.schema.Column;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/ConvertedRowUpdationInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/ConvertedRowUpdationInterceptor.java b/core/src/main/java/org/apache/metamodel/convert/ConvertedRowUpdationInterceptor.java
index 6a42107..cfe92af 100644
--- a/core/src/main/java/org/apache/metamodel/convert/ConvertedRowUpdationInterceptor.java
+++ b/core/src/main/java/org/apache/metamodel/convert/ConvertedRowUpdationInterceptor.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eobjects.metamodel.intercept.RowUpdationInterceptor;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.update.RowUpdationBuilder;
+import org.apache.metamodel.intercept.RowUpdationInterceptor;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.update.RowUpdationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/Converters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/Converters.java b/core/src/main/java/org/apache/metamodel/convert/Converters.java
index 7b7b43c..1be0e13 100644
--- a/core/src/main/java/org/apache/metamodel/convert/Converters.java
+++ b/core/src/main/java/org/apache/metamodel/convert/Converters.java
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eobjects.metamodel.DataContext;
-import org.eobjects.metamodel.MetaModelHelper;
-import org.eobjects.metamodel.UpdateableDataContext;
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.data.Row;
-import org.eobjects.metamodel.data.RowBuilder;
-import org.eobjects.metamodel.data.Style;
-import org.eobjects.metamodel.intercept.InterceptableDataContext;
-import org.eobjects.metamodel.intercept.Interceptors;
-import org.eobjects.metamodel.query.Query;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.SuperColumnType;
-import org.eobjects.metamodel.schema.Table;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.MetaModelHelper;
+import org.apache.metamodel.UpdateableDataContext;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.data.Row;
+import org.apache.metamodel.data.RowBuilder;
+import org.apache.metamodel.data.Style;
+import org.apache.metamodel.intercept.InterceptableDataContext;
+import org.apache.metamodel.intercept.Interceptors;
+import org.apache.metamodel.query.Query;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.SuperColumnType;
+import org.apache.metamodel.schema.Table;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/HasReadTypeConverters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/HasReadTypeConverters.java b/core/src/main/java/org/apache/metamodel/convert/HasReadTypeConverters.java
index 5f63c1e..e85e777 100644
--- a/core/src/main/java/org/apache/metamodel/convert/HasReadTypeConverters.java
+++ b/core/src/main/java/org/apache/metamodel/convert/HasReadTypeConverters.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
-import org.eobjects.metamodel.data.DataSet;
-import org.eobjects.metamodel.schema.Column;
+import org.apache.metamodel.data.DataSet;
+import org.apache.metamodel.schema.Column;
 
 /**
  * Defines an interface for objects that are aware of {@link TypeConverter}s,

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/StringToBooleanConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/StringToBooleanConverter.java b/core/src/main/java/org/apache/metamodel/convert/StringToBooleanConverter.java
index fb546a4..6faa459 100644
--- a/core/src/main/java/org/apache/metamodel/convert/StringToBooleanConverter.java
+++ b/core/src/main/java/org/apache/metamodel/convert/StringToBooleanConverter.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
-import org.eobjects.metamodel.util.BooleanComparator;
+import org.apache.metamodel.util.BooleanComparator;
 
 /**
  * A {@link TypeConverter} that converts String values (on the physical layer)

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/StringToDateConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/StringToDateConverter.java b/core/src/main/java/org/apache/metamodel/convert/StringToDateConverter.java
index 1684a31..ba1e5cb 100644
--- a/core/src/main/java/org/apache/metamodel/convert/StringToDateConverter.java
+++ b/core/src/main/java/org/apache/metamodel/convert/StringToDateConverter.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.eobjects.metamodel.util.Func;
-import org.eobjects.metamodel.util.TimeComparator;
+import org.apache.metamodel.util.Func;
+import org.apache.metamodel.util.TimeComparator;
 
 /**
  * A {@link TypeConverter} that converts String values (on the physical layer)

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/StringToDoubleConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/StringToDoubleConverter.java b/core/src/main/java/org/apache/metamodel/convert/StringToDoubleConverter.java
index 6ce6406..d10cea0 100644
--- a/core/src/main/java/org/apache/metamodel/convert/StringToDoubleConverter.java
+++ b/core/src/main/java/org/apache/metamodel/convert/StringToDoubleConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 /**
  * A {@link TypeConverter} that converts String values (on the physical layer)

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/StringToIntegerConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/StringToIntegerConverter.java b/core/src/main/java/org/apache/metamodel/convert/StringToIntegerConverter.java
index 4aafe7d..cdc9f82 100644
--- a/core/src/main/java/org/apache/metamodel/convert/StringToIntegerConverter.java
+++ b/core/src/main/java/org/apache/metamodel/convert/StringToIntegerConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 /**
  * A {@link TypeConverter} that converts String values (on the physical layer)

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/TypeConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/TypeConverter.java b/core/src/main/java/org/apache/metamodel/convert/TypeConverter.java
index 542449e..2b54c72 100644
--- a/core/src/main/java/org/apache/metamodel/convert/TypeConverter.java
+++ b/core/src/main/java/org/apache/metamodel/convert/TypeConverter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 
 /**
  * Defines an interface for converting values from and to their physical

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/convert/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/convert/package-info.java b/core/src/main/java/org/apache/metamodel/convert/package-info.java
index 0adf2aa..1d1ce41 100644
--- a/core/src/main/java/org/apache/metamodel/convert/package-info.java
+++ b/core/src/main/java/org/apache/metamodel/convert/package-info.java
@@ -19,5 +19,5 @@
 /**
  * DataContext decorator for implicit conversion of value types after querying and before insertion.
  */
-package org.eobjects.metamodel.convert;
+package org.apache.metamodel.convert;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java b/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
index 26fee26..408eecd 100644
--- a/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.ColumnType;
-import org.eobjects.metamodel.schema.MutableColumn;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
+import org.apache.metamodel.schema.MutableColumn;
 
 /**
  * Convenience implementation of all {@link ColumnBuilder} methods

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/AbstractTableCreationBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/AbstractTableCreationBuilder.java b/core/src/main/java/org/apache/metamodel/create/AbstractTableCreationBuilder.java
index d833b1e..61fd359 100644
--- a/core/src/main/java/org/apache/metamodel/create/AbstractTableCreationBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/AbstractTableCreationBuilder.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.UpdateCallback;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.ColumnType;
-import org.eobjects.metamodel.schema.MutableColumn;
-import org.eobjects.metamodel.schema.MutableTable;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.Table;
-import org.eobjects.metamodel.schema.TableType;
+import org.apache.metamodel.UpdateCallback;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
+import org.apache.metamodel.schema.MutableColumn;
+import org.apache.metamodel.schema.MutableTable;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Table;
+import org.apache.metamodel.schema.TableType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/ColumnBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/ColumnBuilder.java b/core/src/main/java/org/apache/metamodel/create/ColumnBuilder.java
index 1d6a7c2..031d23e 100644
--- a/core/src/main/java/org/apache/metamodel/create/ColumnBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/ColumnBuilder.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.DataContext;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.ColumnType;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.ColumnType;
 
 /**
  * Abstract interface for components that build columns.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java
----------------------------------------------------------------------
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 4792e85..314e820 100644
--- a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilder.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.schema.Column;
+import org.apache.metamodel.schema.Column;
 
 /**
  * Builder object for creating {@link Column}s. This class also extendsthe

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilderImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilderImpl.java b/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilderImpl.java
index 1aba1d4..0034c10 100644
--- a/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilderImpl.java
+++ b/core/src/main/java/org/apache/metamodel/create/ColumnCreationBuilderImpl.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.MetaModelException;
-import org.eobjects.metamodel.schema.MutableColumn;
-import org.eobjects.metamodel.schema.Table;
+import org.apache.metamodel.MetaModelException;
+import org.apache.metamodel.schema.MutableColumn;
+import org.apache.metamodel.schema.Table;
 
 /**
  * Implementation of the {@link ColumnCreationBuilder}.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/CreateTable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/CreateTable.java b/core/src/main/java/org/apache/metamodel/create/CreateTable.java
index c40c823..b189bd2 100644
--- a/core/src/main/java/org/apache/metamodel/create/CreateTable.java
+++ b/core/src/main/java/org/apache/metamodel/create/CreateTable.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.DataContext;
-import org.eobjects.metamodel.UpdateCallback;
-import org.eobjects.metamodel.UpdateScript;
-import org.eobjects.metamodel.UpdateableDataContext;
-import org.eobjects.metamodel.schema.MutableColumn;
-import org.eobjects.metamodel.schema.MutableSchema;
-import org.eobjects.metamodel.schema.MutableTable;
-import org.eobjects.metamodel.schema.Schema;
-import org.eobjects.metamodel.schema.TableType;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.UpdateCallback;
+import org.apache.metamodel.UpdateScript;
+import org.apache.metamodel.UpdateableDataContext;
+import org.apache.metamodel.schema.MutableColumn;
+import org.apache.metamodel.schema.MutableSchema;
+import org.apache.metamodel.schema.MutableTable;
+import org.apache.metamodel.schema.Schema;
+import org.apache.metamodel.schema.TableType;
 
 /**
  * Represents a single CREATE TABLE operation to be applied to a

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java b/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
index 240abb2..8cd1e0d 100644
--- a/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/CreateTableColumnBuilder.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.UpdateCallback;
-import org.eobjects.metamodel.UpdateScript;
-import org.eobjects.metamodel.schema.MutableColumn;
+import org.apache.metamodel.UpdateCallback;
+import org.apache.metamodel.UpdateScript;
+import org.apache.metamodel.schema.MutableColumn;
 
 /**
  * Column builder for {@link CreateTable}.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/TableCreatable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/TableCreatable.java b/core/src/main/java/org/apache/metamodel/create/TableCreatable.java
index 2b42133..672741b 100644
--- a/core/src/main/java/org/apache/metamodel/create/TableCreatable.java
+++ b/core/src/main/java/org/apache/metamodel/create/TableCreatable.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.schema.Schema;
+import org.apache.metamodel.schema.Schema;
 
 /**
  * Interface for objects that support creating new tables.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/TableCreationBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/TableCreationBuilder.java b/core/src/main/java/org/apache/metamodel/create/TableCreationBuilder.java
index c3dfefd..c39ca4d 100644
--- a/core/src/main/java/org/apache/metamodel/create/TableCreationBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/TableCreationBuilder.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 
-import org.eobjects.metamodel.DataContext;
-import org.eobjects.metamodel.MetaModelException;
-import org.eobjects.metamodel.schema.Table;
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.MetaModelException;
+import org.apache.metamodel.schema.Table;
 
 /**
  * Builder object for {@link Table} creation.

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/create/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/package-info.java b/core/src/main/java/org/apache/metamodel/create/package-info.java
index 44c5ed9..fbb1f3b 100644
--- a/core/src/main/java/org/apache/metamodel/create/package-info.java
+++ b/core/src/main/java/org/apache/metamodel/create/package-info.java
@@ -19,5 +19,5 @@
 /**
  * API for creating tables
  */
-package org.eobjects.metamodel.create;
+package org.apache.metamodel.create;
 

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
index 98b9416..ac04a93 100644
--- a/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
+++ b/core/src/main/java/org/apache/metamodel/data/AbstractDataSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.data;
+package org.apache.metamodel.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,10 +25,10 @@ import java.util.List;
 
 import javax.swing.table.TableModel;
 
-import org.eobjects.metamodel.MetaModelHelper;
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.util.BaseObject;
+import org.apache.metamodel.MetaModelHelper;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.util.BaseObject;
 
 /**
  * Abstract DataSet implementation. Provides convenient implementations of

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/data/AbstractRow.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/data/AbstractRow.java b/core/src/main/java/org/apache/metamodel/data/AbstractRow.java
index 74340fe..b736592 100644
--- a/core/src/main/java/org/apache/metamodel/data/AbstractRow.java
+++ b/core/src/main/java/org/apache/metamodel/data/AbstractRow.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.data;
+package org.apache.metamodel.data;
 
 import java.util.Arrays;
 
-import org.eobjects.metamodel.query.SelectItem;
-import org.eobjects.metamodel.schema.Column;
+import org.apache.metamodel.query.SelectItem;
+import org.apache.metamodel.schema.Column;
 
 /**
  * An abstract row that decorates another row. Useful for virtual data that may

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/587d518a/core/src/main/java/org/apache/metamodel/data/AbstractRowBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/data/AbstractRowBuilder.java b/core/src/main/java/org/apache/metamodel/data/AbstractRowBuilder.java
index 32f6d33..fef04c9 100644
--- a/core/src/main/java/org/apache/metamodel/data/AbstractRowBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/data/AbstractRowBuilder.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eobjects.metamodel.data;
+package org.apache.metamodel.data;
 
 import java.util.Arrays;
 
-import org.eobjects.metamodel.schema.Column;
-import org.eobjects.metamodel.schema.Table;
+import org.apache.metamodel.schema.Column;
+import org.apache.metamodel.schema.Table;
 
 /**
  * Abstract {@link RowBuilder} implementation.