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:40:15 UTC
[isis] branch master updated: ISIS-2994: remove the '3' in bootstrap class/package names (4)
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 2b9ffa3682 ISIS-2994: remove the '3' in bootstrap class/package names (4)
2b9ffa3682 is described below
commit 2b9ffa36826e48fa2d0fb682263e24be8fc54e33
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Apr 7 08:40:09 2022 +0200
ISIS-2994: remove the '3' in bootstrap class/package names (4)
---
.../org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java | 12 ++++++------
.../org/apache/isis/applib/layout/grid/bootstrap/BSTab.java | 8 ++++----
.../facets/members/layout/group/GroupIdAndName.java | 2 +-
.../menubars/{BS3MenuBarsTest.java => BSMenuBarsTest.java} | 2 +-
.../core/runtimeservices/IsisModuleCoreRuntimeServices.java | 4 ++--
.../MenuBarsServiceBS.java} | 8 ++++----
.../menubars/{bootstrap3 => bootstrap}/ServiceAndAction.java | 2 +-
.../core/runtimeservices/RuntimeServicesTestAbstract.java | 4 ++--
.../menubars/bootstrap3/MenuBarsServiceBS3Test.java | 7 ++++---
.../isis/incubator/viewer/vaadin/ui/pages/main/TabUtil.java | 4 ++--
.../isis/viewer/common/model/gridlayout/UiGridLayout.java | 6 +++---
.../viewer/restfulobjects/applib/RepresentationType.java | 8 ++++----
.../isis/viewer/restfulobjects/applib/RestfulMediaType.java | 8 ++++----
.../applib/domainobjects/DomainObjectResource.java | 4 ++--
.../applib/domaintypes/DomainTypeResource.java | 4 ++--
.../viewer/resources/DomainObjectResourceServerside.java | 4 ++--
.../viewer/resources/DomainTypeResourceServerside.java | 4 ++--
17 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java
index f050a2794f..30e14dee76 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSGrid.java
@@ -158,7 +158,7 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
@Override
public void visit(final Grid.Visitor visitor) {
- final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final BSGrid.Visitor bsVisitor = asBsVisitor(visitor);
bsVisitor.preVisit(this);
bsVisitor.visit(this);
traverseRows(this, visitor);
@@ -166,7 +166,7 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
}
protected void traverseRows(final BSRowOwner rowOwner, final Grid.Visitor visitor) {
- final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final BSGrid.Visitor bsVisitor = asBsVisitor(visitor);
final List<BSRow> rows = rowOwner.getRows();
for (BSRow bsRow : new ArrayList<>(rows)) {
bsRow.setOwner(this);
@@ -178,7 +178,7 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
}
private void traverseCols(final Grid.Visitor visitor, final BSRow bsRow) {
- final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final BSGrid.Visitor bsVisitor = asBsVisitor(visitor);
final List<BSRowContent> cols = bsRow.getCols();
for (BSRowContent rowContent : new ArrayList<>(cols)) {
rowContent.setOwner(bsRow);
@@ -215,7 +215,7 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
private void traverseTabGroups(
final BSTabGroupOwner bsTabGroupOwner,
final Grid.Visitor visitor) {
- final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final BSGrid.Visitor bsVisitor = asBsVisitor(visitor);
final List<BSTabGroup> tabGroups = bsTabGroupOwner.getTabGroups();
for (BSTabGroup bsTabGroup : new ArrayList<>(tabGroups)) {
bsTabGroup.setOwner(bsTabGroupOwner);
@@ -229,7 +229,7 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
private void traverseTabs(
final BSTabOwner bsTabOwner,
final Grid.Visitor visitor) {
- final BSGrid.Visitor bsVisitor = asBs3Visitor(visitor);
+ final BSGrid.Visitor bsVisitor = asBsVisitor(visitor);
final List<BSTab> tabs = bsTabOwner.getTabs();
for (BSTab tab : new ArrayList<>(tabs)) {
tab.setOwner(bsTabOwner);
@@ -240,7 +240,7 @@ public class BSGrid extends GridAbstract implements BSElement, Dto, BSRowOwner {
}
}
- private static Visitor asBs3Visitor(final Grid.Visitor visitor) {
+ private static Visitor asBsVisitor(final Grid.Visitor visitor) {
return visitor instanceof Visitor? (Visitor) visitor : new BSGrid.VisitorAdapter() {
@Override public void visit(final DomainObjectLayoutData domainObjectLayoutData) {
visitor.visit(domainObjectLayoutData);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java
index 06d7059469..2cafad17f9 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap/BSTab.java
@@ -106,8 +106,8 @@ public class BSTab extends BSElementAbstract implements BSRowOwner {
return new Predicate<BSTab>() {
@Override
- public boolean test(final BSTab thisBs3Tab) {
- final BSGrid owningGrid = thisBs3Tab.getGrid();
+ public boolean test(final BSTab thisBsTab) {
+ final BSGrid owningGrid = thisBsTab.getGrid();
owningGrid.visit(new BSGrid.VisitorAdapter() {
/**
@@ -118,14 +118,14 @@ public class BSTab extends BSElementAbstract implements BSRowOwner {
*/
@Override
public void preVisit(final BSTab bsTab) {
- if(bsTab == thisBs3Tab) {
+ if(bsTab == thisBsTab) {
foundContent.set(false);
visitingTheNode.set(true);
}
}
@Override public void postVisit(final BSTab bsTab) {
- if(bsTab == thisBs3Tab) {
+ if(bsTab == thisBsTab) {
visitingTheNode.set(false);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
index 122d115137..ccb96e789c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/layout/group/GroupIdAndName.java
@@ -151,7 +151,7 @@ implements
}
/**
- * @implNote this is a copy of the original logic from GridSystemServiceBS3
+ * @implNote this is a copy of the original logic from GridSystemServiceBS
*/
private static @NonNull String inferIdFromName(final @NonNull String name) {
if(name.isEmpty()) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
similarity index 98%
rename from core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
rename to core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
index b211ab2181..b4a595ddc7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BSMenuBarsTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.jaxb.JaxbService.Simple;
import org.apache.isis.commons.internal.resources._Resources;
-public class BS3MenuBarsTest {
+public class BSMenuBarsTest {
private JaxbService jaxbService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index adf5298409..c11b3b91c1 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -46,7 +46,7 @@ import org.apache.isis.core.runtimeservices.locale.LocaleChoiceProviderDefault;
import org.apache.isis.core.runtimeservices.locale.LanguageProviderDefault;
import org.apache.isis.core.runtimeservices.memento.ObjectMementoServiceDefault;
import org.apache.isis.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
-import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
+import org.apache.isis.core.runtimeservices.menubars.bootstrap.MenuBarsServiceBS;
import org.apache.isis.core.runtimeservices.message.MessageServiceDefault;
import org.apache.isis.core.runtimeservices.publish.CommandPublisherDefault;
import org.apache.isis.core.runtimeservices.publish.EntityChangesPublisherDefault;
@@ -100,7 +100,7 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
TranslationServicePo.class,
MemberExecutorServiceDefault.class,
MenuBarsLoaderServiceDefault.class,
- MenuBarsServiceBS3.class,
+ MenuBarsServiceBS.class,
MessageServiceDefault.class,
ObjectIconServiceDefault.class,
ScratchpadDefault.class,
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.java
index 47dae06c68..494a7bae60 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBS.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.util.List;
import java.util.Map;
@@ -80,12 +80,12 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isis.runtimeservices.MenuBarsServiceBS3")
+@Named("isis.runtimeservices.MenuBarsServiceBS")
@Priority(PriorityPrecedence.MIDPOINT)
-@Qualifier("BS3")
+@Qualifier("BS")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
@Log4j2
-public class MenuBarsServiceBS3
+public class MenuBarsServiceBS
implements MenuBarsService {
public static final String MB3_TNS = "http://isis.apache.org/applib/layout/menubars/bootstrap3";
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/ServiceAndAction.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/ServiceAndAction.java
index de5c173ef3..3ed40e114b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap/ServiceAndAction.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.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/RuntimeServicesTestAbstract.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/RuntimeServicesTestAbstract.java
index f9afba4069..eaaf107678 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/RuntimeServicesTestAbstract.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/RuntimeServicesTestAbstract.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting.MetaM
import org.apache.isis.core.metamodel.context.HasMetaModelContext;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
-import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
+import org.apache.isis.core.runtimeservices.menubars.bootstrap.MenuBarsServiceBS;
import lombok.Getter;
import lombok.val;
@@ -81,7 +81,7 @@ implements HasMetaModelContext {
val messageService = getServiceRegistry().lookupServiceElseFail(MessageService.class);
val jaxbService = getServiceRegistry().lookupServiceElseFail(JaxbService.class);
val menuBarsLoaderService = getServiceRegistry().lookupServiceElseFail(MenuBarsLoaderService.class);
- return new MenuBarsServiceBS3(
+ return new MenuBarsServiceBS(
menuBarsLoaderService,
messageService,
jaxbService,
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/bootstrap3/MenuBarsServiceBS3Test.java
index e105c7eeec..fa305e1e4d 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/bootstrap3/MenuBarsServiceBS3Test.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.Facet.Precedence;
import org.apache.isis.core.metamodel.facets.all.named.MemberNamedFacet;
import org.apache.isis.core.runtimeservices.RuntimeServicesTestAbstract;
import org.apache.isis.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
+import org.apache.isis.core.runtimeservices.menubars.bootstrap.MenuBarsServiceBS;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -39,10 +40,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import lombok.val;
-class MenuBarsServiceBS3Test
+class MenuBarsServiceBSTest
extends RuntimeServicesTestAbstract {
- private MenuBarsServiceBS3 menuBarsService;
+ private MenuBarsServiceBS menuBarsService;
private MenuBarsLoaderServiceDefault menuBarsLoaderService;
private LayoutService layoutService;
@@ -57,7 +58,7 @@ extends RuntimeServicesTestAbstract {
getConfiguration().getCore().getMetaModel().getIntrospector().setValidateIncrementally(false);
layoutService = getServiceRegistry().lookupServiceElseFail(LayoutService.class);
- menuBarsService = (MenuBarsServiceBS3) getServiceRegistry().lookupServiceElseFail(MenuBarsService.class);
+ menuBarsService = (MenuBarsServiceBS) getServiceRegistry().lookupServiceElseFail(MenuBarsService.class);
menuBarsLoaderService = (MenuBarsLoaderServiceDefault) getServiceRegistry().lookupServiceElseFail(MenuBarsLoaderService.class);
// double check, we are all set
diff --git a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/TabUtil.java b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/TabUtil.java
index 625af56085..f81519a21e 100644
--- a/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/TabUtil.java
+++ b/incubator/viewers/vaadin/ui/src/main/java/org/apache/isis/incubator/viewer/vaadin/ui/pages/main/TabUtil.java
@@ -28,7 +28,7 @@ import com.vaadin.flow.component.tabs.Tabs;
import com.vaadin.flow.router.RouteConfiguration;
import com.vaadin.flow.router.RouterLink;
-import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
+import org.apache.isis.core.runtimeservices.menubars.bootstrap.MenuBarsServiceBS;
import lombok.experimental.UtilityClass;
@@ -36,7 +36,7 @@ import lombok.experimental.UtilityClass;
@UtilityClass
final class TabUtil {
- static void createMenuTabs(MenuBarsServiceBS3 menuBarsService, Consumer<Tab> onTabCreated) {
+ static void createMenuTabs(MenuBarsServiceBS menuBarsService, Consumer<Tab> onTabCreated) {
// onTabCreated.accept(TabUtil.createTab("Dashboard", DashboardView.class));
}
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
index b7a3062531..7777f9c337 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/gridlayout/UiGridLayout.java
@@ -170,9 +170,9 @@ public class UiGridLayout {
}
- private <C, T> void visitTabGroup(final BSTabGroup bS3ColTabGroup, final C container, final Visitor<C, T> visitor) {
- val uiTabGroup = visitor.newTabGroup(container, bS3ColTabGroup);
- for(val bsTab: bS3ColTabGroup.getTabs()) {
+ private <C, T> void visitTabGroup(final BSTabGroup BSColTabGroup, final C container, final Visitor<C, T> visitor) {
+ val uiTabGroup = visitor.newTabGroup(container, BSColTabGroup);
+ for(val bsTab: BSColTabGroup.getTabs()) {
visitTab(bsTab, uiTabGroup, visitor);
}
}
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
index bb7ddf13bd..4d5fc845e0 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RepresentationType.java
@@ -101,12 +101,12 @@ public enum RepresentationType {
null,
DomainTypeRepresentation.class),
LAYOUT(
- RestfulMediaType.APPLICATION_JSON_LAYOUT_BS3,
- RestfulMediaType.APPLICATION_XML_LAYOUT_BS3,
+ RestfulMediaType.APPLICATION_JSON_LAYOUT_BS,
+ RestfulMediaType.APPLICATION_XML_LAYOUT_BS,
null),
OBJECT_LAYOUT(
- RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS3,
- RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS3,
+ RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS,
+ RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS,
null),
IMAGE(
"image/*",
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
index 57dc0a5e76..41bc023d81 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/RestfulMediaType.java
@@ -61,11 +61,11 @@ public final class RestfulMediaType {
public static final String APPLICATION_JSON_TYPE_ACTION_RESULT = JSON_BASE + "type-action-result" + DQ;
private static final String XML_BASE = "application/xml" + ";profile=" + DQ + PROFILE_PARAM_PREFIX;
- public static final String APPLICATION_XML_LAYOUT_BS3 = XML_BASE + "layout-bs" + DQ;
- public static final String APPLICATION_JSON_LAYOUT_BS3 = JSON_BASE + "layout-bs" + DQ;
+ public static final String APPLICATION_XML_LAYOUT_BS = XML_BASE + "layout-bs" + DQ;
+ public static final String APPLICATION_JSON_LAYOUT_BS = JSON_BASE + "layout-bs" + DQ;
- public static final String APPLICATION_XML_OBJECT_LAYOUT_BS3 = XML_BASE + "object-layout-bs" + DQ;
- public static final String APPLICATION_JSON_OBJECT_LAYOUT_BS3 = JSON_BASE + "object-layout-bs" + DQ;
+ public static final String APPLICATION_XML_OBJECT_LAYOUT_BS = XML_BASE + "object-layout-bs" + DQ;
+ public static final String APPLICATION_JSON_OBJECT_LAYOUT_BS = JSON_BASE + "object-layout-bs" + DQ;
public static final String APPLICATION_JSON_LAYOUT_MENUBARS = JSON_BASE + "layout-menubars" + DQ;
public static final String APPLICATION_XML_LAYOUT_MENUBARS = XML_BASE + "layout-menubars" + DQ;
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
index 80227efcfc..b0057b9282 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java
@@ -105,8 +105,8 @@ public interface DomainObjectResource {
@Path("/{domainType}/{instanceId}/object-layout")
@Consumes({ MediaType.WILDCARD })
@Produces({
- MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS3,
- MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS3
+ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS,
+ MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS
})
public Response layout(
@PathParam("domainType")
diff --git a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
index 7b25251196..466d305d69 100644
--- a/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
+++ b/viewers/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domaintypes/DomainTypeResource.java
@@ -50,8 +50,8 @@ public interface DomainTypeResource {
@GET
@Path("/{domainType}/layout")
@Produces({
- MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_LAYOUT_BS3,
- MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_LAYOUT_BS3
+ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_LAYOUT_BS,
+ MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_LAYOUT_BS
})
public abstract Response layout(@PathParam("domainType") final String domainType);
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
index 8fff7c176e..788e1f9054 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java
@@ -306,8 +306,8 @@ implements DomainObjectResource {
@Path("/{domainType}/{instanceId}/object-layout")
@Consumes({ MediaType.WILDCARD })
@Produces({
- MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS3,
- MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS3
+ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_OBJECT_LAYOUT_BS,
+ MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_OBJECT_LAYOUT_BS
})
public Response layout(
@PathParam("domainType") final String domainType,
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
index 00dc92cc24..dbb1287bbb 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java
@@ -142,8 +142,8 @@ implements DomainTypeResource {
@GET
@Path("/{domainType}/layout")
@Produces({
- MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_LAYOUT_BS3,
- MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_LAYOUT_BS3
+ MediaType.APPLICATION_JSON, RestfulMediaType.APPLICATION_JSON_LAYOUT_BS,
+ MediaType.APPLICATION_XML, RestfulMediaType.APPLICATION_XML_LAYOUT_BS
})
public Response layout(
@PathParam("domainType") final String domainType) {