You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/08/23 15:23:13 UTC
cayenne git commit: Fix compatibility module overrides
Repository: cayenne
Updated Branches:
refs/heads/master 4684f56b4 -> 0101fc1ca
Fix compatibility module overrides
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0101fc1c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0101fc1c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0101fc1c
Branch: refs/heads/master
Commit: 0101fc1ca44ec84eebc40d937a590ac4909e583f
Parents: 4684f56
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Aug 23 18:23:08 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Aug 23 18:23:08 2017 +0300
----------------------------------------------------------------------
.../compatibility/ProjectCompatibilityModuleProvider.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0101fc1c/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
----------------------------------------------------------------------
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 ae1adc6..c27766c 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
@@ -19,12 +19,13 @@
package org.apache.cayenne.project.compatibility;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
import org.apache.cayenne.configuration.server.ServerModule;
import org.apache.cayenne.di.Module;
+import org.apache.cayenne.project.ProjectModule;
/**
* @since 4.1
@@ -44,8 +45,8 @@ public class ProjectCompatibilityModuleProvider implements CayenneServerModulePr
@SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- // compatibility module overrides XML loaders defind in ServerModule
- Collection modules = Collections.singletonList(ServerModule.class);
- return modules;
+ // compatibility module overrides XML loaders defined in ServerModule and
+ // upgrade services from ProjectModule
+ return Arrays.asList(ServerModule.class, ProjectModule.class);
}
}