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 2022/04/07 06:44:09 UTC
[isis] branch master updated: ISIS-2994: remove the '3' in bootstrap class/package names (5)
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 78a915692b ISIS-2994: remove the '3' in bootstrap class/package names (5)
78a915692b is described below
commit 78a915692bd5b902d58b6ba0cd464f7d57dd427e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 7 08:44:02 2022 +0200
ISIS-2994: remove the '3' in bootstrap class/package names (5)
---
.../java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java | 2 +-
.../isis/core/metamodel/_testing/MetaModelContext_forTesting.java | 2 +-
.../services/grid/{bootstrap3 => bootstrap}/GridFallbackLayout.xml | 0
.../grid/{bootstrap3 => bootstrap}/GridSystemServiceBootstrap.java | 2 +-
.../metamodel/services/grid/{bootstrap3 => bootstrap}/_GridModel.java | 2 +-
.../core/runtimeservices/menubars/{bootstrap3 => bootstrap}/Bar.java | 2 +-
.../menubars/{bootstrap3 => bootstrap}/MenuBarsServiceBS3Test.java | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
index 4a66e3ae0b..4c65b47173 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.services.exceprecog.ExceptionRecognizerFor
import org.apache.isis.core.metamodel.services.grid.GridLoaderServiceDefault;
import org.apache.isis.core.metamodel.services.grid.GridReaderUsingJaxb;
import org.apache.isis.core.metamodel.services.grid.GridServiceDefault;
-import org.apache.isis.core.metamodel.services.grid.bootstrap3.GridSystemServiceBootstrap;
+import org.apache.isis.core.metamodel.services.grid.bootstrap.GridSystemServiceBootstrap;
import org.apache.isis.core.metamodel.services.layout.LayoutServiceDefault;
import org.apache.isis.core.metamodel.services.metamodel.MetaModelServiceDefault;
import org.apache.isis.core.metamodel.services.registry.ServiceRegistryDefault;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
index 2825468bc6..02ff39fb20 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/_testing/MetaModelContext_forTesting.java
@@ -79,7 +79,7 @@ import org.apache.isis.core.metamodel.services.events.MetamodelEventService;
import org.apache.isis.core.metamodel.services.grid.GridLoaderServiceDefault;
import org.apache.isis.core.metamodel.services.grid.GridReaderUsingJaxb;
import org.apache.isis.core.metamodel.services.grid.GridServiceDefault;
-import org.apache.isis.core.metamodel.services.grid.bootstrap3.GridSystemServiceBootstrap;
+import org.apache.isis.core.metamodel.services.grid.bootstrap.GridSystemServiceBootstrap;
import org.apache.isis.core.metamodel.services.layout.LayoutServiceDefault;
import org.apache.isis.core.metamodel.services.message.MessageServiceNoop;
import org.apache.isis.core.metamodel.services.title.TitleServiceDefault;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridFallbackLayout.xml b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridFallbackLayout.xml
similarity index 100%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridFallbackLayout.xml
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridFallbackLayout.xml
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
index a536c78b89..a02bbd86f6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBootstrap.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.services.grid.bootstrap3;
+package org.apache.isis.core.metamodel.services.grid.bootstrap;
import java.util.Arrays;
import java.util.Collection;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/_GridModel.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/_GridModel.java
index ece0266483..5cfe4b76d0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/_GridModel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap/_GridModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.metamodel.services.grid.bootstrap3;
+package org.apache.isis.core.metamodel.services.grid.bootstrap;
import java.util.Collection;
import java.util.LinkedHashMap;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/Bar.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/Bar.java
similarity index 94%
rename from core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/Bar.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/Bar.java
index 106859317d..12e3aa86b3 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/Bar.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/Bar.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtimeservices.menubars.bootstrap3;
+package org.apache.isis.core.runtimeservices.menubars.bootstrap;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainService;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS3Test.java
similarity index 99%
rename from core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3Test.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS3Test.java
index fa305e1e4d..0bf3eb2421 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS3Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.core.runtimeservices.menubars.bootstrap3;
+package org.apache.isis.core.runtimeservices.menubars.bootstrap;
import java.nio.charset.StandardCharsets;