CAY-2825 Rename package `o.a.c.configuration.server` to `o.a.c.configuration.runtime`
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4e0603f..5888b27 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -47,6 +47,7 @@
CAY-2822 Rename `cayenne-server` module to `cayenne`
CAY-2823 Merge `ServerRuntime` back to `CayenneRuntime` and deprecate it
CAY-2824 Rename CayenneServerModuleProvider to CayenneRuntimeModuleProvider
+CAY-2825 Rename package `o.a.c.configuration.server` to `o.a.c.configuration.runtime`
CAY-2826 Rename `ServerModule` to `CoreModule`
Bug Fixes:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index c2267af..d53426e 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -49,6 +49,9 @@
* Per CAY-2824 `CayenneServerModuleProvider` renamed to `CayenneRuntimeModuleProvider` and moved to `org.apache.cayenne.runtime` package.
If you are using auto-loading mechanism for your custom modules you need to change `META-INF.services` reference accordingly.
+* Per CAY-2825 package `org.apache.cayenne.configuration.server` renamed to `org.apache.cayenne.configuration.runtime`,
+fix your imports accordingly.
+
* Per CAY-2826 `ServerModule` renamed to `CoreModule`
UPGRADING TO 4.2.M2
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneTask.java
index 5c01688..b68a7b9 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneTask.java
@@ -26,7 +26,7 @@
import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.map.DataMap;
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index 53dcdcb..dc661ba 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -23,8 +23,8 @@
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
diff --git a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
index 7495a75..76e06ee 100644
--- a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
+++ b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModule.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.cache.invalidation;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.ListBuilder;
import org.apache.cayenne.di.Module;
diff --git a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
index bb024f2..e72c4fa 100644
--- a/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
+++ b/cayenne-cache-invalidation/src/main/java/org/apache/cayenne/cache/invalidation/CacheInvalidationModuleProvider.java
@@ -23,7 +23,7 @@
import java.util.Collections;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Module;
/**
diff --git a/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml b/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
index 8f42bf8..e86a4ea 100644
--- a/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-cache-invalidation/src/test/resources/cayenne-lifecycle.xml
@@ -4,7 +4,7 @@
<map name="lifecycle-map"/>
<node name="lifecycle-db"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ factory="org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory"
schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy"
>
<map-ref name="lifecycle-map"/>
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
index 1624605..cc9f380 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/PropertyUtilsTest.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.gen;
import org.apache.cayenne.access.types.TimestampType;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.spi.DefaultScope;
import org.apache.cayenne.exp.property.DateProperty;
diff --git a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
index c815f7b..39d0b1d 100644
--- a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
+++ b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleExtender.java
@@ -21,7 +21,7 @@
import org.apache.cayenne.commitlog.meta.AnnotationCommitLogEntityFactory;
import org.apache.cayenne.commitlog.meta.CommitLogEntity;
import org.apache.cayenne.commitlog.meta.CommitLogEntityFactory;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.ListBuilder;
diff --git a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java
index cf3f403..bd61f1f 100644
--- a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java
+++ b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java
@@ -23,7 +23,7 @@
import java.util.Collections;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Module;
/**
diff --git a/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml b/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
index c160991..cc49efd 100644
--- a/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-commitlog/src/test/resources/cayenne-lifecycle.xml
@@ -5,7 +5,7 @@
project-version="11">
<map name="lifecycle-map"/>
<node name="lifecycle-db"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ factory="org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory"
schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="lifecycle-map"/>
<data-source>
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
index d37df29..b5d6e6e 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
@@ -22,7 +22,7 @@
import java.util.Collections;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Module;
/**
diff --git a/cayenne-crypto/src/test/resources/cayenne-crypto.xml b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
index ba4eacc..f13080b 100644
--- a/cayenne-crypto/src/test/resources/cayenne-crypto.xml
+++ b/cayenne-crypto/src/test/resources/cayenne-crypto.xml
@@ -5,7 +5,7 @@
project-version="11">
<map name="datamap"/>
<node name="datanode"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ factory="org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory"
schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="datamap"/>
<data-source>
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/DriverDataSourceFactory.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/DriverDataSourceFactory.java
index ed182d2..b892e22 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/DriverDataSourceFactory.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/DriverDataSourceFactory.java
@@ -25,7 +25,7 @@
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
import org.apache.cayenne.datasource.DriverDataSource;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsCoreModuleExtender.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsCoreModuleExtender.java
index c555649..c8a8356 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsCoreModuleExtender.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsCoreModuleExtender.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dbsync.reverse.configuration;
-import org.apache.cayenne.configuration.server.CoreModuleExtender;
+import org.apache.cayenne.configuration.runtime.CoreModuleExtender;
import org.apache.cayenne.di.Binder;
// this class exists so that ToolsModule can call "initAllExtensions()" that is protected in CoreModuleExtender.
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
index c2cccbe..a13fca3 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
@@ -32,10 +32,10 @@
import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
-import org.apache.cayenne.configuration.server.DefaultDbAdapterFactory;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DefaultDbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.PkGeneratorFactoryProvider;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.configuration.xml.DefaultDataChannelMetaData;
import org.apache.cayenne.configuration.xml.HandlerFactory;
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfigurationValidator.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfigurationValidator.java
index cd7ea11..d8e424e 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfigurationValidator.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfigurationValidator.java
@@ -20,8 +20,8 @@
package org.apache.cayenne.dbsync.reverse.dbimport;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Injector;
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
index 0aa1f70..fea39d5 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
@@ -37,8 +37,8 @@
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.merge.DataMapMerger;
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
index cb2a81c..2a904eb 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
@@ -20,9 +20,9 @@
package org.apache.cayenne.dbsync.reverse.configuration;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
-import org.apache.cayenne.configuration.server.DefaultDbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DefaultDbAdapterFactory;
import org.apache.cayenne.dba.AutoAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.DIBootstrap;
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
index 7699a90..657d701 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
@@ -20,8 +20,8 @@
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataMapLoader;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.DbSyncModule;
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
index 08ece23..2a1c261 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbGenerateTask.java
@@ -23,9 +23,9 @@
import org.apache.cayenne.access.DbGenerator;
import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.PkGeneratorFactoryProvider;
import org.apache.cayenne.datasource.DataSourceBuilder;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.JdbcAdapter;
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java
index 876f4cc..9bbdf9b 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/DbImportTask.java
@@ -24,8 +24,8 @@
import groovy.lang.Closure;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
diff --git a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
index 194a6ba..380fb42 100644
--- a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
+++ b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.jcache;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Binder;
/**
diff --git a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
index f6e8c8e..4b441c3 100644
--- a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
+++ b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
@@ -23,7 +23,7 @@
import java.util.Collections;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Module;
/**
diff --git a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
index d6afa6b..f24cef6 100644
--- a/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
+++ b/cayenne-lifecycle/src/test/resources/cayenne-lifecycle.xml
@@ -3,7 +3,7 @@
project-version="11">
<map name="lifecycle-map"/>
<node name="lifecycle-db"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ factory="org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory"
schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="lifecycle-map"/>
<data-source>
diff --git a/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java b/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
index 6f3ea8a..9a6ca11 100644
--- a/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
+++ b/cayenne-osgi/src/main/java/org/apache/cayenne/configuration/osgi/OsgiDataDomainProvider.java
@@ -21,7 +21,7 @@
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.configuration.server.DataDomainProvider;
+import org.apache.cayenne.configuration.runtime.DataDomainProvider;
import org.apache.cayenne.di.ClassLoaderManager;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.EntityResolver;
diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
index 9c3a0e9..cdae65b 100644
--- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
+++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
@@ -23,7 +23,7 @@
import java.util.Collection;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.ProjectModule;
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DataNodeValidator.java b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DataNodeValidator.java
index bc05c7f..a8db9d2 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DataNodeValidator.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/validation/DataNodeValidator.java
@@ -20,7 +20,7 @@
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
+import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationResult;
diff --git a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml
index 5e6b4da..e981ac2 100644
--- a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml
+++ b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/delete_shadow_attributes/cayenne-TestProject.xml
@@ -4,7 +4,7 @@
<map name="testProjectMap2"/>
<node name="testProjectNode"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ factory="org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory"
schema-update-strategy="org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy"
>
<map-ref name="testProjectMap1"/>
diff --git a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
index b7aae23..4986bb3 100644
--- a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
+++ b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
@@ -23,7 +23,7 @@
import java.util.Collections;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Module;
/**
diff --git a/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java b/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
index bcb888a..d52e4e3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataChannelQueryFilter.java
@@ -38,7 +38,7 @@
* }}</pre>
*
* @see DataChannelSyncFilter
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#addQueryFilter(DataChannelQueryFilter)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#addQueryFilter(DataChannelQueryFilter)
*
* @since 4.1
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java b/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
index d8e0c1b..a79c3ce 100644
--- a/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
+++ b/cayenne/src/main/java/org/apache/cayenne/DataChannelSyncFilter.java
@@ -40,7 +40,7 @@
* }}</pre>
*
* @see DataChannelQueryFilter
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#addSyncFilter(Class, boolean)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#addSyncFilter(Class, boolean)
*
* @since 4.1
*/
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
index ddef26f..b2d6f99 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/Constants.java
@@ -33,7 +33,7 @@
* A DI container key for the Map<String, String> storing properties
* used by built-in Cayenne service.
*
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#setProperty(String, Object)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#setProperty(String, Object)
*/
String PROPERTIES_MAP = "cayenne.properties";
@@ -47,7 +47,7 @@
/**
* A DI container key for the List<Object> storing lifecycle events listeners.
*
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#addListener(Object)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#addListener(Object)
*/
String SERVER_DOMAIN_LISTENERS_LIST = "cayenne.server.domain_listeners";
@@ -61,7 +61,7 @@
* A DI container key for the List<ExtendedType> storing default
* adapter-agnostic ExtendedTypes.
*
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#addDefaultExtendedType(ExtendedType)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#addDefaultExtendedType(ExtendedType)
*/
String SERVER_DEFAULT_TYPES_LIST = "cayenne.server.default_types";
@@ -69,7 +69,7 @@
* A DI container key for the List<ExtendedType> storing a
* user-provided ExtendedTypes.
*
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#addUserExtendedType(ExtendedType)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#addUserExtendedType(ExtendedType)
*/
String SERVER_USER_TYPES_LIST = "cayenne.server.user_types";
@@ -77,7 +77,7 @@
* A DI container key for the List<ExtendedTypeFactory> storing
* default and user-provided ExtendedTypeFactories.
*
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#addExtendedTypeFactory(Class)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#addExtendedTypeFactory(Class)
*/
String SERVER_TYPE_FACTORIES_LIST = "cayenne.server.type_factories";
@@ -177,7 +177,7 @@
/**
* Snapshot cache max size
*
- * @see org.apache.cayenne.configuration.server.CoreModuleExtender#snapshotCacheSize(int)
+ * @see org.apache.cayenne.configuration.runtime.CoreModuleExtender#snapshotCacheSize(int)
* @since 4.0
*/
String SNAPSHOT_CACHE_SIZE_PROPERTY = "cayenne.DataRowStore.snapshot.size";
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java b/cayenne/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
index 07dbb58..3f95899 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/DataNodeDescriptor.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.configuration;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
+import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.util.XMLEncoder;
import org.apache.cayenne.util.XMLSerializable;
@@ -138,7 +138,7 @@
/**
* Returns extra DataNodeDescriptor parameters. This property is often used by custom
- * {@link org.apache.cayenne.configuration.server.DataSourceFactory} to configure a DataSource. E.g. JNDIDataSourceFactory may
+ * {@link org.apache.cayenne.configuration.runtime.DataSourceFactory} to configure a DataSource. E.g. JNDIDataSourceFactory may
* treat parameters String as a JNDI location of the DataSource, etc.
*/
public String getParameters() {
@@ -147,7 +147,7 @@
/**
* Sets extra DataNodeDescriptor parameters. This property is often used by custom
- * {@link org.apache.cayenne.configuration.server.DataSourceFactory} to configure a DataSource. E.g. JNDIDataSourceFactory may
+ * {@link org.apache.cayenne.configuration.runtime.DataSourceFactory} to configure a DataSource. E.g. JNDIDataSourceFactory may
* treat parameters String as a JNDI location of the DataSource, etc.
*/
public void setParameters(String parameters) {
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModule.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
similarity index 99%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModule.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
index e44faa1..dd1a478 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModule.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.DataChannelQueryFilter;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleExtender.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
similarity index 99%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleExtender.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
index 846c0de..6b9dc85 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleExtender.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleExtender.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.DataChannelQueryFilter;
import org.apache.cayenne.DataChannelSyncFilter;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleProvider.java
similarity index 96%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleProvider.java
index 48a2724..2fe44a4 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/CoreModuleProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java
index c3bd7d7..8b601a5 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataContextFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataContextFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainLoadException.java
similarity index 97%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainLoadException.java
index 6b04899..fafe017 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataDomainLoadException.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainLoadException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.configuration.ConfigurationTree;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
similarity index 99%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
index f7aeb03..09cb500 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataDomainProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.DataChannel;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataNodeFactory.java
similarity index 95%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataNodeFactory.java
index 4530218..36a4283 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataNodeFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataNodeFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.configuration.DataNodeDescriptor;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataSourceFactory.java
similarity index 96%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DataSourceFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataSourceFactory.java
index 89f3db2..692c80b 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DataSourceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import javax.sql.DataSource;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DbAdapterDetector.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DbAdapterDetector.java
similarity index 96%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DbAdapterDetector.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DbAdapterDetector.java
index 6c4890f..f51bc8d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DbAdapterDetector.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DbAdapterDetector.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DbAdapterFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DbAdapterFactory.java
similarity index 96%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DbAdapterFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DbAdapterFactory.java
index 02304de..bd1b035 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DbAdapterFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DbAdapterFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import javax.sql.DataSource;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
index 92794bc..56d1062 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DefaultDataNodeFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDataNodeFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategyFactory;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
index 7dd31ba..be076ec 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java
similarity index 99%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java
index cecbf61..afbf449 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DelegatingDataSourceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.Constants;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DomainDataChannelProvider.java
similarity index 96%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DomainDataChannelProvider.java
index 113efd5..4b599b6 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/DomainDataChannelProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/DomainDataChannelProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.access.DataDomain;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java
similarity index 97%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java
index 0da730b..3ce6c9d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import javax.naming.Context;
import javax.naming.InitialContext;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/PkGeneratorFactoryProvider.java
similarity index 96%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/PkGeneratorFactoryProvider.java
index d05fd25..f3cfcc8 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/PkGeneratorFactoryProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/PkGeneratorFactoryProvider.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.dba.PerAdapterProvider;
import org.apache.cayenne.dba.PkGenerator;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/PropertyDataSourceFactory.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/PropertyDataSourceFactory.java
index 190fc0b..6ee46fd 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/PropertyDataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/PropertyDataSourceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import java.sql.Driver;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java
similarity index 97%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java
index 7c63f99..f6b3eef 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/ServerRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/ServerRuntime.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.runtime.CayenneRuntime;
import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
diff --git a/cayenne/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java
similarity index 98%
rename from cayenne/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
rename to cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java
index b08d78c..e51520d 100644
--- a/cayenne/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/configuration/runtime/XMLPoolingDataSourceFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import java.sql.Driver;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
index c046170..b11269c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Sniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.db2;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
index a8dea61..235e57e 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbySniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.derby;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java
index e5ba042..638b408 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.firebird;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
index 7b41128..a946372 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
@@ -22,7 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
index 38b5cf0..8e29f86 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/h2/H2Sniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.h2;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
index 9d06618..f83b8c3 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/hsqldb/HSQLDBSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.hsqldb;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
index 0b77dfa..40d6534 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/ingres/IngresSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.ingres;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/mariadb/MariaDBSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/mariadb/MariaDBSniffer.java
index 0903221..8016c06 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/mariadb/MariaDBSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/mariadb/MariaDBSniffer.java
@@ -22,7 +22,7 @@
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.mysql.MySQLAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
index d15fa00..ab00c95 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/mysql/MySQLSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.mysql;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
index b2c5d0b..68b9dab 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/oracle/OracleSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.oracle;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
index 6b4a939..f572511 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/postgres/PostgresSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.postgres;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
index 83c62d2..ecca43f 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSniffer.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.dba.sqlite;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
index f0c7d6f..54549e4 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.sqlserver;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
index 644bc0d..5c4c048 100644
--- a/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
+++ b/cayenne/src/main/java/org/apache/cayenne/dba/sybase/SybaseSniffer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.sybase;
-import org.apache.cayenne.configuration.server.DbAdapterDetector;
+import org.apache.cayenne.configuration.runtime.DbAdapterDetector;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
index a528f8d..853cc2c 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntime.java
@@ -23,7 +23,6 @@
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.configuration.ObjectContextFactory;
-import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.BeforeScopeEnd;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
@@ -52,8 +51,8 @@
* }
* </pre>
*
- * @since 5.0 is repurposed as a single implementation of Cayenne runtime and moved to {@code org.apache.cayenne.runtime} package.
- * @since 3.1
+ * @since 3.1 is introduced
+ * @since 5.0 is repurposed as a single implementation of Cayenne runtime and moved to {@link org.apache.cayenne.runtime} package.
*
* @see #builder()
* @see #builder(String)
@@ -68,7 +67,7 @@
*
* @since 3.1
*/
- protected static final ThreadLocal<Injector> threadInjector = new ThreadLocal<Injector>();
+ protected static final ThreadLocal<Injector> threadInjector = new ThreadLocal<>();
/**
* Binds a DI {@link Injector} bound to the current thread. It is primarily
@@ -122,7 +121,7 @@
/**
* Creates a runtime configuring it with a standard set of services
- * contained in {@link CoreModule}. CoreModule is created with
+ * contained in {@link org.apache.cayenne.configuration.runtime.CoreModule}. CoreModule is created with
* one or more 'configurationLocations'. An optional array of extra modules
* may contain service overrides and/or user services.
*/
@@ -280,8 +279,7 @@
* to release some resources a chance to do that.
*/
// the following annotation is for environments that manage CayenneRuntimes
- // within
- // another DI registry (e.g. unit tests)
+ // within another DI registry (e.g. unit tests)
@BeforeScopeEnd
public void shutdown() {
injector.shutdown();
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
index 46efa9d..285ab90 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
@@ -20,9 +20,9 @@
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.CoreModule;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.CoreModuleExtender;
+import org.apache.cayenne.configuration.runtime.CoreModule;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.CoreModuleExtender;
import org.apache.cayenne.datasource.DataSourceBuilder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.di.spi.ModuleLoader;
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/FixedDataSourceFactory.java b/cayenne/src/main/java/org/apache/cayenne/runtime/FixedDataSourceFactory.java
index 74182d5..3307760 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/FixedDataSourceFactory.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/FixedDataSourceFactory.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.runtime;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
import javax.sql.DataSource;
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/SyntheticNodeDataDomainProvider.java b/cayenne/src/main/java/org/apache/cayenne/runtime/SyntheticNodeDataDomainProvider.java
index 9839601..b045318 100644
--- a/cayenne/src/main/java/org/apache/cayenne/runtime/SyntheticNodeDataDomainProvider.java
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/SyntheticNodeDataDomainProvider.java
@@ -22,7 +22,7 @@
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataDomainProvider;
+import org.apache.cayenne.configuration.runtime.DataDomainProvider;
import org.apache.cayenne.map.DataMap;
/**
diff --git a/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider b/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index ac8e3f0..daf9ed2 100644
--- a/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
+++ b/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.configuration.server.CoreModuleProvider
\ No newline at end of file
+org.apache.cayenne.configuration.runtime.CoreModuleProvider
\ No newline at end of file
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
index 8846bb5..3aab3e9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/DefaultDataRowStoreFactoryIT.java
@@ -25,8 +25,8 @@
import org.apache.cayenne.access.flush.operation.DefaultDbRowOpSorter;
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.configuration.server.CoreModule;
-import org.apache.cayenne.configuration.server.CoreModuleExtender;
+import org.apache.cayenne.configuration.runtime.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModuleExtender;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.ClassLoaderManager;
diff --git a/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java b/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
index 44a39d9..2f455e8 100644
--- a/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
+++ b/cayenne/src/test/java/org/apache/cayenne/access/util/ServerCaseSyncModule.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.access.util;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java b/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java
index 3803e31..3baf7cb 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory.java
@@ -21,7 +21,7 @@
import javax.sql.DataSource;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
import com.mockrunner.mock.jdbc.MockDataSource;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java b/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java
index f7c05f4..ab9ced4 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/mock/MockDataSourceFactory1.java
@@ -21,7 +21,7 @@
import javax.sql.DataSource;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java
similarity index 95%
rename from cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
rename to cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java
index b6e5d38..584533e 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/CoreModuleProviderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
similarity index 99%
rename from cayenne/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java
rename to cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
index f894691..9545736 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataContextFactoryTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataContextFactoryTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.access.DataContext;
import org.apache.cayenne.access.DataDomain;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
similarity index 99%
rename from cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
rename to cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
index 564bce3..eda7ec3 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DataDomainProviderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.DataChannel;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
similarity index 99%
rename from cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
rename to cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
index 3bc3394..2cb2d17 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDataSourceFactoryLoaderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDataSourceFactoryLoaderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import org.apache.cayenne.configuration.Constants;
import org.apache.cayenne.configuration.DataChannelDescriptor;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
similarity index 99%
rename from cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
rename to cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
index 3b3bc7d..f60f89f 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/server/DefaultDbAdapterFactoryTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/DefaultDbAdapterFactoryTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import com.mockrunner.mock.jdbc.MockConnection;
import com.mockrunner.mock.jdbc.MockDataSource;
diff --git a/cayenne/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactoryIT.java
similarity index 98%
rename from cayenne/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
rename to cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactoryIT.java
index 1e33b84..b094d65 100644
--- a/cayenne/src/test/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactoryIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/configuration/runtime/JNDIDataSourceFactoryIT.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.configuration.runtime;
import com.mockrunner.mock.jdbc.MockDataSource;
import org.apache.cayenne.configuration.DataNodeDescriptor;
diff --git a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
index f90fb42..5d76079 100644
--- a/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
+++ b/cayenne/src/test/java/org/apache/cayenne/runtime/CayenneRuntimeBuilderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.runtime;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Key;
import org.apache.cayenne.di.Module;
import org.junit.After;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
index 6455f17..fe40c39 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProvider.java
@@ -21,8 +21,8 @@
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.CoreModule;
-import org.apache.cayenne.configuration.server.DataNodeFactory;
+import org.apache.cayenne.configuration.runtime.CoreModule;
+import org.apache.cayenne.configuration.runtime.DataNodeFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Inject;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
index 1fb41c4..5550325 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/CayenneRuntimeProviderContextsSync.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.unit.di.server;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Module;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
index 7de50f6..715d1c9 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseContextsSync.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.unit.di.server;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Injector;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java
index c99aea6..e89e940 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java
@@ -22,8 +22,8 @@
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.UnitTestDomain;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataDomainProvider;
-import org.apache.cayenne.configuration.server.DataNodeFactory;
+import org.apache.cayenne.configuration.runtime.DataDomainProvider;
+import org.apache.cayenne.configuration.runtime.DataNodeFactory;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Procedure;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataNodeFactory.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataNodeFactory.java
index 23991c0..e865f17 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataNodeFactory.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataNodeFactory.java
@@ -25,7 +25,7 @@
import org.apache.cayenne.access.translator.batch.BatchTranslatorFactory;
import org.apache.cayenne.access.translator.select.SelectTranslatorFactory;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataNodeFactory;
+import org.apache.cayenne.configuration.runtime.DataNodeFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.log.JdbcEventLogger;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java
index c24887b..d0837d0 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDbAdapterProvider.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.unit.di.server;
import org.apache.cayenne.ConfigurationException;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
+import org.apache.cayenne.configuration.runtime.PkGeneratorFactoryProvider;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.PkGenerator;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
index 0346711..27447fc 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseModule.java
@@ -34,9 +34,9 @@
import org.apache.cayenne.configuration.DefaultRuntimeProperties;
import org.apache.cayenne.configuration.ObjectStoreFactory;
import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.configuration.server.CoreModuleExtender;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.PkGeneratorFactoryProvider;
+import org.apache.cayenne.configuration.runtime.CoreModuleExtender;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.PkGeneratorFactoryProvider;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.configuration.xml.DefaultHandlerFactory;
import org.apache.cayenne.configuration.xml.HandlerFactory;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSharedDataSourceFactory.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSharedDataSourceFactory.java
index e2f43dd..e2e1638 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSharedDataSourceFactory.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseSharedDataSourceFactory.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.unit.di.server;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
import org.apache.cayenne.di.Inject;
import javax.sql.DataSource;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
index f0e0ed3..ad89afc 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyCayenneRuntimeProvider.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.unit.di.server;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Module;
diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
index 1880907..1ffa82a 100644
--- a/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
+++ b/cayenne/src/test/java/org/apache/cayenne/unit/jira/CAY_743Test.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.unit.jira;
import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/server/testDBCP.properties b/cayenne/src/test/resources/org/apache/cayenne/configuration/runtime/testDBCP.properties
similarity index 100%
rename from cayenne/src/test/resources/org/apache/cayenne/configuration/server/testDBCP.properties
rename to cayenne/src/test/resources/org/apache/cayenne/configuration/runtime/testDBCP.properties
diff --git a/cayenne/src/test/resources/org/apache/cayenne/configuration/server/testDBCP_legacy.properties b/cayenne/src/test/resources/org/apache/cayenne/configuration/runtime/testDBCP_legacy.properties
similarity index 100%
rename from cayenne/src/test/resources/org/apache/cayenne/configuration/server/testDBCP_legacy.properties
rename to cayenne/src/test/resources/org/apache/cayenne/configuration/runtime/testDBCP_legacy.properties
diff --git a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
index c7141ed..ce9da1e 100644
--- a/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
+++ b/docs/asciidoc/cayenne-guide/src/docs/asciidoc/_cayenne-guide/part2/customize.adoc
@@ -263,7 +263,7 @@
To do that, first we need to know what those services to redefine are.
While we describe some of them in the following sections, the best way to get a full list
is to check the source code of the Cayenne version you are using and
-namely look in `org.apache.cayenne.configuration.server.CoreModule` - the main built-in module in Cayenne.
+namely look in `org.apache.cayenne.configuration.runtime.CoreModule` - the main built-in module in Cayenne.
Now an example of overriding `JdbcEventLogger` service. The default implementation of this service
is provided by `Slf4jJdbcEventLogger`. But if we want to use `FormattedSlf4jJdbcEventLogger`
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
index 8aac55c..d80fee6 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
@@ -22,12 +22,10 @@
import org.apache.cayenne.access.DbGenerator;
import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.datasource.DriverDataSource;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dbsync.DbSyncModule;
-import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.ClassLoaderManager;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index b23b4d3..16261bc 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -22,8 +22,8 @@
import java.io.File;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index fa1d166..3aa9097 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler;
-import org.apache.cayenne.configuration.server.CoreModule;
+import org.apache.cayenne.configuration.runtime.CoreModule;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
index 3085d15..ddd960b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
@@ -25,7 +25,7 @@
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceDescriptor;
import org.apache.cayenne.configuration.event.DataNodeEvent;
-import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
+import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
import org.apache.cayenne.dbsync.naming.NameBuilder;
import org.apache.cayenne.map.event.MapEvent;
import org.apache.cayenne.modeler.Application;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index 1df3949..df8532a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -25,8 +25,8 @@
import org.apache.cayenne.configuration.DataSourceDescriptor;
import org.apache.cayenne.configuration.event.DataNodeEvent;
import org.apache.cayenne.configuration.event.QueryEvent;
-import org.apache.cayenne.configuration.server.JNDIDataSourceFactory;
-import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
+import org.apache.cayenne.configuration.runtime.JNDIDataSourceFactory;
+import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbsync.naming.NameBuilder;
import org.apache.cayenne.map.DataMap;
@@ -43,7 +43,6 @@
import org.apache.cayenne.modeler.pref.FSPath;
import org.apache.cayenne.modeler.util.AdapterMapping;
import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.modeler.util.Comparators;
import org.apache.cayenne.modeler.util.FileFilters;
import org.apache.cayenne.wocompat.EOModelProcessor;
import org.slf4j.Logger;
@@ -59,7 +58,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import java.util.Map;
/**
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
index 395f83a..d778ac3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
@@ -27,8 +27,8 @@
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.DataChannelDescriptorLoader;
import org.apache.cayenne.configuration.DataMapLoader;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DataSourceFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider;
import org.apache.cayenne.dbsync.merge.token.MergerToken;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
index a6a1d18..f037d32 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/MainDataNodeEditor.java
@@ -35,7 +35,7 @@
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.event.DataNodeEvent;
-import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
+import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.dialog.pref.PreferenceDialog;
import org.apache.cayenne.modeler.pref.DBConnectionInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java
index d2206df..b16e02d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectionInfo.java
@@ -31,7 +31,7 @@
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceDescriptor;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.configuration.runtime.DbAdapterFactory;
import org.apache.cayenne.datasource.DriverDataSource;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.modeler.Application;
diff --git a/tutorials/tutorial/src/main/resources/cayenne-project.xml b/tutorials/tutorial/src/main/resources/cayenne-project.xml
index aadbd40..cc76b6c 100644
--- a/tutorials/tutorial/src/main/resources/cayenne-project.xml
+++ b/tutorials/tutorial/src/main/resources/cayenne-project.xml
@@ -5,7 +5,7 @@
project-version="11">
<map name="datamap"/>
<node name="datanode"
- factory="org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory"
+ factory="org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory"
schema-update-strategy="org.apache.cayenne.access.dbsync.CreateIfNoSchemaStrategy">
<map-ref name="datamap"/>
<data-source>
