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
The following commit(s) were added to refs/heads/master by this push:
new be778712d0 ISIS-3099: restructure artifact 'viewer-common' into
'viewer-commons/modle'
be778712d0 is described below
commit be778712d0526ffb81db45a3f55f264e0e0e38e1
Author: andi-huber <[email protected]>
AuthorDate: Sat Jul 30 08:55:48 2022 +0200
ISIS-3099: restructure artifact 'viewer-common' into
'viewer-commons/modle'
- so viewer-commons may receive additional sub-artifacts
---
core/pom.xml | 4 +--
incubator/pom.xml | 1 -
incubator/viewers/graphql/model/pom.xml | 2 +-
incubator/viewers/javafx/model/pom.xml | 2 +-
incubator/viewers/vaadin/model/pom.xml | 2 +-
pom.xml | 4 +--
regressiontests/pom.xml | 2 +-
viewers/{common => commons/model}/pom.xml | 15 ++++------
.../common/applib/mixins/Object_impersonate.java | 0
.../applib/mixins/Object_impersonateWithRoles.java | 0
.../services/userprof/UserProfileUiModel.java | 0
.../userprof/UserProfileUiModelProvider.java | 0
.../isis/viewer/common/model/HasParentUiModel.java | 0
.../common/model/IsisModuleViewerCommon.java | 0
.../viewer/common/model/PlacementDirection.java | 0
.../viewer/common/model/StringForRendering.java | 0
.../viewer/common/model/UiComponentHolder.java | 0
.../common/model/action/ActionFormUiModel.java | 0
.../viewer/common/model/action/ActionUiModel.java | 0
.../common/model/action/HasActionInteraction.java | 0
.../common/model/action/HasManagedAction.java | 0
.../model/action/decorator/ActionUiDecorator.java | 0
.../common/model/binding/BindingConverter.java | 0
.../binding/BindingConverterForManagedObject.java | 0
.../common/model/branding/BrandingUiModel.java | 0
.../model/branding/BrandingUiModelProvider.java | 0
.../common/model/components/ComponentType.java | 0
.../model/components/UiComponentFactory.java | 0
.../viewer/common/model/debug/DebugUiModel.java | 0
.../common/model/decorators/ConfirmDecorator.java | 0
.../common/model/decorators/DangerDecorator.java | 0
.../model/decorators/DisablingDecorator.java | 0
.../model/decorators/FormLabelDecorator.java | 0
.../common/model/decorators/IconDecorator.java | 0
.../model/decorators/PrototypingDecorator.java | 0
.../common/model/decorators/TooltipDecorator.java | 0
.../common/model/feature/ParameterUiModel.java | 0
.../common/model/feature/PropertyUiModel.java | 0
.../viewer/common/model/feature/ScalarUiModel.java | 0
.../common/model/gridlayout/UiGridLayout.java | 0
.../viewer/common/model/header/HeaderUiModel.java | 0
.../common/model/header/HeaderUiModelProvider.java | 0
.../isis/viewer/common/model/menu/MenuItemDto.java | 0
.../isis/viewer/common/model/menu/MenuUiModel.java | 0
.../common/model/menu/MenuUiModelProvider.java | 0
.../model/menu/MenuUiModel_buildMenuItems.java | 0
.../isis/viewer/common/model/menu/MenuVisitor.java | 0
.../isis/viewer/common/model/mixin/HasTitle.java | 0
.../viewer/common/model/mixin/HasUiComponent.java | 0
.../viewer/common/model/mixin/HasUiMenuItem.java | 0
.../viewer/common/model/object/ObjectUiModel.java | 0
.../common/model/object/SimpleObjectUiModel.java | 0
.../UserProfileUiModelProviderDefault.java | 0
viewers/{common => commons}/pom.xml | 33 ++++++----------------
viewers/restfulobjects/viewer/pom.xml | 2 +-
viewers/wicket/model/pom.xml | 2 +-
56 files changed, 24 insertions(+), 45 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3c1404fe3b..3a6a4507ec 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -519,7 +519,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+
<artifactId>isis-viewer-commons-model</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -1619,7 +1619,7 @@
<module>../security/shiro</module>
<module>../security/spring</module>
- <module>../viewers/common</module>
+ <module>../viewers/commons</module>
<module>../viewers/restfulobjects</module>
<module>../viewers/wicket</module>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 73d3dc5b50..b9ffa71183 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -209,7 +209,6 @@
<module>viewers/graphql</module>
<module>viewers/javafx</module>
<module>viewers/vaadin</module>
- <module>../valuetypes/prism/vaadin</module>
<module>../valuetypes/asciidoc/ui/vaadin</module>
</modules>
diff --git a/incubator/viewers/graphql/model/pom.xml
b/incubator/viewers/graphql/model/pom.xml
index f70a2243c0..156708b8ba 100644
--- a/incubator/viewers/graphql/model/pom.xml
+++ b/incubator/viewers/graphql/model/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+ <artifactId>isis-viewer-commons-model</artifactId>
</dependency>
<dependency>
diff --git a/incubator/viewers/javafx/model/pom.xml
b/incubator/viewers/javafx/model/pom.xml
index e9b2a3bacf..a98ae58880 100644
--- a/incubator/viewers/javafx/model/pom.xml
+++ b/incubator/viewers/javafx/model/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+ <artifactId>isis-viewer-commons-model</artifactId>
</dependency>
<dependency>
diff --git a/incubator/viewers/vaadin/model/pom.xml
b/incubator/viewers/vaadin/model/pom.xml
index bb516b42ec..485e6ecb72 100644
--- a/incubator/viewers/vaadin/model/pom.xml
+++ b/incubator/viewers/vaadin/model/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+ <artifactId>isis-viewer-commons-model</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 3130f72a39..6d0a0153ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,7 +228,7 @@
<module>examples/demo/domain</module>
<module>examples/demo/web</module>
- <module>examples/demo/wicket/common</module>
+ <module>examples/demo/wicket/commons</module>
<module>examples/demo/wicket/jdo</module>
<module>examples/demo/wicket/jpa</module>
</modules>
@@ -248,7 +248,7 @@
<module>incubator/viewers/vaadin</module>
<module>examples/demo/domain</module>
<module>examples/demo/web</module>
- <module>examples/demo/wicket/common</module>
+ <module>examples/demo/wicket/commons</module>
<module>examples/demo/wicket/jdo</module>
<module>examples/demo/vaadin</module>
diff --git a/regressiontests/pom.xml b/regressiontests/pom.xml
index 0b3e9d044f..999079fce4 100644
--- a/regressiontests/pom.xml
+++ b/regressiontests/pom.xml
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+
<artifactId>isis-viewer-commons-model</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/viewers/common/pom.xml b/viewers/commons/model/pom.xml
similarity index 81%
copy from viewers/common/pom.xml
copy to viewers/commons/model/pom.xml
index 14bb9dc5fa..51a4cc20ed 100644
--- a/viewers/common/pom.xml
+++ b/viewers/commons/model/pom.xml
@@ -22,19 +22,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-commons</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <relativePath>../../core/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
- <name>Apache Isis Viewer - Common Model</name>
+ <artifactId>isis-viewer-commons-model</artifactId>
+ <name>Apache Isis Viewer - Commons Model</name>
<properties>
-
<jar-plugin.automaticModuleName>org.apache.isis.viewer.common</jar-plugin.automaticModuleName>
-
<git-plugin.propertiesDir>org/apache/isis/viewer/common</git-plugin.propertiesDir>
+
<jar-plugin.automaticModuleName>org.apache.isis.viewer.commons.model</jar-plugin.automaticModuleName>
+
<git-plugin.propertiesDir>org/apache/isis/viewer/commons/model</git-plugin.propertiesDir>
</properties>
<dependencies>
@@ -60,5 +58,4 @@
</dependencies>
-
</project>
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonate.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonate.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonate.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonate.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonateWithRoles.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonateWithRoles.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonateWithRoles.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/mixins/Object_impersonateWithRoles.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModelProvider.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModelProvider.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModelProvider.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/applib/services/userprof/UserProfileUiModelProvider.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/HasParentUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/HasParentUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/HasParentUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/HasParentUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/IsisModuleViewerCommon.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/PlacementDirection.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/PlacementDirection.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/PlacementDirection.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/PlacementDirection.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/StringForRendering.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/StringForRendering.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/StringForRendering.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/StringForRendering.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/UiComponentHolder.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/UiComponentHolder.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/UiComponentHolder.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/UiComponentHolder.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionFormUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/ActionFormUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionFormUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/ActionFormUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/ActionUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/HasActionInteraction.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/HasActionInteraction.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/HasActionInteraction.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/HasActionInteraction.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/HasManagedAction.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/HasManagedAction.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/HasManagedAction.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/HasManagedAction.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/action/decorator/ActionUiDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverter.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverterForManagedObject.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverterForManagedObject.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverterForManagedObject.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/binding/BindingConverterForManagedObject.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/branding/BrandingUiModelProvider.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/ComponentType.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/components/ComponentType.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/ComponentType.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/components/ComponentType.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/components/UiComponentFactory.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/debug/DebugUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/debug/DebugUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/debug/DebugUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/debug/DebugUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/ConfirmDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/ConfirmDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/ConfirmDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/ConfirmDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/DangerDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/DangerDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/DangerDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/DangerDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/DisablingDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/DisablingDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/DisablingDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/DisablingDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/FormLabelDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/FormLabelDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/FormLabelDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/FormLabelDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/IconDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/IconDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/IconDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/IconDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/PrototypingDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/PrototypingDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/PrototypingDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/PrototypingDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/TooltipDecorator.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/TooltipDecorator.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/decorators/TooltipDecorator.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/decorators/TooltipDecorator.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/feature/ParameterUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/feature/ParameterUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/feature/ParameterUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/feature/ParameterUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/feature/PropertyUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/feature/PropertyUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/feature/PropertyUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/feature/PropertyUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/feature/ScalarUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/feature/ScalarUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/feature/ScalarUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/feature/ScalarUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/header/HeaderUiModelProvider.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuItemDto.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuItemDto.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuItemDto.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuItemDto.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModelProvider.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModelProvider.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModelProvider.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModelProvider.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuUiModel_buildMenuItems.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuVisitor.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuVisitor.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/menu/MenuVisitor.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/menu/MenuVisitor.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mixin/HasTitle.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/mixin/HasTitle.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/mixin/HasTitle.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/mixin/HasTitle.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiComponent.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiComponent.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiComponent.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiComponent.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiMenuItem.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiMenuItem.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiMenuItem.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/mixin/HasUiMenuItem.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/object/ObjectUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/object/SimpleObjectUiModel.java
diff --git
a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProviderDefault.java
b/viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProviderDefault.java
similarity index 100%
rename from
viewers/common/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProviderDefault.java
rename to
viewers/commons/model/src/main/java/org/apache/isis/viewer/common/model/userprofile/UserProfileUiModelProviderDefault.java
diff --git a/viewers/common/pom.xml b/viewers/commons/pom.xml
similarity index 62%
rename from viewers/common/pom.xml
rename to viewers/commons/pom.xml
index 14bb9dc5fa..674ae74813 100644
--- a/viewers/common/pom.xml
+++ b/viewers/commons/pom.xml
@@ -29,36 +29,19 @@
</parent>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
- <name>Apache Isis Viewer - Common Model</name>
+ <artifactId>isis-viewer-commons</artifactId>
+ <name>Apache Isis Viewer - Commons</name>
+
+ <packaging>pom</packaging>
<properties>
-
<jar-plugin.automaticModuleName>org.apache.isis.viewer.common</jar-plugin.automaticModuleName>
-
<git-plugin.propertiesDir>org/apache/isis/viewer/common</git-plugin.propertiesDir>
</properties>
<dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>font-awesome</artifactId>
- <version>6.1.2</version> <!-- must correspond to entry
in /viewer/common/.../IconDecorator.java -->
- </dependency>
-
- <!-- TESTING -->
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-internaltestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
-
+
+ <modules>
+ <module>model</module>
+ </modules>
</project>
diff --git a/viewers/restfulobjects/viewer/pom.xml
b/viewers/restfulobjects/viewer/pom.xml
index 5db682ce50..2fe944738c 100644
--- a/viewers/restfulobjects/viewer/pom.xml
+++ b/viewers/restfulobjects/viewer/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+ <artifactId>isis-viewer-commons-model</artifactId>
</dependency>
<dependency>
diff --git a/viewers/wicket/model/pom.xml b/viewers/wicket/model/pom.xml
index d92ede64d1..1459fdb36e 100644
--- a/viewers/wicket/model/pom.xml
+++ b/viewers/wicket/model/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-common</artifactId>
+ <artifactId>isis-viewer-commons-model</artifactId>
</dependency>
<!-- TESTING -->
