You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/05/19 17:14:01 UTC
[isis] 03/05: ISIS-1949: project agnostic naming for plugin java
packages ...
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1fbad8ae6529fd8d1670700569da1878f0b4fa12
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 19 18:54:38 2018 +0200
ISIS-1949: project agnostic naming for plugin java packages ...
... org.apache.isis.core.plugins.*
Task-Url: https://issues.apache.org/jira/browse/ISIS-1949
---
.../main/java/org/apache/isis/applib/internal/context/_Plugin.java | 2 +-
.../java/org/apache/isis/applib/internal/discover/_Discover.java | 4 ++--
.../isis/{commons => core}/plugins/PluginResolveException.java | 2 +-
.../{applib => core}/plugins/classdiscovery/ClassDiscovery.java | 2 +-
.../plugins/classdiscovery/ClassDiscoveryPlugin.java | 2 +-
.../isis/core/{runtime => }/plugins/codegen/ProxyFactory.java | 2 +-
.../isis/core/{runtime => }/plugins/codegen/ProxyFactoryPlugin.java | 2 +-
.../plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java | 4 +++-
.../org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin | 1 +
.../org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPlugin | 1 -
.../plugins/codegen/ProxyFactoryPluginUsingJavassist.java | 4 +++-
...ugin => org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin} | 0
.../reflections/ClassDiscoveryPluginUsingReflections.java | 6 +++---
.../plugins/classdiscovery/reflections/ReflectDiscovery.java | 4 ++--
.../plugins/classdiscovery/reflections/ReflectManifest.java | 2 +-
...g.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin | 1 -
...org.apache.isis.core.plugins.classdiscovery.ClassDiscoveryPlugin | 1 +
.../org/apache/isis/core/runtime/services/ServiceInstantiator.java | 2 +-
.../isis/core/runtime/services/ServicesInstallerFromAnnotation.java | 2 +-
.../core/runtime/services/background/BackgroundServiceDefault.java | 2 +-
.../core/runtime/systemusinginstallers/IsisComponentProvider.java | 2 +-
.../runtime/systemusinginstallers/PersistenceCapableTypeFinder.java | 2 +-
.../main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java | 2 +-
23 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java b/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java
index 89da112..b328945 100644
--- a/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java
+++ b/core/commons/src/main/java/org/apache/isis/applib/internal/context/_Plugin.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.internal.base._NullSafe;
import org.apache.isis.applib.internal.collections._Sets;
-import org.apache.isis.commons.plugins.PluginResolveException;
+import org.apache.isis.core.plugins.PluginResolveException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/commons/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java b/core/commons/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
index d9b0c32..7593f27 100644
--- a/core/commons/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
+++ b/core/commons/src/main/java/org/apache/isis/applib/internal/discover/_Discover.java
@@ -22,8 +22,8 @@ package org.apache.isis.applib.internal.discover;
import java.util.List;
import org.apache.isis.applib.internal.context._Plugin;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscovery;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscoveryPlugin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/commons/src/main/java/org/apache/isis/commons/plugins/PluginResolveException.java b/core/commons/src/main/java/org/apache/isis/core/plugins/PluginResolveException.java
similarity index 90%
rename from core/commons/src/main/java/org/apache/isis/commons/plugins/PluginResolveException.java
rename to core/commons/src/main/java/org/apache/isis/core/plugins/PluginResolveException.java
index 3f39581..5f37b8b 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/plugins/PluginResolveException.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/PluginResolveException.java
@@ -1,4 +1,4 @@
-package org.apache.isis.commons.plugins;
+package org.apache.isis.core.plugins;
public class PluginResolveException extends RuntimeException {
diff --git a/core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java b/core/commons/src/main/java/org/apache/isis/core/plugins/classdiscovery/ClassDiscovery.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java
rename to core/commons/src/main/java/org/apache/isis/core/plugins/classdiscovery/ClassDiscovery.java
index b9e07f9..72b14a5 100644
--- a/core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscovery.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/classdiscovery/ClassDiscovery.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.plugins.classdiscovery;
+package org.apache.isis.core.plugins.classdiscovery;
import java.lang.annotation.Annotation;
import java.util.Collections;
diff --git a/core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java b/core/commons/src/main/java/org/apache/isis/core/plugins/classdiscovery/ClassDiscoveryPlugin.java
similarity index 97%
rename from core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java
rename to core/commons/src/main/java/org/apache/isis/core/plugins/classdiscovery/ClassDiscoveryPlugin.java
index f320b06..0a52096 100644
--- a/core/commons/src/main/java/org/apache/isis/applib/plugins/classdiscovery/ClassDiscoveryPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/classdiscovery/ClassDiscoveryPlugin.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.applib.plugins.classdiscovery;
+package org.apache.isis.core.plugins.classdiscovery;
import java.util.List;
diff --git a/core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java b/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactory.java
similarity index 98%
rename from core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java
rename to core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactory.java
index b44936b..616810e 100644
--- a/core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactory.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.plugins.codegen;
+package org.apache.isis.core.plugins.codegen;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
diff --git a/core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java b/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPlugin.java
similarity index 96%
rename from core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java
rename to core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPlugin.java
index dfadc62..8976967 100644
--- a/core/commons/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPlugin.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtime.plugins.codegen;
+package org.apache.isis.core.plugins.codegen;
import java.lang.reflect.Method;
import java.util.function.Predicate;
diff --git a/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java b/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
similarity index 74%
rename from core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
rename to core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
index 0154f46..e8e80c6 100644
--- a/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
+++ b/core/plugins/codegen-bytebuddy/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingByteBuddy.java
@@ -1,9 +1,11 @@
-package org.apache.isis.core.runtime.plugins.codegen;
+package org.apache.isis.core.plugins.codegen;
import java.lang.reflect.Method;
import java.util.function.Predicate;
import org.apache.isis.applib.internal.exceptions._Exceptions;
+import org.apache.isis.core.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin;
public class ProxyFactoryPluginUsingByteBuddy implements ProxyFactoryPlugin {
diff --git a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
new file mode 100644
index 0000000..25e0269
--- /dev/null
+++ b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
@@ -0,0 +1 @@
+org.apache.isis.core.plugins.codegen.ProxyFactoryPluginUsingByteBuddy
\ No newline at end of file
diff --git a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPlugin b/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPlugin
deleted file mode 100644
index f1dc631..0000000
--- a/core/plugins/codegen-bytebuddy/src/main/resources/META-INF/services/org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPlugin
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPluginUsingByteBuddy
\ No newline at end of file
diff --git a/core/plugins/codegen-javassist/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPluginUsingJavassist.java b/core/plugins/codegen-javassist/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingJavassist.java
similarity index 95%
rename from core/plugins/codegen-javassist/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPluginUsingJavassist.java
rename to core/plugins/codegen-javassist/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingJavassist.java
index 5c92541..8e20ed5 100644
--- a/core/plugins/codegen-javassist/src/main/java/org/apache/isis/core/runtime/plugins/codegen/ProxyFactoryPluginUsingJavassist.java
+++ b/core/plugins/codegen-javassist/src/main/java/org/apache/isis/core/plugins/codegen/ProxyFactoryPluginUsingJavassist.java
@@ -1,4 +1,4 @@
-package org.apache.isis.core.runtime.plugins.codegen;
+package org.apache.isis.core.plugins.codegen;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -11,6 +11,8 @@ import org.apache.isis.applib.internal._Constants;
import org.apache.isis.applib.internal.base._Casts;
import org.apache.isis.applib.internal.base._NullSafe;
import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin;
import org.objenesis.Objenesis;
import org.objenesis.ObjenesisStd;
diff --git a/core/plugins/codegen-javassist/src/main/resources/META-INF/services/org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPlugin b/core/plugins/codegen-javassist/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
similarity index 100%
rename from core/plugins/codegen-javassist/src/main/resources/META-INF/services/org.apache.isis.core.runtime.plugins.codegen.ProxyFactoryPlugin
rename to core/plugins/codegen-javassist/src/main/resources/META-INF/services/org.apache.isis.core.plugins.codegen.ProxyFactoryPlugin
diff --git a/core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ClassDiscoveryPluginUsingReflections.java b/core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ClassDiscoveryPluginUsingReflections.java
similarity index 83%
rename from core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ClassDiscoveryPluginUsingReflections.java
rename to core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ClassDiscoveryPluginUsingReflections.java
index 6cb60e1..2703723 100644
--- a/core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ClassDiscoveryPluginUsingReflections.java
+++ b/core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ClassDiscoveryPluginUsingReflections.java
@@ -1,10 +1,10 @@
-package org.apache.isis.applib.plugins.classdiscovery.reflections;
+package org.apache.isis.core.plugins.classdiscovery.reflections;
import java.util.List;
import org.apache.isis.applib.internal.context._Context;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscovery;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscoveryPlugin;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.util.ClasspathHelper;
diff --git a/core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ReflectDiscovery.java b/core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ReflectDiscovery.java
similarity index 93%
rename from core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ReflectDiscovery.java
rename to core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ReflectDiscovery.java
index 0d04799..2337570 100644
--- a/core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ReflectDiscovery.java
+++ b/core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ReflectDiscovery.java
@@ -1,4 +1,4 @@
-package org.apache.isis.applib.plugins.classdiscovery.reflections;
+package org.apache.isis.core.plugins.classdiscovery.reflections;
import java.lang.annotation.Annotation;
import java.util.HashSet;
@@ -11,7 +11,7 @@ import java.util.stream.Stream;
import javax.validation.constraints.NotNull;
import org.apache.isis.applib.internal.base._NullSafe;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscovery;
import org.reflections.Reflections;
/**
diff --git a/core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ReflectManifest.java b/core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ReflectManifest.java
similarity index 98%
rename from core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ReflectManifest.java
rename to core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ReflectManifest.java
index 6538d6e..2a5b463 100644
--- a/core/plugins/discovery-reflections/src/main/java/org/apache/isis/applib/plugins/classdiscovery/reflections/ReflectManifest.java
+++ b/core/plugins/discovery-reflections/src/main/java/org/apache/isis/core/plugins/classdiscovery/reflections/ReflectManifest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.applib.plugins.classdiscovery.reflections;
+package org.apache.isis.core.plugins.classdiscovery.reflections;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
diff --git a/core/plugins/discovery-reflections/src/main/resources/META-INF/services/org.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin b/core/plugins/discovery-reflections/src/main/resources/META-INF/services/org.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin
deleted file mode 100644
index a3e4d44..0000000
--- a/core/plugins/discovery-reflections/src/main/resources/META-INF/services/org.apache.isis.applib.plugins.classdiscovery.ClassDiscoveryPlugin
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.isis.applib.plugins.classdiscovery.reflections.ClassDiscoveryPluginUsingReflections
\ No newline at end of file
diff --git a/core/plugins/discovery-reflections/src/main/resources/META-INF/services/org.apache.isis.core.plugins.classdiscovery.ClassDiscoveryPlugin b/core/plugins/discovery-reflections/src/main/resources/META-INF/services/org.apache.isis.core.plugins.classdiscovery.ClassDiscoveryPlugin
new file mode 100644
index 0000000..910fddb
--- /dev/null
+++ b/core/plugins/discovery-reflections/src/main/resources/META-INF/services/org.apache.isis.core.plugins.classdiscovery.ClassDiscoveryPlugin
@@ -0,0 +1 @@
+org.apache.isis.core.plugins.classdiscovery.reflections.ClassDiscoveryPluginUsingReflections
\ No newline at end of file
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
index 079aaf0..a43a71f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServiceInstantiator.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.commons.lang.MethodExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.core.runtime.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.plugins.codegen.ProxyFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
index 0cde184..2713d4a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromAnnotation.java
@@ -34,10 +34,10 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.internal.discover._Discover;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceMenuOrder;
import org.apache.isis.core.metamodel.util.DeweyOrderComparator;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscovery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index af07168..e9aa480 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.runtime.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.plugins.codegen.ProxyFactory;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 6957d9f..278c64f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -33,7 +33,6 @@ import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.internal.discover._Discover;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.factory.InstanceUtil;
@@ -44,6 +43,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscovery;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/PersistenceCapableTypeFinder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/PersistenceCapableTypeFinder.java
index 32a67e2..8f4f92d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/PersistenceCapableTypeFinder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/PersistenceCapableTypeFinder.java
@@ -26,7 +26,7 @@ import java.util.Set;
import javax.jdo.annotations.PersistenceCapable;
import org.apache.isis.applib.internal.base._Casts;
-import org.apache.isis.applib.plugins.classdiscovery.ClassDiscovery;
+import org.apache.isis.core.plugins.classdiscovery.ClassDiscovery;
/**
*
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
index a66acdf..6b2a64d 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/proxy/ProxyCreator.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.internal.collections._Arrays;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.core.commons.lang.ArrayExtensions;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.core.runtime.plugins.codegen.ProxyFactory;
+import org.apache.isis.core.plugins.codegen.ProxyFactory;
import org.apache.isis.core.wrapper.handlers.DelegatingInvocationHandler;
import com.google.common.collect.MapMaker;
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.