[isis] branch master updated: ISIS-2562: SecMan: harmonize model packages (2)

[ah...@apache.org]

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 9864498  ISIS-2562: SecMan: harmonize model packages (2)
9864498 is described below

commit 9864498fc0ed53b6cfd6e979acf8e2170e918327
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 4 19:32:13 2021 +0100

    ISIS-2562: SecMan: harmonize model packages (2)
---
 .../secman/model/dom/{features => feature}/ApplicationClass.java        | 2 +-
 .../secman/model/dom/{features => feature}/ApplicationClass.layout.xml  | 0
 .../secman/model/dom/{features => feature}/ApplicationClassAction.java  | 2 +-
 .../model/dom/{features => feature}/ApplicationClassAction.layout.xml   | 0
 .../model/dom/{features => feature}/ApplicationClassCollection.java     | 2 +-
 .../dom/{features => feature}/ApplicationClassCollection.layout.xml     | 0
 .../secman/model/dom/{features => feature}/ApplicationClassMember.java  | 2 +-
 .../model/dom/{features => feature}/ApplicationClassProperty.java       | 2 +-
 .../model/dom/{features => feature}/ApplicationClassProperty.layout.xml | 0
 .../model/dom/{features => feature}/ApplicationFeatureViewModel.java    | 2 +-
 .../model/dom/{features => feature}/ApplicationFeatureViewModels.java   | 2 +-
 .../secman/model/dom/{features => feature}/ApplicationPackage.java      | 2 +-
 .../model/dom/{features => feature}/ApplicationPackage.layout.xml       | 0
 .../model/dom/{features => feature}/ApplicationPermission_feature.java  | 2 +-
 .../isis/extensions/secman/model/dom/user/UserPermissionViewModel.java  | 2 +-
 15 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClass.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClass.java
index 8e8ecca..c65813c 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClass.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import java.util.List;
 import java.util.SortedSet;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClass.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClass.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClass.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassAction.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassAction.java
index e6be30a..6d9dcbd 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassAction.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassAction.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassAction.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassAction.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassCollection.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassCollection.java
index fbcd26c..3381723 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassCollection.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassCollection.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassCollection.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassCollection.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassMember.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassMember.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassMember.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassMember.java
index c5867f7..d0242f1 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassMember.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassMember.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import org.apache.isis.applib.annotation.BookmarkPolicy;
 import org.apache.isis.applib.annotation.DomainObject;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassProperty.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassProperty.java
index 11f50f0..9775e5f 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassProperty.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassProperty.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationClassProperty.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationClassProperty.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
similarity index 99%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModel.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
index a0414e6..59910eb 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModel.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import java.util.List;
 import java.util.SortedSet;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModels.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModels.java
similarity index 98%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModels.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModels.java
index dd485c4..b966d71 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationFeatureViewModels.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationFeatureViewModels.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPackage.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPackage.java
index 67db6ff..b5821de 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPackage.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import java.util.List;
 import java.util.SortedSet;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.layout.xml b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPackage.layout.xml
similarity index 100%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPackage.layout.xml
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPackage.layout.xml
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPermission_feature.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPermission_feature.java
similarity index 97%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPermission_feature.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPermission_feature.java
index a97fba0..b7b7085 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/features/ApplicationPermission_feature.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/feature/ApplicationPermission_feature.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.extensions.secman.model.dom.features;
+package org.apache.isis.extensions.secman.model.dom.feature;
 
 import javax.inject.Inject;
 
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
index e9ab332..13e1c9c 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
@@ -55,7 +55,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionVal
 import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionValueSet;
 import org.apache.isis.extensions.secman.api.user.ApplicationUser;
 import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
-import org.apache.isis.extensions.secman.model.dom.features.ApplicationFeatureViewModel;
+import org.apache.isis.extensions.secman.model.dom.feature.ApplicationFeatureViewModel;
 
 import lombok.val;