This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 9f7ecc4f0 CAY-2824 Rename CayenneServerModuleProvider to
CayenneRuntimeModuleProvider
9f7ecc4f0 is described below
commit 9f7ecc4f08ec32d2ff6e7fb480bd865cbcc8d41b
Author: stariy95 <[email protected]>
AuthorDate: Thu Nov 23 18:25:11 2023 +0400
CAY-2824 Rename CayenneServerModuleProvider to CayenneRuntimeModuleProvider
---
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 3 +++
.../CacheInvalidationModuleProvider.java | 4 ++--
...e.cayenne.runtime.CayenneRuntimeModuleProvider} | 0
...CayenneCacheInvalidationModuleProviderTest.java | 4 ++--
...eProvider.java => CommitLogModuleProvider.java} | 4 ++--
...onfiguration.server.CayenneServerModuleProvider | 20 -------------------
...he.cayenne.runtime.CayenneRuntimeModuleProvider | 2 +-
.../commitlog/CommitLogModuleProviderTest.java | 4 ++--
...duleProvider.java => CryptoModuleProvider.java} | 4 ++--
...e.cayenne.runtime.CayenneRuntimeModuleProvider} | 2 +-
.../cayenne/crypto/CryptoModuleProviderTest.java | 4 ++--
...duleProvider.java => DbSyncModuleProvider.java} | 4 ++--
...he.cayenne.runtime.CayenneRuntimeModuleProvider | 2 +-
.../cayenne/dbsync/DbSyncModuleProviderTest.java | 4 ++--
...duleProvider.java => JCacheModuleProvider.java} | 4 ++--
...he.cayenne.runtime.CayenneRuntimeModuleProvider | 2 +-
.../jcache/CayenneJCacheModuleProviderTest.java | 4 ++--
.../ProjectCompatibilityModuleProvider.java | 4 ++--
...e.cayenne.runtime.CayenneRuntimeModuleProvider} | 0
.../ProjectCompatibilityModuleProviderTest.java | 4 ++--
...uleProvider.java => ProjectModuleProvider.java} | 4 ++--
...he.cayenne.runtime.CayenneRuntimeModuleProvider | 2 +-
.../cayenne/project/ProjectModuleProviderTest.java | 4 ++--
...leProvider.java => VelocityModuleProvider.java} | 4 ++--
...onfiguration.server.CayenneServerModuleProvider | 20 -------------------
...he.cayenne.runtime.CayenneRuntimeModuleProvider | 2 +-
.../velocity/VelocityModuleProviderTest.java | 4 ++--
.../configuration/server/CoreModuleProvider.java | 3 ++-
.../cayenne/runtime/CayenneRuntimeBuilder.java | 3 +--
.../CayenneRuntimeModuleProvider.java} | 11 ++++++-----
.../java/org/apache/cayenne/runtime/package.html | 23 ++++++++++++++++++++++
...e.cayenne.runtime.CayenneRuntimeModuleProvider} | 0
.../server/CoreModuleProviderTest.java | 3 ++-
34 files changed, 76 insertions(+), 87 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index ac6abdb8c..4e0603fdb 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -46,6 +46,7 @@ CAY-2819 DataContext.performIteratedQuery() method should be
unified with iterat
CAY-2821 Change development versioning schema
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-2826 Rename `ServerModule` to `CoreModule`
Bug Fixes:
diff --git a/UPGRADE.txt b/UPGRADE.txt
index fb9f2a966..c2267af97 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -46,6 +46,9 @@ that accordingly in your build scripts
* Per CAY-2823 `ServerRuntime` is deprecated. You should change your code to
use `org.apache.cayenne.runtime.CayenneRuntime` instead.
+* 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-2826 `ServerModule` renamed to `CoreModule`
UPGRADING TO 4.2.M2
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 4470b99da..bb024f2c6 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
@@ -22,14 +22,14 @@ package org.apache.cayenne.cache.invalidation;
import java.util.Collection;
import java.util.Collections;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
* @since 4.0
*/
-public class CacheInvalidationModuleProvider implements
CayenneServerModuleProvider {
+public class CacheInvalidationModuleProvider implements
CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 100%
rename from
cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne-cache-invalidation/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
diff --git
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
index 9b851f257..b84eee614 100644
---
a/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
+++
b/cayenne-cache-invalidation/src/test/java/org/apache/cayenne/cache/invalidation/CayenneCacheInvalidationModuleProviderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.cache.invalidation;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -27,6 +27,6 @@ public class CayenneCacheInvalidationModuleProviderTest {
@Test
public void testAutoLoadable() {
-
ModuleProviderChecker.testProviderPresent(CacheInvalidationModuleProvider.class,
CayenneServerModuleProvider.class);
+
ModuleProviderChecker.testProviderPresent(CacheInvalidationModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java
similarity index 90%
rename from
cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
rename to
cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java
index cf84b3879..cf3f40381 100644
---
a/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogServerModuleProvider.java
+++
b/cayenne-commitlog/src/main/java/org/apache/cayenne/commitlog/CommitLogModuleProvider.java
@@ -22,14 +22,14 @@ package org.apache.cayenne.commitlog;
import java.util.Collection;
import java.util.Collections;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
* @since 4.0
*/
-public class CommitLogServerModuleProvider implements
CayenneServerModuleProvider {
+public class CommitLogModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-commitlog/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-commitlog/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
deleted file mode 100644
index 45af46d9f..000000000
---
a/cayenne-commitlog/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++ /dev/null
@@ -1,20 +0,0 @@
-##################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-##################################################################
-
-org.apache.cayenne.commitlog.CommitLogServerModuleProvider
\ No newline at end of file
diff --git
a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-commitlog/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 94%
copy from
cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
copy to
cayenne-commitlog/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index b98907bec..f434cbc96 100644
---
a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne-commitlog/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.dbsync.DbSyncServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.commitlog.CommitLogModuleProvider
\ No newline at end of file
diff --git
a/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java
b/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java
index 1cfaec7a4..b58cc9668 100644
---
a/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java
+++
b/cayenne-commitlog/src/test/java/org/apache/cayenne/commitlog/CommitLogModuleProviderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.commitlog;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -27,6 +27,6 @@ public class CommitLogModuleProviderTest {
@Test
public void testAutoLoadable() {
-
ModuleProviderChecker.testProviderPresent(CommitLogServerModuleProvider.class,
CayenneServerModuleProvider.class);
+
ModuleProviderChecker.testProviderPresent(CommitLogModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
similarity index 89%
rename from
cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
rename to
cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
index 829513f77..d37df2948 100644
---
a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
+++
b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleProvider.java
@@ -21,14 +21,14 @@ package org.apache.cayenne.crypto;
import java.util.Collection;
import java.util.Collections;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
* @since 4.0
*/
-public class CryptoServerModuleProvider implements CayenneServerModuleProvider
{
+public class CryptoModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 94%
rename from
cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index 944771a9f..d6238de13 100644
---
a/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne-crypto/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.crypto.CryptoServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.crypto.CryptoModuleProvider
\ No newline at end of file
diff --git
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
index c2435b83e..31fc1831b 100644
---
a/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
+++
b/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/CryptoModuleProviderTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.cayenne.crypto;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -26,6 +26,6 @@ public class CryptoModuleProviderTest {
@Test
public void testProviderPresent() {
-
ModuleProviderChecker.testProviderPresent(CryptoServerModuleProvider.class,
CayenneServerModuleProvider.class);
+ ModuleProviderChecker.testProviderPresent(CryptoModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncServerModuleProvider.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java
similarity index 89%
rename from
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncServerModuleProvider.java
rename to
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java
index 086ae4167..7aa012b5d 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncServerModuleProvider.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/DbSyncModuleProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.cayenne.dbsync;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.di.Module;
import java.util.Collection;
@@ -29,7 +29,7 @@ import java.util.Collections;
*
* @since 4.0
*/
-public class DbSyncServerModuleProvider implements CayenneServerModuleProvider
{
+public class DbSyncModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 94%
rename from
cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index 8eda8d0b2..01a162a5d 100644
---
a/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.jcache.JCacheServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.dbsync.DbSyncModuleProvider
\ No newline at end of file
diff --git
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
index 875daa62c..afe679b76 100644
---
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
+++
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/DbSyncModuleProviderTest.java
@@ -18,13 +18,13 @@
*/
package org.apache.cayenne.dbsync;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
public class DbSyncModuleProviderTest {
@Test
public void testProviderPresent() {
-
ModuleProviderChecker.testProviderPresent(DbSyncServerModuleProvider.class,
CayenneServerModuleProvider.class);
+ ModuleProviderChecker.testProviderPresent(DbSyncModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
similarity index 90%
rename from
cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
rename to
cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
index a9370caa3..f6e8c8e71 100644
---
a/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheServerModuleProvider.java
+++
b/cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleProvider.java
@@ -22,14 +22,14 @@ package org.apache.cayenne.jcache;
import java.util.Collection;
import java.util.Collections;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
* @since 4.0
*/
-public class JCacheServerModuleProvider implements CayenneServerModuleProvider
{
+public class JCacheModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 94%
rename from
cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index bc674571b..eee348708 100644
---
a/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne-jcache/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.project.ProjectServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.jcache.JCacheModuleProvider
\ No newline at end of file
diff --git
a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
index d82f6c4dc..be0f9556b 100644
---
a/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
+++
b/cayenne-jcache/src/test/java/org/apache/cayenne/jcache/CayenneJCacheModuleProviderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.jcache;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -27,6 +27,6 @@ public class CayenneJCacheModuleProviderTest {
@Test
public void testAutoLoadable() {
-
ModuleProviderChecker.testProviderPresent(JCacheServerModuleProvider.class,
CayenneServerModuleProvider.class);
+ ModuleProviderChecker.testProviderPresent(JCacheModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
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 7cc7a580f..9c3a0e915 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
@@ -22,7 +22,7 @@ package org.apache.cayenne.project.compatibility;
import java.util.Arrays;
import java.util.Collection;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.ProjectModule;
@@ -30,7 +30,7 @@ import org.apache.cayenne.project.ProjectModule;
/**
* @since 4.1
*/
-public class ProjectCompatibilityModuleProvider implements
CayenneServerModuleProvider {
+public class ProjectCompatibilityModuleProvider implements
CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-project-compatibility/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-project-compatibility/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 100%
rename from
cayenne-project-compatibility/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne-project-compatibility/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
diff --git
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
index 2f20f896c..f15c82a21 100644
---
a/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
+++
b/cayenne-project-compatibility/src/test/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProviderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.project.compatibility;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -30,6 +30,6 @@ public class ProjectCompatibilityModuleProviderTest {
@Test
public void testServerAutoLoadable() {
-
ModuleProviderChecker.testProviderPresent(ProjectCompatibilityModuleProvider.class,
CayenneServerModuleProvider.class);
+
ModuleProviderChecker.testProviderPresent(ProjectCompatibilityModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectServerModuleProvider.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java
similarity index 89%
rename from
cayenne-project/src/main/java/org/apache/cayenne/project/ProjectServerModuleProvider.java
rename to
cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java
index 718fbc658..96e287955 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectServerModuleProvider.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.cayenne.project;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.di.Module;
import java.util.Collection;
@@ -27,7 +27,7 @@ import java.util.Collections;
/**
* @since 4.0
*/
-public class ProjectServerModuleProvider implements
CayenneServerModuleProvider {
+public class ProjectModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 94%
copy from
cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
copy to
cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index b98907bec..ce3783207 100644
---
a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne-project/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.dbsync.DbSyncServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.project.ProjectModuleProvider
\ No newline at end of file
diff --git
a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
index 7a9cc1713..a7af92577 100644
---
a/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
+++
b/cayenne-project/src/test/java/org/apache/cayenne/project/ProjectModuleProviderTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.cayenne.project;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -26,6 +26,6 @@ public class ProjectModuleProviderTest {
@Test
public void testProviderPresent() {
-
ModuleProviderChecker.testProviderPresent(ProjectServerModuleProvider.class,
CayenneServerModuleProvider.class);
+ ModuleProviderChecker.testProviderPresent(ProjectModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
similarity index 90%
rename from
cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
rename to
cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
index da3f95456..b7aae23d8 100644
---
a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
+++
b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModuleProvider.java
@@ -22,14 +22,14 @@ package org.apache.cayenne.velocity;
import java.util.Collection;
import java.util.Collections;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.di.Module;
/**
* @since 4.1
*/
-public class VelocityServerModuleProvider implements
CayenneServerModuleProvider {
+public class VelocityModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
diff --git
a/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
deleted file mode 100644
index 5d577a717..000000000
---
a/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++ /dev/null
@@ -1,20 +0,0 @@
-##################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-##################################################################
-
-org.apache.cayenne.velocity.VelocityServerModuleProvider
\ No newline at end of file
diff --git
a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 94%
rename from
cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
index b98907bec..1df013c9b 100644
---
a/cayenne-dbsync/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
+++
b/cayenne-velocity/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
@@ -17,4 +17,4 @@
# under the License.
##################################################################
-org.apache.cayenne.dbsync.DbSyncServerModuleProvider
\ No newline at end of file
+org.apache.cayenne.velocity.VelocityModuleProvider
\ No newline at end of file
diff --git
a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
index 3da956400..3ab7c8f06 100644
---
a/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
+++
b/cayenne-velocity/src/test/java/org/apache/cayenne/velocity/VelocityModuleProviderTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.velocity;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -30,6 +30,6 @@ public class VelocityModuleProviderTest {
@Test
public void testServerAutoLoadable() {
-
ModuleProviderChecker.testProviderPresent(VelocityServerModuleProvider.class,
CayenneServerModuleProvider.class);
+
ModuleProviderChecker.testProviderPresent(VelocityModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
index bbc8ef489..48a2724ca 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
+++
b/cayenne/src/main/java/org/apache/cayenne/configuration/server/CoreModuleProvider.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.configuration.server;
import org.apache.cayenne.di.Module;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import java.util.Collection;
import java.util.Collections;
@@ -29,7 +30,7 @@ import java.util.Collections;
* @since 4.0 introduced
* @since 5.0 renamed from MainCayenneServerModuleProvider
*/
-public class CoreModuleProvider implements CayenneServerModuleProvider {
+public class CoreModuleProvider implements CayenneRuntimeModuleProvider {
@Override
public Module module() {
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 c877bfaa3..46efa9d8a 100644
---
a/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
+++
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeBuilder.java
@@ -20,7 +20,6 @@ package org.apache.cayenne.runtime;
import org.apache.cayenne.access.DataDomain;
import org.apache.cayenne.configuration.Constants;
-import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
import org.apache.cayenne.configuration.server.CoreModule;
import org.apache.cayenne.configuration.server.DataSourceFactory;
import org.apache.cayenne.configuration.server.CoreModuleExtender;
@@ -199,7 +198,7 @@ public class CayenneRuntimeBuilder {
}
private Collection<? extends Module> autoLoadedModules() {
- return new ModuleLoader().load(CayenneServerModuleProvider.class);
+ return new ModuleLoader().load(CayenneRuntimeModuleProvider.class);
}
private Collection<? extends Module> defaultModules() {
diff --git
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CayenneServerModuleProvider.java
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeModuleProvider.java
similarity index 80%
rename from
cayenne/src/main/java/org/apache/cayenne/configuration/server/CayenneServerModuleProvider.java
rename to
cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeModuleProvider.java
index 97f982441..85124441f 100644
---
a/cayenne/src/main/java/org/apache/cayenne/configuration/server/CayenneServerModuleProvider.java
+++
b/cayenne/src/main/java/org/apache/cayenne/runtime/CayenneRuntimeModuleProvider.java
@@ -17,14 +17,15 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.configuration.server;
+package org.apache.cayenne.runtime;
import org.apache.cayenne.di.spi.ModuleProvider;
-import org.apache.cayenne.runtime.CayenneRuntimeBuilder;
/**
- * This interface implementations will be used by {@link
CayenneRuntimeBuilder} to auto-load server modules.
- * @since 4.0
+ * This interface implementations will be used by {@link
CayenneRuntimeBuilder} to auto-load runtime modules.
+ *
+ * @since 4.0 introduced
+ * @since 5.0 renamed from CayenneServerModuleProvider to
CayenneRuntimeModuleProvider
*/
-public interface CayenneServerModuleProvider extends ModuleProvider {
+public interface CayenneRuntimeModuleProvider extends ModuleProvider {
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/runtime/package.html
b/cayenne/src/main/java/org/apache/cayenne/runtime/package.html
new file mode 100644
index 000000000..3fd8e907c
--- /dev/null
+++ b/cayenne/src/main/java/org/apache/cayenne/runtime/package.html
@@ -0,0 +1,23 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<html>
+<body>
+API related to CayenneRuntime creation
+</body>
+</html>
\ No newline at end of file
diff --git
a/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
b/cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
similarity index 100%
rename from
cayenne/src/main/resources/META-INF/services/org.apache.cayenne.configuration.server.CayenneServerModuleProvider
rename to
cayenne/src/main/resources/META-INF/services/org.apache.cayenne.runtime.CayenneRuntimeModuleProvider
diff --git
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
index 31e1c62d5..b6e5d3828 100644
---
a/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
+++
b/cayenne/src/test/java/org/apache/cayenne/configuration/server/CoreModuleProviderTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cayenne.configuration.server;
+import org.apache.cayenne.runtime.CayenneRuntimeModuleProvider;
import org.apache.cayenne.unit.util.ModuleProviderChecker;
import org.junit.Test;
@@ -25,6 +26,6 @@ public class CoreModuleProviderTest {
@Test
public void testProviderPresent() {
- ModuleProviderChecker.testProviderPresent(CoreModuleProvider.class,
CayenneServerModuleProvider.class);
+ ModuleProviderChecker.testProviderPresent(CoreModuleProvider.class,
CayenneRuntimeModuleProvider.class);
}
}
