[isis] branch 2039-Redesign_of_Config updated: ISIS-2039: reorg. packages

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 2039-Redesign_of_Config
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/2039-Redesign_of_Config by this push:
     new fdfc07e  ISIS-2039: reorg. packages
fdfc07e is described below

commit fdfc07ebe3b7950b5d85b245654689759f4bb23b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Nov 29 23:27:29 2018 +0100

    ISIS-2039: reorg. packages
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2039
---
 .../isis/applib/services/confview}/ConfigurationMenu.java   |   2 +-
 .../applib/services/confview}/ConfigurationProperty.java    |   2 +-
 .../services/confview}/ConfigurationProperty.layout.xml     |   0
 .../applib/services/confview}/ConfigurationProperty.png     | Bin
 .../applib/services/confview}/ConfigurationViewService.java |   2 +-
 .../apache/isis/applib/services/confview}/package-info.java |   4 ++--
 .../services/view/ConfigurationViewServiceDefault.java      |   2 ++
 .../runtime/system/session/IsisSessionFactoryBuilder.java   |   2 +-
 8 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationMenu.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
index b2c8a43..12f1c3b 100644
--- a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationMenu.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.config.services.view;
+package org.apache.isis.applib.services.confview;
 
 import java.util.Set;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
similarity index 97%
rename from core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
index 7467998..631c0ec 100644
--- a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.config.services.view;
+package org.apache.isis.applib.services.confview;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.layout.xml b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.layout.xml
rename to core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.layout.xml
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.png b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.png
similarity index 100%
rename from core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationProperty.png
rename to core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.png
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewService.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java
similarity index 95%
rename from core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewService.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java
index fff473e..3e5c040 100644
--- a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewService.java
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.config.services.view;
+package org.apache.isis.applib.services.confview;
 
 import java.util.Set;
 
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/package-info.java b/core/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java
similarity index 86%
rename from core/config/src/main/java/org/apache/isis/config/services/view/package-info.java
rename to core/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java
index f2bb8dc..f54a267 100644
--- a/core/config/src/main/java/org/apache/isis/config/services/view/package-info.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/confview/package-info.java
@@ -18,9 +18,9 @@
  */
 
 /**
- * The {@link org.apache.isis.config.services.view.ConfigurationViewService} allows domain objects to read the
+ * The {@link org.apache.isis.applib.services.confview.ConfigurationViewService} allows domain objects to read the
  * configuration properties aggregated from the various configuration files.
  *
  * @see <a href="http://isis.apache.org/guides/rgsvc/rgsvc.html#_rgsvc_core-domain-api_ConfigurationService">Reference guide</a>
  */
-package org.apache.isis.config.services.view;
\ No newline at end of file
+package org.apache.isis.applib.services.confview;
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java b/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java
index fb3f6db..e68100c 100644
--- a/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java
+++ b/core/config/src/main/java/org/apache/isis/config/services/view/ConfigurationViewServiceDefault.java
@@ -25,6 +25,8 @@ import java.util.TreeSet;
 
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.services.confview.ConfigurationProperty;
+import org.apache.isis.applib.services.confview.ConfigurationViewService;
 import org.apache.isis.commons.internal.base._Lazy;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.config.ConfigurationConstants;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index 4ea1097..a13a471 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -33,11 +33,11 @@ import org.apache.isis.applib.AppManifest;
 import org.apache.isis.applib.clock.Clock;
 import org.apache.isis.applib.fixtures.FixtureClock;
 import org.apache.isis.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.applib.services.confview.ConfigurationViewService;
 import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
 import org.apache.isis.commons.internal.context._Context;
 import org.apache.isis.config.IsisConfiguration;
 import org.apache.isis.config.internal._Config;
-import org.apache.isis.config.services.view.ConfigurationViewService;
 import org.apache.isis.config.services.view.ConfigurationViewServiceDefault;
 import org.apache.isis.core.commons.lang.ListExtensions;
 import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;