diff --git a/.classpath b/.classpath index 2339cb95..04d89f2d 100644 --- a/.classpath +++ b/.classpath @@ -1,28 +1,33 @@ - + + + + + + - - + - + - + + - + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 4e048197..d72affa6 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,5 +1,8 @@ eclipse.preferences.version=1 -encoding//src/java=UTF-8 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/main/resources/META-INF=UTF-8 encoding//src/test=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 encoding/=UTF-8 -encoding/META-INF=UTF-8 diff --git a/pom.xml b/pom.xml index 79e6783b..b557a2d1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.datanucleus datanucleus-maven-parent - 4.0.3 + 4.0.5-SNAPSHOT datanucleus-rdbms diff --git a/src/java/org/datanucleus/store/rdbms/AbstractSchemaTransaction.java b/src/main/java/org/datanucleus/store/rdbms/AbstractSchemaTransaction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/AbstractSchemaTransaction.java rename to src/main/java/org/datanucleus/store/rdbms/AbstractSchemaTransaction.java diff --git a/src/java/org/datanucleus/store/rdbms/ConnectionFactoryImpl.java b/src/main/java/org/datanucleus/store/rdbms/ConnectionFactoryImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/ConnectionFactoryImpl.java rename to src/main/java/org/datanucleus/store/rdbms/ConnectionFactoryImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/ConnectionProvider.java b/src/main/java/org/datanucleus/store/rdbms/ConnectionProvider.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/ConnectionProvider.java rename to src/main/java/org/datanucleus/store/rdbms/ConnectionProvider.java diff --git a/src/java/org/datanucleus/store/rdbms/ConnectionProviderPriorityList.java b/src/main/java/org/datanucleus/store/rdbms/ConnectionProviderPriorityList.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/ConnectionProviderPriorityList.java rename to src/main/java/org/datanucleus/store/rdbms/ConnectionProviderPriorityList.java diff --git a/src/java/org/datanucleus/store/rdbms/DeleteTablesSchemaTransaction.java b/src/main/java/org/datanucleus/store/rdbms/DeleteTablesSchemaTransaction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/DeleteTablesSchemaTransaction.java rename to src/main/java/org/datanucleus/store/rdbms/DeleteTablesSchemaTransaction.java diff --git a/src/java/org/datanucleus/store/rdbms/FlushReferential.java b/src/main/java/org/datanucleus/store/rdbms/FlushReferential.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/FlushReferential.java rename to src/main/java/org/datanucleus/store/rdbms/FlushReferential.java diff --git a/src/java/org/datanucleus/store/rdbms/JDBCUtils.java b/src/main/java/org/datanucleus/store/rdbms/JDBCUtils.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/JDBCUtils.java rename to src/main/java/org/datanucleus/store/rdbms/JDBCUtils.java diff --git a/src/java/org/datanucleus/store/rdbms/NucleusSequenceImpl.java b/src/main/java/org/datanucleus/store/rdbms/NucleusSequenceImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/NucleusSequenceImpl.java rename to src/main/java/org/datanucleus/store/rdbms/NucleusSequenceImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java b/src/main/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java rename to src/main/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java b/src/main/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java rename to src/main/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java diff --git a/src/java/org/datanucleus/store/rdbms/RDBMSPropertyNames.java b/src/main/java/org/datanucleus/store/rdbms/RDBMSPropertyNames.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/RDBMSPropertyNames.java rename to src/main/java/org/datanucleus/store/rdbms/RDBMSPropertyNames.java diff --git a/src/java/org/datanucleus/store/rdbms/RDBMSPropertyValidator.java b/src/main/java/org/datanucleus/store/rdbms/RDBMSPropertyValidator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/RDBMSPropertyValidator.java rename to src/main/java/org/datanucleus/store/rdbms/RDBMSPropertyValidator.java diff --git a/src/java/org/datanucleus/store/rdbms/RDBMSStoreData.java b/src/main/java/org/datanucleus/store/rdbms/RDBMSStoreData.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/RDBMSStoreData.java rename to src/main/java/org/datanucleus/store/rdbms/RDBMSStoreData.java diff --git a/src/java/org/datanucleus/store/rdbms/RDBMSStoreHelper.java b/src/main/java/org/datanucleus/store/rdbms/RDBMSStoreHelper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/RDBMSStoreHelper.java rename to src/main/java/org/datanucleus/store/rdbms/RDBMSStoreHelper.java diff --git a/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java b/src/main/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java rename to src/main/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java diff --git a/src/java/org/datanucleus/store/rdbms/SQLController.java b/src/main/java/org/datanucleus/store/rdbms/SQLController.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/SQLController.java rename to src/main/java/org/datanucleus/store/rdbms/SQLController.java diff --git a/src/java/org/datanucleus/store/rdbms/ValidateTableSchemaTransaction.java b/src/main/java/org/datanucleus/store/rdbms/ValidateTableSchemaTransaction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/ValidateTableSchemaTransaction.java rename to src/main/java/org/datanucleus/store/rdbms/ValidateTableSchemaTransaction.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/BaseDatastoreAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/BaseDatastoreAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/BaseDatastoreAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/BaseDatastoreAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/DB2AS400Adapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/DB2AS400Adapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/DB2AS400Adapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/DB2AS400Adapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/DB2Adapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/DB2Adapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/DB2Adapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/DB2Adapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapterFactory.java b/src/main/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapterFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapterFactory.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/DatastoreAdapterFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/DerbyAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/DerbyAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/DerbyAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/DerbyAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/DerbySQLFunction.java b/src/main/java/org/datanucleus/store/rdbms/adapter/DerbySQLFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/DerbySQLFunction.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/DerbySQLFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/FirebirdAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/FirebirdAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/FirebirdAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/FirebirdAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/H2Adapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/H2Adapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/H2Adapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/H2Adapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/HSQLAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/HSQLAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/HSQLAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/HSQLAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/InformixAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/InformixAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/InformixAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/InformixAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/MSSQLServerAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/MSSQLServerAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/MSSQLServerAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/MSSQLServerAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/McKoiAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/McKoiAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/McKoiAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/McKoiAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/MySQLAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/MySQLAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/MySQLAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/MySQLAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/NuoDBAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/NuoDBAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/NuoDBAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/NuoDBAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/OracleAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/PointbaseAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/PointbaseAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/PointbaseAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/PointbaseAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/PostgreSQLAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/PostgreSQLAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/PostgreSQLAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/PostgreSQLAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/SAPDBAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/SAPDBAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/SAPDBAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/SAPDBAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/SQLConstants.java b/src/main/java/org/datanucleus/store/rdbms/adapter/SQLConstants.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/SQLConstants.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/SQLConstants.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/SQLiteAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/SQLiteAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/SQLiteAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/SQLiteAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/SybaseAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/SybaseAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/SybaseAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/SybaseAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/TimesTenAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/TimesTenAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/TimesTenAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/TimesTenAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/VirtuosoAdapter.java b/src/main/java/org/datanucleus/store/rdbms/adapter/VirtuosoAdapter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/VirtuosoAdapter.java rename to src/main/java/org/datanucleus/store/rdbms/adapter/VirtuosoAdapter.java diff --git a/src/java/org/datanucleus/store/rdbms/adapter/package.html b/src/main/java/org/datanucleus/store/rdbms/adapter/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/adapter/package.html rename to src/main/java/org/datanucleus/store/rdbms/adapter/package.html diff --git a/src/java/org/datanucleus/store/rdbms/autostart/SchemaAutoStarter.java b/src/main/java/org/datanucleus/store/rdbms/autostart/SchemaAutoStarter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/autostart/SchemaAutoStarter.java rename to src/main/java/org/datanucleus/store/rdbms/autostart/SchemaAutoStarter.java diff --git a/src/java/org/datanucleus/store/rdbms/autostart/SchemaTable.java b/src/main/java/org/datanucleus/store/rdbms/autostart/SchemaTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/autostart/SchemaTable.java rename to src/main/java/org/datanucleus/store/rdbms/autostart/SchemaTable.java diff --git a/src/java/org/datanucleus/store/rdbms/autostart/package.html b/src/main/java/org/datanucleus/store/rdbms/autostart/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/autostart/package.html rename to src/main/java/org/datanucleus/store/rdbms/autostart/package.html diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/AbstractConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/AbstractConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/AbstractConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/AbstractConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/BoneCPConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/BoneCPConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/BoneCPConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/BoneCPConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/C3P0ConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/C3P0ConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/C3P0ConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/C3P0ConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPool.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPool.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPool.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/ConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/DBCP2ConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/DBCP2ConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/DBCP2ConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/DBCP2ConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/DBCPBuiltinConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/DBCPBuiltinConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/DBCPBuiltinConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/DBCPBuiltinConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/DBCPConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/DBCPConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/DBCPConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/DBCPConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/DatastoreDriverNotFoundException.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/DatastoreDriverNotFoundException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/DatastoreDriverNotFoundException.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/DatastoreDriverNotFoundException.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/DatastorePoolException.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/DatastorePoolException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/DatastorePoolException.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/DatastorePoolException.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/DefaultConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/DefaultConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/DefaultConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/DefaultConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/HikariCPConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/HikariCPConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/HikariCPConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/HikariCPConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/ProxoolConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/ProxoolConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/ProxoolConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/ProxoolConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/connectionpool/TomcatConnectionPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/connectionpool/TomcatConnectionPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/connectionpool/TomcatConnectionPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/connectionpool/TomcatConnectionPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/DriverManagerDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/DriverManagerDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/DriverManagerDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/DriverManagerDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedConfig.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedConfig.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedConfig.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedConfig.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedTrace.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedTrace.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedTrace.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/AbandonedTrace.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSourceFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSourceFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSourceFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/BasicDataSourceFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/ConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/ConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/ConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/ConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DataSourceConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DataSourceConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DataSourceConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DataSourceConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DbcpException.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DbcpException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DbcpException.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DbcpException.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingCallableStatement.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingCallableStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingCallableStatement.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingCallableStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingConnection.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingConnection.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingConnection.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingConnection.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingDatabaseMetaData.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingDatabaseMetaData.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingDatabaseMetaData.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingDatabaseMetaData.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingPreparedStatement.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingPreparedStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingPreparedStatement.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingPreparedStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingResultSet.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingResultSet.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingResultSet.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingResultSet.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingStatement.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingStatement.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DelegatingStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverManagerConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverManagerConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverManagerConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/DriverManagerConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableCallableStatement.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableCallableStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableCallableStatement.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableCallableStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnection.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnection.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnection.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnection.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolableConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolablePreparedStatement.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolablePreparedStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolablePreparedStatement.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolablePreparedStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingConnection.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingConnection.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingConnection.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingConnection.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDriver.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDriver.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDriver.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/PoolingDriver.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/SQLNestedException.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/SQLNestedException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/SQLNestedException.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/SQLNestedException.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/ConnectionImpl.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/ConnectionImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/ConnectionImpl.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/ConnectionImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/DriverAdapterCPDS.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/DriverAdapterCPDS.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/DriverAdapterCPDS.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/DriverAdapterCPDS.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PoolablePreparedStatementStub.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PoolablePreparedStatementStub.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PoolablePreparedStatementStub.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PoolablePreparedStatementStub.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PooledConnectionImpl.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PooledConnectionImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PooledConnectionImpl.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/PooledConnectionImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/cpdsadapter/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/CPDSConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/CPDSConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/CPDSConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/CPDSConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyObjectFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyObjectFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyObjectFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/InstanceKeyObjectFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/KeyedCPDSConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/KeyedCPDSConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/KeyedCPDSConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/KeyedCPDSConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSourceFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSourceFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSourceFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PerUserPoolDataSourceFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PoolKey.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PoolKey.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PoolKey.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PoolKey.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionAndInfo.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionAndInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionAndInfo.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionAndInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionManager.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionManager.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/PooledConnectionManager.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSourceFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSourceFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSourceFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/SharedPoolDataSourceFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/UserPassKey.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/UserPassKey.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/UserPassKey.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/UserPassKey.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/datasources/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/ConstructorUtil.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/ConstructorUtil.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/ConstructorUtil.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/ConstructorUtil.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/JOCLContentHandler.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/JOCLContentHandler.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/JOCLContentHandler.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/JOCLContentHandler.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/jocl/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/BasicManagedDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/BasicManagedDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/BasicManagedDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/BasicManagedDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/DataSourceXAConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/DataSourceXAConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/DataSourceXAConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/DataSourceXAConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/LocalXAConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/LocalXAConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/LocalXAConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/LocalXAConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedConnection.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedConnection.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedConnection.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedConnection.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedDataSource.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedDataSource.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedDataSource.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/ManagedDataSource.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnection.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnection.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnection.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnection.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/PoolableManagedConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContext.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContext.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContext.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContext.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContextListener.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContextListener.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContextListener.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionContextListener.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionRegistry.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionRegistry.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionRegistry.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/TransactionRegistry.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/XAConnectionFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/XAConnectionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/XAConnectionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/XAConnectionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/managed/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedPoolableObjectFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedPoolableObjectFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedPoolableObjectFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseKeyedPoolableObjectFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BaseObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BasePoolableObjectFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BasePoolableObjectFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BasePoolableObjectFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/BasePoolableObjectFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedObjectPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedPoolableObjectFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedPoolableObjectFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedPoolableObjectFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/KeyedPoolableObjectFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/ObjectPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolUtils.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolUtils.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolUtils.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolUtils.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolableObjectFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolableObjectFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolableObjectFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/PoolableObjectFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/CursorableLinkedList.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/CursorableLinkedList.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/CursorableLinkedList.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/CursorableLinkedList.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/EvictionTimer.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/EvictionTimer.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/EvictionTimer.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/EvictionTimer.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericKeyedObjectPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/GenericObjectPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/SoftReferenceObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/SoftReferenceObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/SoftReferenceObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/SoftReferenceObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackKeyedObjectPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPool.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPool.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPool.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPool.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPoolFactory.java b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPoolFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPoolFactory.java rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/StackObjectPoolFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/impl/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/dbcp/pool/package.html diff --git a/src/java/org/datanucleus/store/rdbms/datasource/package.html b/src/main/java/org/datanucleus/store/rdbms/datasource/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/datasource/package.html rename to src/main/java/org/datanucleus/store/rdbms/datasource/package.html diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/ClassDefinitionException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/ClassDefinitionException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/ClassDefinitionException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/ClassDefinitionException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/ColumnDefinitionException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/ColumnDefinitionException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/ColumnDefinitionException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/ColumnDefinitionException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/DuplicateColumnException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/IncompatibleDataTypeException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/IncompatibleDataTypeException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/IncompatibleDataTypeException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/IncompatibleDataTypeException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/MappedDatastoreException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/MappedDatastoreException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/MappedDatastoreException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/MappedDatastoreException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/MissingColumnException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/MissingColumnException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/MissingColumnException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/MissingColumnException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/MissingTableException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/MissingTableException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/MissingTableException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/MissingTableException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/NoDatastoreMappingException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/NoDatastoreMappingException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/NoDatastoreMappingException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/NoDatastoreMappingException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/NoSuchPersistentFieldException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/NoSuchPersistentFieldException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/NoSuchPersistentFieldException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/NoSuchPersistentFieldException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/NoTableManagedException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/NoTableManagedException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/NoTableManagedException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/NoTableManagedException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/NotATableException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/NotATableException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/NotATableException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/NotATableException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/NotAViewException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/NotAViewException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/NotAViewException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/NotAViewException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/NullValueException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/NullValueException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/NullValueException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/NullValueException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/PersistentSuperclassNotAllowedException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/PersistentSuperclassNotAllowedException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/PersistentSuperclassNotAllowedException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/PersistentSuperclassNotAllowedException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/PrimaryKeyColumnNotAllowedException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/PrimaryKeyColumnNotAllowedException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/PrimaryKeyColumnNotAllowedException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/PrimaryKeyColumnNotAllowedException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/TooManyForeignKeysException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/TooManyForeignKeysException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/TooManyForeignKeysException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/TooManyForeignKeysException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/TooManyIndicesException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/TooManyIndicesException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/TooManyIndicesException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/TooManyIndicesException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/UnexpectedColumnException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/UnexpectedColumnException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/UnexpectedColumnException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/UnexpectedColumnException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/UnsupportedDataTypeException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/UnsupportedDataTypeException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/UnsupportedDataTypeException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/UnsupportedDataTypeException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/ViewDefinitionException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/ViewDefinitionException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/ViewDefinitionException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/ViewDefinitionException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/WrongPrecisionException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/WrongPrecisionException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/WrongPrecisionException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/WrongPrecisionException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/WrongPrimaryKeyException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/WrongPrimaryKeyException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/WrongPrimaryKeyException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/WrongPrimaryKeyException.java diff --git a/src/java/org/datanucleus/store/rdbms/exceptions/WrongScaleException.java b/src/main/java/org/datanucleus/store/rdbms/exceptions/WrongScaleException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/exceptions/WrongScaleException.java rename to src/main/java/org/datanucleus/store/rdbms/exceptions/WrongScaleException.java diff --git a/src/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java b/src/main/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java rename to src/main/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java diff --git a/src/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java b/src/main/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java rename to src/main/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java diff --git a/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java b/src/main/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java rename to src/main/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java diff --git a/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java b/src/main/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java rename to src/main/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java diff --git a/src/java/org/datanucleus/store/rdbms/fieldmanager/package.html b/src/main/java/org/datanucleus/store/rdbms/fieldmanager/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/fieldmanager/package.html rename to src/main/java/org/datanucleus/store/rdbms/fieldmanager/package.html diff --git a/src/java/org/datanucleus/store/rdbms/identifier/AbstractIdentifierFactory.java b/src/main/java/org/datanucleus/store/rdbms/identifier/AbstractIdentifierFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/AbstractIdentifierFactory.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/AbstractIdentifierFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/CandidateKeyIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/CandidateKeyIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/CandidateKeyIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/CandidateKeyIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/ColumnIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/ColumnIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/ColumnIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/ColumnIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/DN2IdentifierFactory.java b/src/main/java/org/datanucleus/store/rdbms/identifier/DN2IdentifierFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/DN2IdentifierFactory.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/DN2IdentifierFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/DNIdentifierFactory.java b/src/main/java/org/datanucleus/store/rdbms/identifier/DNIdentifierFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/DNIdentifierFactory.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/DNIdentifierFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifierImpl.java b/src/main/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifierImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifierImpl.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/DatastoreIdentifierImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/ForeignKeyIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/ForeignKeyIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/ForeignKeyIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/ForeignKeyIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/IdentifierFactory.java b/src/main/java/org/datanucleus/store/rdbms/identifier/IdentifierFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/IdentifierFactory.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/IdentifierFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/IdentifierType.java b/src/main/java/org/datanucleus/store/rdbms/identifier/IdentifierType.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/IdentifierType.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/IdentifierType.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/IndexIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/IndexIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/IndexIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/IndexIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/JPAIdentifierFactory.java b/src/main/java/org/datanucleus/store/rdbms/identifier/JPAIdentifierFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/JPAIdentifierFactory.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/JPAIdentifierFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/JPOXIdentifierFactory.java b/src/main/java/org/datanucleus/store/rdbms/identifier/JPOXIdentifierFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/JPOXIdentifierFactory.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/JPOXIdentifierFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/PrimaryKeyIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/PrimaryKeyIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/PrimaryKeyIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/PrimaryKeyIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/SequenceIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/SequenceIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/SequenceIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/SequenceIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/TableIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/identifier/TableIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/TableIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/identifier/TableIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/identifier/package.html b/src/main/java/org/datanucleus/store/rdbms/identifier/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/identifier/package.html rename to src/main/java/org/datanucleus/store/rdbms/identifier/package.html diff --git a/src/java/org/datanucleus/store/rdbms/key/CandidateKey.java b/src/main/java/org/datanucleus/store/rdbms/key/CandidateKey.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/key/CandidateKey.java rename to src/main/java/org/datanucleus/store/rdbms/key/CandidateKey.java diff --git a/src/java/org/datanucleus/store/rdbms/key/ForeignKey.java b/src/main/java/org/datanucleus/store/rdbms/key/ForeignKey.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/key/ForeignKey.java rename to src/main/java/org/datanucleus/store/rdbms/key/ForeignKey.java diff --git a/src/java/org/datanucleus/store/rdbms/key/Index.java b/src/main/java/org/datanucleus/store/rdbms/key/Index.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/key/Index.java rename to src/main/java/org/datanucleus/store/rdbms/key/Index.java diff --git a/src/java/org/datanucleus/store/rdbms/key/Key.java b/src/main/java/org/datanucleus/store/rdbms/key/Key.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/key/Key.java rename to src/main/java/org/datanucleus/store/rdbms/key/Key.java diff --git a/src/java/org/datanucleus/store/rdbms/key/PrimaryKey.java b/src/main/java/org/datanucleus/store/rdbms/key/PrimaryKey.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/key/PrimaryKey.java rename to src/main/java/org/datanucleus/store/rdbms/key/PrimaryKey.java diff --git a/src/java/org/datanucleus/store/rdbms/key/package.html b/src/main/java/org/datanucleus/store/rdbms/key/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/key/package.html rename to src/main/java/org/datanucleus/store/rdbms/key/package.html diff --git a/src/java/org/datanucleus/store/rdbms/mapping/AppIDObjectIdFieldManager.java b/src/main/java/org/datanucleus/store/rdbms/mapping/AppIDObjectIdFieldManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/AppIDObjectIdFieldManager.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/AppIDObjectIdFieldManager.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/CorrespondentColumnsMapper.java b/src/main/java/org/datanucleus/store/rdbms/mapping/CorrespondentColumnsMapper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/CorrespondentColumnsMapper.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/CorrespondentColumnsMapper.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/MappedTypeManager.java b/src/main/java/org/datanucleus/store/rdbms/mapping/MappedTypeManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/MappedTypeManager.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/MappedTypeManager.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/MappingCallbacks.java b/src/main/java/org/datanucleus/store/rdbms/mapping/MappingCallbacks.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/MappingCallbacks.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/MappingCallbacks.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/MappingConsumer.java b/src/main/java/org/datanucleus/store/rdbms/mapping/MappingConsumer.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/MappingConsumer.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/MappingConsumer.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/MappingHelper.java b/src/main/java/org/datanucleus/store/rdbms/mapping/MappingHelper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/MappingHelper.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/MappingHelper.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/MappingManager.java b/src/main/java/org/datanucleus/store/rdbms/mapping/MappingManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/MappingManager.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/MappingManager.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java b/src/main/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/RDBMSMappingManager.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/StatementClassMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/StatementClassMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/StatementClassMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/StatementClassMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/StatementMappingIndex.java b/src/main/java/org/datanucleus/store/rdbms/mapping/StatementMappingIndex.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/StatementMappingIndex.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/StatementMappingIndex.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractDatastoreMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractDatastoreMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractDatastoreMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractDatastoreMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractLargeBinaryRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractLargeBinaryRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractLargeBinaryRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/AbstractLargeBinaryRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/BigIntRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BigIntRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/BigIntRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BigIntRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/BinaryStreamRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BinaryStreamRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/BinaryStreamRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BinaryStreamRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/BitRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BitRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/BitRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BitRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/BlobImpl.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BlobImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/BlobImpl.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BlobImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/BlobRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BlobRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/BlobRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BlobRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/BooleanRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BooleanRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/BooleanRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/BooleanRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/CharRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/CharRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/CharRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/CharRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/ClobImpl.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/ClobImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/ClobImpl.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/ClobImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/ClobRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/ClobRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/ClobRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/ClobRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/DatalinkRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DatalinkRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/DatalinkRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DatalinkRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMappingFactory.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMappingFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMappingFactory.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DatastoreMappingFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/DateRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DateRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/DateRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DateRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/DecimalRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DecimalRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/DecimalRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DecimalRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/DoubleRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DoubleRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/DoubleRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/DoubleRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/FloatRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/FloatRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/FloatRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/FloatRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/IntegerRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/IntegerRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/IntegerRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/IntegerRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarBinaryRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarBinaryRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarBinaryRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarBinaryRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarcharRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarcharRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarcharRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/LongVarcharRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/NCharRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/NCharRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/NCharRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/NCharRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/NVarcharRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/NVarcharRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/NVarcharRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/NVarcharRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/NumericRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/NumericRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/NumericRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/NumericRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/RealRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/RealRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/RealRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/RealRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/SmallIntRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/SmallIntRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/SmallIntRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/SmallIntRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/SqlXmlRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/SqlXmlRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/SqlXmlRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/SqlXmlRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/StreamableSpooler.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/StreamableSpooler.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/StreamableSpooler.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/StreamableSpooler.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/TimeRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TimeRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/TimeRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TimeRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/TimesTenVarBinaryRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TimesTenVarBinaryRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/TimesTenVarBinaryRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TimesTenVarBinaryRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/TimestampRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TimestampRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/TimestampRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TimestampRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/TinyIntRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TinyIntRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/TinyIntRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/TinyIntRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/VarBinaryRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/VarBinaryRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/VarBinaryRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/VarBinaryRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/VarCharRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/VarCharRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/VarCharRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/VarCharRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/datastore/package.html b/src/main/java/org/datanucleus/store/rdbms/mapping/datastore/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/datastore/package.html rename to src/main/java/org/datanucleus/store/rdbms/mapping/datastore/package.html diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/AbstractContainerMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/AbstractContainerMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/AbstractContainerMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/AbstractContainerMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ArrayMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ArrayMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ArrayMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ArrayMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/BigDecimalMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/BigDecimalMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/BigDecimalMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/BigDecimalMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/BigIntegerMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/BigIntegerMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/BigIntegerMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/BigIntegerMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/BitSetMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/BitSetMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/BitSetMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/BitSetMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/BooleanMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/BooleanMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/BooleanMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/BooleanMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/BufferedImageMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/BufferedImageMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/BufferedImageMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/BufferedImageMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ByteMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ByteMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ByteMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ByteMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/CharacterMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/CharacterMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/CharacterMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/CharacterMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ClassMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ClassMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ClassMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ClassMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/CollectionMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/CollectionMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/CollectionMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/CollectionMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/DatastoreIdMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/DatastoreIdMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/DatastoreIdMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/DatastoreIdMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/DateMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/DateMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/DateMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/DateMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorLongMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorLongMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorLongMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorLongMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorStringMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorStringMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorStringMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/DiscriminatorStringMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/DoubleMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/DoubleMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/DoubleMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/DoubleMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedElementPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedElementPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedElementPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedElementPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedKeyPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedKeyPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedKeyPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedKeyPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedValuePCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedValuePCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedValuePCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/EmbeddedValuePCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/EnumMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/EnumMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/EnumMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/EnumMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/FileMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/FileMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/FileMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/FileMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/FloatMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/FloatMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/FloatMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/FloatMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/GregorianCalendarMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/GregorianCalendarMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/GregorianCalendarMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/GregorianCalendarMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/IndexMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/IndexMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/IndexMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/IndexMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/IntegerMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/IntegerMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/IntegerMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/IntegerMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/InterfaceMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/InterfaceMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/InterfaceMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/InterfaceMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/JavaTypeMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/LongMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/LongMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/LongMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/LongMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/MapMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/MapMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/MapMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/MapMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/MultiMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/MultiMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/MultiMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/MultiMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/MultiPersistableMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/MultiPersistableMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/MultiPersistableMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/MultiPersistableMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/NullMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/NullMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/NullMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/NullMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/NumberMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/NumberMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/NumberMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/NumberMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ObjectMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ObjectMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ObjectMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ObjectMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/PersistableIdMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/PersistableIdMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/PersistableIdMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/PersistableIdMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/PersistableMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/PersistableMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/PersistableMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/PersistableMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ReferenceIdMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ReferenceIdMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ReferenceIdMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ReferenceIdMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ReferenceMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ReferenceMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ReferenceMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ReferenceMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedElementPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedElementPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedElementPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedElementPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedKeyPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedKeyPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedKeyPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedKeyPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedLocalFileMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedLocalFileMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedLocalFileMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedLocalFileMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedReferenceMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedReferenceMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedReferenceMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedReferenceMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedValuePCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedValuePCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SerialisedValuePCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SerialisedValuePCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/ShortMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/ShortMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/ShortMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/ShortMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMultiMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMultiMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMultiMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SingleFieldMultiMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SqlDateMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SqlDateMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SqlDateMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SqlDateMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SqlTimeMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SqlTimeMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SqlTimeMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SqlTimeMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SqlTimestampMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SqlTimestampMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SqlTimestampMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SqlTimestampMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/StringBufferMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/StringBufferMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/StringBufferMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/StringBufferMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/StringBuilderMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/StringBuilderMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/StringBuilderMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/StringBuilderMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/StringMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/StringMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/StringMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/StringMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/SubclassPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/SubclassPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/SubclassPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/SubclassPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/TemporalMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/TemporalMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/TemporalMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/TemporalMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMultiMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMultiMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMultiMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/TypeConverterMultiMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/VersionLongMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/VersionLongMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/VersionLongMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/VersionLongMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/VersionMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/VersionMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/VersionMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/VersionMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/VersionTimestampMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/java/VersionTimestampMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/VersionTimestampMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/VersionTimestampMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/java/package.html b/src/main/java/org/datanucleus/store/rdbms/mapping/java/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/java/package.html rename to src/main/java/org/datanucleus/store/rdbms/mapping/java/package.html diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleCollectionMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleCollectionMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleCollectionMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleCollectionMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleMapMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleMapMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleMapMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleMapMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleRDBMSMappingManager.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/XMLTypeRDBMSMapping.java b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/XMLTypeRDBMSMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/XMLTypeRDBMSMapping.java rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/XMLTypeRDBMSMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/mapping/oracle/package.html b/src/main/java/org/datanucleus/store/rdbms/mapping/oracle/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/oracle/package.html rename to src/main/java/org/datanucleus/store/rdbms/mapping/oracle/package.html diff --git a/src/java/org/datanucleus/store/rdbms/mapping/package.html b/src/main/java/org/datanucleus/store/rdbms/mapping/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/mapping/package.html rename to src/main/java/org/datanucleus/store/rdbms/mapping/package.html diff --git a/src/java/org/datanucleus/store/rdbms/overview.html b/src/main/java/org/datanucleus/store/rdbms/overview.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/overview.html rename to src/main/java/org/datanucleus/store/rdbms/overview.html diff --git a/src/java/org/datanucleus/store/rdbms/package.html b/src/main/java/org/datanucleus/store/rdbms/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/package.html rename to src/main/java/org/datanucleus/store/rdbms/package.html diff --git a/src/java/org/datanucleus/store/rdbms/query/AbstractRDBMSQueryResult.java b/src/main/java/org/datanucleus/store/rdbms/query/AbstractRDBMSQueryResult.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/AbstractRDBMSQueryResult.java rename to src/main/java/org/datanucleus/store/rdbms/query/AbstractRDBMSQueryResult.java diff --git a/src/java/org/datanucleus/store/rdbms/query/BulkFetchHelper.java b/src/main/java/org/datanucleus/store/rdbms/query/BulkFetchHelper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/BulkFetchHelper.java rename to src/main/java/org/datanucleus/store/rdbms/query/BulkFetchHelper.java diff --git a/src/java/org/datanucleus/store/rdbms/query/ForwardQueryResult.java b/src/main/java/org/datanucleus/store/rdbms/query/ForwardQueryResult.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/ForwardQueryResult.java rename to src/main/java/org/datanucleus/store/rdbms/query/ForwardQueryResult.java diff --git a/src/java/org/datanucleus/store/rdbms/query/JDOQLQuery.java b/src/main/java/org/datanucleus/store/rdbms/query/JDOQLQuery.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/JDOQLQuery.java rename to src/main/java/org/datanucleus/store/rdbms/query/JDOQLQuery.java diff --git a/src/java/org/datanucleus/store/rdbms/query/JPQLQuery.java b/src/main/java/org/datanucleus/store/rdbms/query/JPQLQuery.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/JPQLQuery.java rename to src/main/java/org/datanucleus/store/rdbms/query/JPQLQuery.java diff --git a/src/java/org/datanucleus/store/rdbms/query/PersistentClassROF.java b/src/main/java/org/datanucleus/store/rdbms/query/PersistentClassROF.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/PersistentClassROF.java rename to src/main/java/org/datanucleus/store/rdbms/query/PersistentClassROF.java diff --git a/src/java/org/datanucleus/store/rdbms/query/QueryGenerator.java b/src/main/java/org/datanucleus/store/rdbms/query/QueryGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/QueryGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/query/QueryGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java b/src/main/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java rename to src/main/java/org/datanucleus/store/rdbms/query/QueryToSQLMapper.java diff --git a/src/java/org/datanucleus/store/rdbms/query/RDBMSQueryCompilation.java b/src/main/java/org/datanucleus/store/rdbms/query/RDBMSQueryCompilation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/RDBMSQueryCompilation.java rename to src/main/java/org/datanucleus/store/rdbms/query/RDBMSQueryCompilation.java diff --git a/src/java/org/datanucleus/store/rdbms/query/RDBMSQueryUtils.java b/src/main/java/org/datanucleus/store/rdbms/query/RDBMSQueryUtils.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/RDBMSQueryUtils.java rename to src/main/java/org/datanucleus/store/rdbms/query/RDBMSQueryUtils.java diff --git a/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java b/src/main/java/org/datanucleus/store/rdbms/query/ResultClassROF.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java rename to src/main/java/org/datanucleus/store/rdbms/query/ResultClassROF.java diff --git a/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java b/src/main/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java rename to src/main/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java diff --git a/src/java/org/datanucleus/store/rdbms/query/ResultObjectFactory.java b/src/main/java/org/datanucleus/store/rdbms/query/ResultObjectFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/ResultObjectFactory.java rename to src/main/java/org/datanucleus/store/rdbms/query/ResultObjectFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java b/src/main/java/org/datanucleus/store/rdbms/query/SQLQuery.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/SQLQuery.java rename to src/main/java/org/datanucleus/store/rdbms/query/SQLQuery.java diff --git a/src/java/org/datanucleus/store/rdbms/query/ScrollableQueryResult.java b/src/main/java/org/datanucleus/store/rdbms/query/ScrollableQueryResult.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/ScrollableQueryResult.java rename to src/main/java/org/datanucleus/store/rdbms/query/ScrollableQueryResult.java diff --git a/src/java/org/datanucleus/store/rdbms/query/StatementNewObjectMapping.java b/src/main/java/org/datanucleus/store/rdbms/query/StatementNewObjectMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/StatementNewObjectMapping.java rename to src/main/java/org/datanucleus/store/rdbms/query/StatementNewObjectMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/query/StatementParameterMapping.java b/src/main/java/org/datanucleus/store/rdbms/query/StatementParameterMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/StatementParameterMapping.java rename to src/main/java/org/datanucleus/store/rdbms/query/StatementParameterMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/query/StatementResultMapping.java b/src/main/java/org/datanucleus/store/rdbms/query/StatementResultMapping.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/StatementResultMapping.java rename to src/main/java/org/datanucleus/store/rdbms/query/StatementResultMapping.java diff --git a/src/java/org/datanucleus/store/rdbms/query/StoredProcedureQuery.java b/src/main/java/org/datanucleus/store/rdbms/query/StoredProcedureQuery.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/StoredProcedureQuery.java rename to src/main/java/org/datanucleus/store/rdbms/query/StoredProcedureQuery.java diff --git a/src/java/org/datanucleus/store/rdbms/query/package.html b/src/main/java/org/datanucleus/store/rdbms/query/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/query/package.html rename to src/main/java/org/datanucleus/store/rdbms/query/package.html diff --git a/src/java/org/datanucleus/store/rdbms/request/BulkRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/BulkRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/BulkRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/BulkRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/DeleteRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/DeleteRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/FetchRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/FetchRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/FetchRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/InsertRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/InsertRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/InsertRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/LocateBulkRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/LocateBulkRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/LocateBulkRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/LocateBulkRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/LocateRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/LocateRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/LocateRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/LocateRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/Request.java b/src/main/java/org/datanucleus/store/rdbms/request/Request.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/Request.java rename to src/main/java/org/datanucleus/store/rdbms/request/Request.java diff --git a/src/java/org/datanucleus/store/rdbms/request/RequestIdentifier.java b/src/main/java/org/datanucleus/store/rdbms/request/RequestIdentifier.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/RequestIdentifier.java rename to src/main/java/org/datanucleus/store/rdbms/request/RequestIdentifier.java diff --git a/src/java/org/datanucleus/store/rdbms/request/RequestType.java b/src/main/java/org/datanucleus/store/rdbms/request/RequestType.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/RequestType.java rename to src/main/java/org/datanucleus/store/rdbms/request/RequestType.java diff --git a/src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java b/src/main/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java rename to src/main/java/org/datanucleus/store/rdbms/request/StatementMappingDefinition.java diff --git a/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java b/src/main/java/org/datanucleus/store/rdbms/request/UpdateRequest.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java rename to src/main/java/org/datanucleus/store/rdbms/request/UpdateRequest.java diff --git a/src/java/org/datanucleus/store/rdbms/request/package.html b/src/main/java/org/datanucleus/store/rdbms/request/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/request/package.html rename to src/main/java/org/datanucleus/store/rdbms/request/package.html diff --git a/src/java/org/datanucleus/store/rdbms/schema/DB2TypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/DB2TypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/DB2TypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/DB2TypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/DerbyTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/DerbyTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/DerbyTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/DerbyTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/FirebirdTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/FirebirdTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/FirebirdTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/FirebirdTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/ForeignKeyInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/ForeignKeyInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/ForeignKeyInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/ForeignKeyInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/H2TypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/H2TypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/H2TypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/H2TypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/HSQLTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/HSQLTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/HSQLTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/HSQLTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/IndexInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/IndexInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/IndexInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/IndexInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/InformixTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/InformixTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/InformixTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/InformixTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/JDBCTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/JDBCTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/JDBCTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/JDBCTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/MSSQLTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/MSSQLTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/MSSQLTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/MSSQLTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/McKoiTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/McKoiTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/McKoiTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/McKoiTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/MySQLTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/MySQLTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/MySQLTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/MySQLTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/NuoDBTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/NuoDBTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/NuoDBTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/NuoDBTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/OracleTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/OracleTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/OracleTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/OracleTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/PostgresqlTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/PostgresqlTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/PostgresqlTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/PostgresqlTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/PrimaryKeyInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/PrimaryKeyInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/PrimaryKeyInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/PrimaryKeyInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSColumnInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSColumnInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSColumnInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSColumnInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaHandler.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaHandler.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaHandler.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaHandler.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSSchemaInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSTableFKInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTableFKInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSTableFKInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTableFKInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSTableIndexInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTableIndexInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSTableIndexInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTableIndexInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSTableInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTableInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSTableInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTableInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSTablePKInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTablePKInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSTablePKInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTablePKInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/RDBMSTypesInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTypesInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/RDBMSTypesInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/RDBMSTypesInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/SQLTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/SQLTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/SQLTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/SQLTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/SQLiteTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/SQLiteTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/SQLiteTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/SQLiteTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/VirtuosoTypeInfo.java b/src/main/java/org/datanucleus/store/rdbms/schema/VirtuosoTypeInfo.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/VirtuosoTypeInfo.java rename to src/main/java/org/datanucleus/store/rdbms/schema/VirtuosoTypeInfo.java diff --git a/src/java/org/datanucleus/store/rdbms/schema/package.html b/src/main/java/org/datanucleus/store/rdbms/schema/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/schema/package.html rename to src/main/java/org/datanucleus/store/rdbms/schema/package.html diff --git a/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java b/src/main/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java b/src/main/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/CollectionStoreIterator.java b/src/main/java/org/datanucleus/store/rdbms/scostore/CollectionStoreIterator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/CollectionStoreIterator.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/CollectionStoreIterator.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/FKArrayStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/FKArrayStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/FKArrayStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/FKArrayStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/FKListStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/FKListStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/FKListStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/FKListStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/FKMapStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/FKSetStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/IteratorStatement.java b/src/main/java/org/datanucleus/store/rdbms/scostore/IteratorStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/IteratorStatement.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/IteratorStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/JoinArrayStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/JoinArrayStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/JoinArrayStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/JoinArrayStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/JoinListStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/JoinListStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/JoinListStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/JoinListStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/JoinMapStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/JoinPersistableRelationStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/JoinPersistableRelationStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/JoinPersistableRelationStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/JoinPersistableRelationStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/JoinSetStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/JoinSetStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/JoinSetStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/JoinSetStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java b/src/main/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/MapEntrySetStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/MapKeySetStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/MapKeySetStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/MapKeySetStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/MapKeySetStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/MapValueCollectionStore.java b/src/main/java/org/datanucleus/store/rdbms/scostore/MapValueCollectionStore.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/MapValueCollectionStore.java rename to src/main/java/org/datanucleus/store/rdbms/scostore/MapValueCollectionStore.java diff --git a/src/java/org/datanucleus/store/rdbms/scostore/package.html b/src/main/java/org/datanucleus/store/rdbms/scostore/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/scostore/package.html rename to src/main/java/org/datanucleus/store/rdbms/scostore/package.html diff --git a/src/java/org/datanucleus/store/rdbms/sql/AbstractStatementGenerator.java b/src/main/java/org/datanucleus/store/rdbms/sql/AbstractStatementGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/AbstractStatementGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/sql/AbstractStatementGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/DiscriminatorStatementGenerator.java b/src/main/java/org/datanucleus/store/rdbms/sql/DiscriminatorStatementGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/DiscriminatorStatementGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/sql/DiscriminatorStatementGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLColumn.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLColumn.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLColumn.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLColumn.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLJoin.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLJoin.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLJoin.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLJoin.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLStatement.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLStatement.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLStatement.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLStatement.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLStatementParameter.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLStatementParameter.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLStatementParameter.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLStatementParameter.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLTable.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLTable.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLTable.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLTableAlphaNamer.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLTableAlphaNamer.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLTableAlphaNamer.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLTableAlphaNamer.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLTableGroup.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLTableGroup.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLTableGroup.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLTableGroup.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLTableNamer.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLTableNamer.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLTableNamer.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLTableNamer.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLTableTNamer.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLTableTNamer.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLTableTNamer.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLTableTNamer.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/SQLText.java b/src/main/java/org/datanucleus/store/rdbms/sql/SQLText.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/SQLText.java rename to src/main/java/org/datanucleus/store/rdbms/sql/SQLText.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/StatementGenerator.java b/src/main/java/org/datanucleus/store/rdbms/sql/StatementGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/StatementGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/sql/StatementGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/UnionStatementGenerator.java b/src/main/java/org/datanucleus/store/rdbms/sql/UnionStatementGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/UnionStatementGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/sql/UnionStatementGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/AggregateNumericExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/AggregateNumericExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/AggregateNumericExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/AggregateNumericExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/AggregateTemporalExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/AggregateTemporalExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/AggregateTemporalExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/AggregateTemporalExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ArrayExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ArrayExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ArrayExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ArrayExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ArrayLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ArrayLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ArrayLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ArrayLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/BinaryExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/BinaryExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/BinaryExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/BinaryExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/BooleanExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/BooleanExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/BooleanExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/BooleanExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/BooleanLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/BooleanLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/BooleanLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/BooleanLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/BooleanSubqueryExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/BooleanSubqueryExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/BooleanSubqueryExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/BooleanSubqueryExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ByteExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ByteExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ByteExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ByteExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ByteLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ByteLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ByteLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ByteLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/CaseExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/CaseExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/CaseExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/CaseExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/CharacterExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/CharacterExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/CharacterExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/CharacterExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/CharacterLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/CharacterLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/CharacterLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/CharacterLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/CollectionExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/CollectionExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/CollectionExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/CollectionExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/CollectionLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/CollectionLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/CollectionLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/CollectionLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ColumnExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ColumnExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ColumnExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ColumnExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/DelegatedExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/DelegatedExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/DelegatedExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/DelegatedExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/EnumExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/EnumExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/EnumExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/EnumExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/EnumLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/EnumLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/EnumLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/EnumLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ExpressionUtils.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ExpressionUtils.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ExpressionUtils.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ExpressionUtils.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/FloatingPointLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/FloatingPointLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/FloatingPointLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/FloatingPointLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/IllegalExpressionOperationException.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/IllegalExpressionOperationException.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/IllegalExpressionOperationException.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/IllegalExpressionOperationException.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/InExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/InExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/InExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/InExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/IntegerLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/IntegerLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/IntegerLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/IntegerLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/MapExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/MapExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/MapExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/MapExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/MapLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/MapLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/MapLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/MapLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/NewObjectExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/NewObjectExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/NewObjectExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/NewObjectExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/NullLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/NullLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/NullLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/NullLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/NumericExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/NumericExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/NumericExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/NumericExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/NumericSubqueryExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/NumericSubqueryExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/NumericSubqueryExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/NumericSubqueryExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ObjectExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ObjectExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ObjectExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ObjectExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ObjectLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ObjectLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ObjectLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ObjectLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/ParameterLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/ParameterLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/ParameterLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/ParameterLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/SQLExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/SQLExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/SQLExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/SQLExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/SQLExpressionFactory.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/SQLExpressionFactory.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/SQLExpressionFactory.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/SQLExpressionFactory.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/SQLLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/SQLLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/SQLLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/SQLLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/StringExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/StringExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/StringExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/StringExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/StringLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/StringLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/StringLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/StringLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/StringNumericExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/StringNumericExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/StringNumericExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/StringNumericExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/StringSubqueryExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/StringSubqueryExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/StringSubqueryExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/StringSubqueryExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/StringTemporalExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/StringTemporalExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/StringTemporalExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/StringTemporalExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpressionComponent.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpressionComponent.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpressionComponent.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/SubqueryExpressionComponent.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TemporalExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TemporalExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TemporalExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TemporalExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TemporalLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TemporalLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TemporalLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TemporalLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TemporalSubqueryExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TemporalSubqueryExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TemporalSubqueryExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TemporalSubqueryExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiLiteral.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiLiteral.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiLiteral.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/TypeConverterMultiLiteral.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/UnboundExpression.java b/src/main/java/org/datanucleus/store/rdbms/sql/expression/UnboundExpression.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/UnboundExpression.java rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/UnboundExpression.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/expression/package.html b/src/main/java/org/datanucleus/store/rdbms/sql/expression/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/expression/package.html rename to src/main/java/org/datanucleus/store/rdbms/sql/expression/package.html diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AbsFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AbsFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AbsFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AbsFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AbstractSQLMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AbstractSQLMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AbstractSQLMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AbstractSQLMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AcosFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AcosFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AcosFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AcosFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/ArrayContainsMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/ArrayContainsMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/ArrayContainsMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/ArrayContainsMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/ArrayIsEmptyMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/ArrayIsEmptyMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/ArrayIsEmptyMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/ArrayIsEmptyMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/ArraySizeMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/ArraySizeMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/ArraySizeMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/ArraySizeMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AsinFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AsinFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AsinFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AsinFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AtanFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AtanFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AtanFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AtanFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AvgFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AvgFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AvgFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AvgFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/AvgWithCastFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/AvgWithCastFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/AvgWithCastFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/AvgWithCastFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CeilFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CeilFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CeilFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CeilFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CoalesceFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CoalesceFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CoalesceFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CoalesceFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CollectionContainsMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CollectionIsEmptyMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CollectionIsEmptyMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CollectionIsEmptyMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CollectionIsEmptyMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CollectionSizeMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CollectionSizeMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CollectionSizeMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CollectionSizeMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CosFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CosFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CosFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CosFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CountFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CountFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CountFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CountFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CurrentDateFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CurrentDateFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CurrentDateFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CurrentDateFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CurrentTimeFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CurrentTimeFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CurrentTimeFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CurrentTimeFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/CurrentTimestampFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/CurrentTimestampFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/CurrentTimestampFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/CurrentTimestampFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetDay2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetDay2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetDay2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetDay2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetDay3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetDay3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetDay3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetDay3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetDayMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetDayMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetDayMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetDayMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetHour2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHour2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetHour2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHour2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetHour3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHour3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetHour3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHour3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetHour4Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHour4Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetHour4Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHour4Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetHourMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHourMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetHourMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetHourMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute4Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute4Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute4Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinute4Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinuteMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinuteMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMinuteMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMinuteMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMonth3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetMonthMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMonthMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetMonthMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetMonthMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond4Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond4Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond4Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecond4Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecondMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecondMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetSecondMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetSecondMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetYear2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetYear2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetYear2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetYear2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetYear3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetYear3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetYear3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetYear3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/DateGetYearMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetYearMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/DateGetYearMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/DateGetYearMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/EnumOrdinalMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/EnumOrdinalMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/EnumOrdinalMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/EnumOrdinalMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/EnumToStringMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/EnumToStringMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/EnumToStringMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/EnumToStringMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/ExpFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/ExpFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/ExpFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/ExpFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/FloorFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/FloorFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/FloorFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/FloorFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/IndexFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/IndexFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/IndexFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/IndexFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetObjectIdMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetObjectIdMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetObjectIdMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetObjectIdMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetVersionMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetVersionMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetVersionMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/JDOHelperGetVersionMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/ListGetMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/ListGetMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/ListGetMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/ListGetMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/LogFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/LogFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/LogFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/LogFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsEntryMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MapContainsEntryMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MapContainsEntryMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MapContainsEntryMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MapContainsKeyMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MapContainsValueMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MapGetMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MapGetMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MapGetMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MapGetMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MapIsEmptyMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MapIsEmptyMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MapIsEmptyMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MapIsEmptyMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MapSizeMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MapSizeMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MapSizeMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MapSizeMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathAbsMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathAbsMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathAbsMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathAbsMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathAcosMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathAcosMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathAcosMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathAcosMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathAsinMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathAsinMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathAsinMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathAsinMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathAtanMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathAtanMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathAtanMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathAtanMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathCeilMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathCeilMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathCeilMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathCeilMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathCosMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathCosMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathCosMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathCosMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathExpMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathExpMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathExpMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathExpMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathFloorMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathFloorMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathFloorMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathFloorMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathLogMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathLogMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathLogMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathLogMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathSinMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathSinMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathSinMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathSinMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathSqrtMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathSqrtMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathSqrtMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathSqrtMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MathTanMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MathTanMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MathTanMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MathTanMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MaxFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MaxFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MaxFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MaxFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/MinFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/MinFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/MinFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/MinFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/NullIfFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/NullIfFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/NullIfFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/NullIfFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/ObjectGetClassMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/ObjectGetClassMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/ObjectGetClassMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/ObjectGetClassMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SQLBooleanMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SQLBooleanMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SQLBooleanMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SQLBooleanMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SQLCubeFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SQLCubeFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SQLCubeFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SQLCubeFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SQLFunctionMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SQLFunctionMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SQLFunctionMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SQLFunctionMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SQLMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SQLMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SQLMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SQLMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SQLNumericMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SQLNumericMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SQLNumericMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SQLNumericMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SQLRollupFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SQLRollupFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SQLRollupFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SQLRollupFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericAggregateMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericAggregateMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericAggregateMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericAggregateMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleNumericMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SimpleOrderableAggregateMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleOrderableAggregateMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SimpleOrderableAggregateMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleOrderableAggregateMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SimpleStringMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleStringMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SimpleStringMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SimpleStringMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SinFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SinFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SinFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SinFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SqrtFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SqrtFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SqrtFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SqrtFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringCharAtMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringCharAtMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringCharAtMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringCharAtMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringConcat1Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringConcat1Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringConcat1Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringConcat1Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringConcat2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringConcat2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringConcat2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringConcat2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringEndsWithMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringEndsWithMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringEndsWithMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringEndsWithMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringEqualsIgnoreCaseMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringEqualsIgnoreCaseMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringEqualsIgnoreCaseMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringEqualsIgnoreCaseMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringEqualsMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringEqualsMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringEqualsMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringEqualsMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf4Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf4Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf4Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf4Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf5Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf5Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf5Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOf5Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOfMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOfMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringIndexOfMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringIndexOfMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringLength2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringLength2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringLength2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringLength2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringLength3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringLength3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringLength3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringLength3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringLengthMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringLengthMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringLengthMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringLengthMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringMatchesDerbyMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringMatchesDerbyMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringMatchesDerbyMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringMatchesDerbyMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringMatchesMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringMatchesMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringMatchesMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringMatchesMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringReplaceAllMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringReplaceAllMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringReplaceAllMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringReplaceAllMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringSimilarPostgresqlMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringSimilarPostgresqlMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringSimilarPostgresqlMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringSimilarPostgresqlMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringStartsWith3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringStartsWithMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringStartsWithMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringStartsWithMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringStartsWithMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringSubstring2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstring2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringSubstring2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstring2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringSubstring3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstring3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringSubstring3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstring3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringSubstring4Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstring4Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringSubstring4Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstring4Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringSubstringMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstringMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringSubstringMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringSubstringMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringToLowerMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringToLowerMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringToLowerMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringToLowerMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringToUpperMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringToUpperMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringToUpperMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringToUpperMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTranslateMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTranslateMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTranslateMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTranslateMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrim2Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrim2Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrim2Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrim2Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrim3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrim3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrim3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrim3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeft3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeft3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeft3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeft3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeftMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeftMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeftMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimLeftMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrimMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrimMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrimRight3Method.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimRight3Method.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrimRight3Method.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimRight3Method.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/StringTrimRightMethod.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimRightMethod.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/StringTrimRightMethod.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/StringTrimRightMethod.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/SumFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/SumFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/SumFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/SumFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/TanFunction.java b/src/main/java/org/datanucleus/store/rdbms/sql/method/TanFunction.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/TanFunction.java rename to src/main/java/org/datanucleus/store/rdbms/sql/method/TanFunction.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/method/package.html b/src/main/java/org/datanucleus/store/rdbms/sql/method/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/method/package.html rename to src/main/java/org/datanucleus/store/rdbms/sql/method/package.html diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/AbstractSQLOperation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/AbstractSQLOperation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/AbstractSQLOperation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/AbstractSQLOperation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/Concat2Operation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/Concat2Operation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/Concat2Operation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/Concat2Operation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/Concat3Operation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/Concat3Operation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/Concat3Operation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/Concat3Operation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/Mod2Operation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/Mod2Operation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/Mod2Operation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/Mod2Operation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/Mod3Operation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/Mod3Operation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/Mod3Operation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/Mod3Operation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/NumericToString2Operation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/NumericToString2Operation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/NumericToString2Operation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/NumericToString2Operation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/NumericToString3Operation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/NumericToString3Operation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/NumericToString3Operation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/NumericToString3Operation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/NumericToStringOperation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/NumericToStringOperation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/NumericToStringOperation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/NumericToStringOperation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/SQLOperation.java b/src/main/java/org/datanucleus/store/rdbms/sql/operation/SQLOperation.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/SQLOperation.java rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/SQLOperation.java diff --git a/src/java/org/datanucleus/store/rdbms/sql/operation/package.html b/src/main/java/org/datanucleus/store/rdbms/sql/operation/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/operation/package.html rename to src/main/java/org/datanucleus/store/rdbms/sql/operation/package.html diff --git a/src/java/org/datanucleus/store/rdbms/sql/package.html b/src/main/java/org/datanucleus/store/rdbms/sql/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/sql/package.html rename to src/main/java/org/datanucleus/store/rdbms/sql/package.html diff --git a/src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java b/src/main/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/AbstractClassTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/AbstractTable.java b/src/main/java/org/datanucleus/store/rdbms/table/AbstractTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/AbstractTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/AbstractTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ArrayTable.java b/src/main/java/org/datanucleus/store/rdbms/table/ArrayTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ArrayTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/ArrayTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ClassTable.java b/src/main/java/org/datanucleus/store/rdbms/table/ClassTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ClassTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/ClassTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ClassView.java b/src/main/java/org/datanucleus/store/rdbms/table/ClassView.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ClassView.java rename to src/main/java/org/datanucleus/store/rdbms/table/ClassView.java diff --git a/src/java/org/datanucleus/store/rdbms/table/CollectionTable.java b/src/main/java/org/datanucleus/store/rdbms/table/CollectionTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/CollectionTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/CollectionTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/Column.java b/src/main/java/org/datanucleus/store/rdbms/table/Column.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/Column.java rename to src/main/java/org/datanucleus/store/rdbms/table/Column.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java b/src/main/java/org/datanucleus/store/rdbms/table/ColumnCreator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ColumnCreator.java rename to src/main/java/org/datanucleus/store/rdbms/table/ColumnCreator.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java b/src/main/java/org/datanucleus/store/rdbms/table/ColumnImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ColumnImpl.java rename to src/main/java/org/datanucleus/store/rdbms/table/ColumnImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/table/DatastoreClass.java b/src/main/java/org/datanucleus/store/rdbms/table/DatastoreClass.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/DatastoreClass.java rename to src/main/java/org/datanucleus/store/rdbms/table/DatastoreClass.java diff --git a/src/java/org/datanucleus/store/rdbms/table/DatastoreElementContainer.java b/src/main/java/org/datanucleus/store/rdbms/table/DatastoreElementContainer.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/DatastoreElementContainer.java rename to src/main/java/org/datanucleus/store/rdbms/table/DatastoreElementContainer.java diff --git a/src/java/org/datanucleus/store/rdbms/table/DatastoreMap.java b/src/main/java/org/datanucleus/store/rdbms/table/DatastoreMap.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/DatastoreMap.java rename to src/main/java/org/datanucleus/store/rdbms/table/DatastoreMap.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ElementContainerTable.java b/src/main/java/org/datanucleus/store/rdbms/table/ElementContainerTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ElementContainerTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/ElementContainerTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/JoinTable.java b/src/main/java/org/datanucleus/store/rdbms/table/JoinTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/JoinTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/JoinTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/MapTable.java b/src/main/java/org/datanucleus/store/rdbms/table/MapTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/MapTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/MapTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/PersistableJoinTable.java b/src/main/java/org/datanucleus/store/rdbms/table/PersistableJoinTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/PersistableJoinTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/PersistableJoinTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ProbeTable.java b/src/main/java/org/datanucleus/store/rdbms/table/ProbeTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ProbeTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/ProbeTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/SecondaryDatastoreClass.java b/src/main/java/org/datanucleus/store/rdbms/table/SecondaryDatastoreClass.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/SecondaryDatastoreClass.java rename to src/main/java/org/datanucleus/store/rdbms/table/SecondaryDatastoreClass.java diff --git a/src/java/org/datanucleus/store/rdbms/table/SecondaryTable.java b/src/main/java/org/datanucleus/store/rdbms/table/SecondaryTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/SecondaryTable.java rename to src/main/java/org/datanucleus/store/rdbms/table/SecondaryTable.java diff --git a/src/java/org/datanucleus/store/rdbms/table/Table.java b/src/main/java/org/datanucleus/store/rdbms/table/Table.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/Table.java rename to src/main/java/org/datanucleus/store/rdbms/table/Table.java diff --git a/src/java/org/datanucleus/store/rdbms/table/TableImpl.java b/src/main/java/org/datanucleus/store/rdbms/table/TableImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/TableImpl.java rename to src/main/java/org/datanucleus/store/rdbms/table/TableImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/table/TableUtils.java b/src/main/java/org/datanucleus/store/rdbms/table/TableUtils.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/TableUtils.java rename to src/main/java/org/datanucleus/store/rdbms/table/TableUtils.java diff --git a/src/java/org/datanucleus/store/rdbms/table/ViewImpl.java b/src/main/java/org/datanucleus/store/rdbms/table/ViewImpl.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/ViewImpl.java rename to src/main/java/org/datanucleus/store/rdbms/table/ViewImpl.java diff --git a/src/java/org/datanucleus/store/rdbms/table/package.html b/src/main/java/org/datanucleus/store/rdbms/table/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/table/package.html rename to src/main/java/org/datanucleus/store/rdbms/table/package.html diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/AbstractRDBMSGenerator.java b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/AbstractRDBMSGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/AbstractRDBMSGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/AbstractRDBMSGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/DatastoreUUIDHexGenerator.java b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/DatastoreUUIDHexGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/DatastoreUUIDHexGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/DatastoreUUIDHexGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/MaxGenerator.java b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/MaxGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/MaxGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/MaxGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceTable.java b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/SequenceTable.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceTable.java rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/SequenceTable.java diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java diff --git a/src/java/org/datanucleus/store/rdbms/valuegenerator/package.html b/src/main/java/org/datanucleus/store/rdbms/valuegenerator/package.html similarity index 100% rename from src/java/org/datanucleus/store/rdbms/valuegenerator/package.html rename to src/main/java/org/datanucleus/store/rdbms/valuegenerator/package.html diff --git a/META-INF/LICENSE.txt b/src/main/resources/META-INF/LICENSE.txt similarity index 100% rename from META-INF/LICENSE.txt rename to src/main/resources/META-INF/LICENSE.txt diff --git a/META-INF/NOTICE.txt b/src/main/resources/META-INF/NOTICE.txt similarity index 100% rename from META-INF/NOTICE.txt rename to src/main/resources/META-INF/NOTICE.txt diff --git a/META-INF/README.txt b/src/main/resources/META-INF/README.txt similarity index 100% rename from META-INF/README.txt rename to src/main/resources/META-INF/README.txt diff --git a/src/java/org/datanucleus/store/rdbms/Localisation.properties b/src/main/resources/org/datanucleus/store/rdbms/Localisation.properties similarity index 100% rename from src/java/org/datanucleus/store/rdbms/Localisation.properties rename to src/main/resources/org/datanucleus/store/rdbms/Localisation.properties diff --git a/src/java/org/datanucleus/store/rdbms/Localisation_es.properties b/src/main/resources/org/datanucleus/store/rdbms/Localisation_es.properties similarity index 100% rename from src/java/org/datanucleus/store/rdbms/Localisation_es.properties rename to src/main/resources/org/datanucleus/store/rdbms/Localisation_es.properties diff --git a/plugin.xml b/src/main/resources/plugin.xml similarity index 100% rename from plugin.xml rename to src/main/resources/plugin.xml diff --git a/schema/connectionpool.exsd b/src/main/resources/schema/connectionpool.exsd similarity index 100% rename from schema/connectionpool.exsd rename to src/main/resources/schema/connectionpool.exsd diff --git a/schema/connectionprovider.exsd b/src/main/resources/schema/connectionprovider.exsd similarity index 100% rename from schema/connectionprovider.exsd rename to src/main/resources/schema/connectionprovider.exsd diff --git a/schema/datastore_mapping.exsd b/src/main/resources/schema/datastore_mapping.exsd similarity index 100% rename from schema/datastore_mapping.exsd rename to src/main/resources/schema/datastore_mapping.exsd diff --git a/schema/datastoreadapter.exsd b/src/main/resources/schema/datastoreadapter.exsd similarity index 100% rename from schema/datastoreadapter.exsd rename to src/main/resources/schema/datastoreadapter.exsd diff --git a/schema/identifierfactory.exsd b/src/main/resources/schema/identifierfactory.exsd similarity index 100% rename from schema/identifierfactory.exsd rename to src/main/resources/schema/identifierfactory.exsd diff --git a/schema/java_mapping.exsd b/src/main/resources/schema/java_mapping.exsd similarity index 100% rename from schema/java_mapping.exsd rename to src/main/resources/schema/java_mapping.exsd diff --git a/schema/sql_expression.exsd b/src/main/resources/schema/sql_expression.exsd similarity index 100% rename from schema/sql_expression.exsd rename to src/main/resources/schema/sql_expression.exsd diff --git a/schema/sql_method.exsd b/src/main/resources/schema/sql_method.exsd similarity index 100% rename from schema/sql_method.exsd rename to src/main/resources/schema/sql_method.exsd diff --git a/schema/sql_operation.exsd b/src/main/resources/schema/sql_operation.exsd similarity index 100% rename from schema/sql_operation.exsd rename to src/main/resources/schema/sql_operation.exsd diff --git a/schema/sql_tablenamer.exsd b/src/main/resources/schema/sql_tablenamer.exsd similarity index 100% rename from schema/sql_tablenamer.exsd rename to src/main/resources/schema/sql_tablenamer.exsd diff --git a/src/test/org/datanucleus/store/rdbms/mapping/datastore/ClobImplTest.java b/src/test/java/org/datanucleus/store/rdbms/mapping/datastore/ClobImplTest.java similarity index 100% rename from src/test/org/datanucleus/store/rdbms/mapping/datastore/ClobImplTest.java rename to src/test/java/org/datanucleus/store/rdbms/mapping/datastore/ClobImplTest.java diff --git a/src/test/log4j.properties b/src/test/resources/log4j.properties similarity index 100% rename from src/test/log4j.properties rename to src/test/resources/log4j.properties