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/08 19:02:29 UTC
[isis] branch master updated (fef2aac530 -> 9295248cb4)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from fef2aac530 ISIS-2997: applib: adds interface MetamodelListener
new 1de4fd7d22 ISIS-2997: update mignotes
new 9295248cb4 ISIS-2997: recreate site index
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pages/index/layout/component/FieldSet.adoc | 2 +-
.../BS3ClearFix.adoc => bootstrap/BSClearFix.adoc} | 6 +++---
.../BSClearFixHidden.adoc} | 6 +++---
.../BSClearFixVisible.adoc} | 6 +++---
.../BS3Col.adoc => bootstrap/BSCol.adoc} | 18 +++++++++---------
.../BS3Element.adoc => bootstrap/BSElement.adoc} | 6 +++---
.../BSElementAbstract.adoc} | 6 +++---
.../BS3Grid.adoc => bootstrap/BSGrid.adoc} | 14 +++++++-------
.../BS3Row.adoc => bootstrap/BSRow.adoc} | 18 +++++++++---------
.../BSRowContent.adoc} | 14 +++++++-------
.../BSRowContentOwner.adoc} | 6 +++---
.../BS3RowOwner.adoc => bootstrap/BSRowOwner.adoc} | 8 ++++----
.../BS3Tab.adoc => bootstrap/BSTab.adoc} | 20 ++++++++++----------
.../BS3TabGroup.adoc => bootstrap/BSTabGroup.adoc} | 20 ++++++++++----------
.../BSTabGroupOwner.adoc} | 8 ++++----
.../BSTabOwner.adoc} | 7 ++++---
.../grid/{bootstrap3 => bootstrap}/HasCssId.adoc | 0
.../grid/{bootstrap3 => bootstrap}/Size.adoc | 0
.../grid/{bootstrap3 => bootstrap}/SizeSpan.adoc | 0
.../grid/{bootstrap3 => bootstrap}/WithinGrid.adoc | 2 +-
.../layout/grid/bootstrap3/BS3TabGroupOwner.adoc | 13 -------------
.../BS3Menu.adoc => bootstrap/BSMenu.adoc} | 12 ++++++------
.../BS3MenuBar.adoc => bootstrap/BSMenuBar.adoc} | 12 ++++++------
.../BS3MenuBars.adoc => bootstrap/BSMenuBars.adoc} | 22 +++++++++++-----------
.../BSMenuSection.adoc} | 10 +++++-----
.../index/services/menu/MenuBarsLoaderService.adoc | 8 ++++----
.../restfulobjects/applib/RestfulMediaType.adoc | 8 ++++----
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 22 +++++++++++++++++++---
core/adoc/modules/_overview/pages/about.adoc | 6 +++---
29 files changed, 142 insertions(+), 138 deletions(-)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3ClearFix.adoc => bootstrap/BSClearFix.adoc} (93%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3ClearFixHidden.adoc => bootstrap/BSClearFixHidden.adoc} (92%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3ClearFixVisible.adoc => bootstrap/BSClearFixVisible.adoc} (93%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3Col.adoc => bootstrap/BSCol.adoc} (89%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3Element.adoc => bootstrap/BSElement.adoc} (94%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3ElementAbstract.adoc => bootstrap/BSElementAbstract.adoc} (94%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3Grid.adoc => bootstrap/BSGrid.adoc} (89%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3Row.adoc => bootstrap/BSRow.adoc} (80%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3RowContent.adoc => bootstrap/BSRowContent.adoc} (79%)
copy antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3RowContentOwner.adoc => bootstrap/BSRowContentOwner.adoc} (89%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3RowOwner.adoc => bootstrap/BSRowOwner.adoc} (89%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3Tab.adoc => bootstrap/BSTab.adoc} (80%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3TabGroup.adoc => bootstrap/BSTabGroup.adoc} (86%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3TabOwner.adoc => bootstrap/BSTabGroupOwner.adoc} (87%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3/BS3RowContentOwner.adoc => bootstrap/BSTabOwner.adoc} (89%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3 => bootstrap}/HasCssId.adoc (100%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3 => bootstrap}/Size.adoc (100%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3 => bootstrap}/SizeSpan.adoc (100%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/grid/{bootstrap3 => bootstrap}/WithinGrid.adoc (97%)
delete mode 100644 antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroupOwner.adoc
rename antora/components/refguide-index/modules/applib/pages/index/layout/menubars/{bootstrap3/BS3Menu.adoc => bootstrap/BSMenu.adoc} (93%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/menubars/{bootstrap3/BS3MenuBar.adoc => bootstrap/BSMenuBar.adoc} (89%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/menubars/{bootstrap3/BS3MenuBars.adoc => bootstrap/BSMenuBars.adoc} (81%)
rename antora/components/refguide-index/modules/applib/pages/index/layout/menubars/{bootstrap3/BS3MenuSection.adoc => bootstrap/BSMenuSection.adoc} (89%)
[isis] 01/02: ISIS-2997: update mignotes
Posted by 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
commit 1de4fd7d224325dc0577fd646a76ed0c8da0147e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 8 20:58:47 2022 +0200
ISIS-2997: update mignotes
---
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index 7b3e41469b..34974c81d7 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -20,12 +20,24 @@
| `ViewModel.viewModelInit(String memento)` removed
| use a single (String) argument constructor instead; this will allow Java Records to be used as viewmodels (future work)
-|
-|
+| `MetamodelEvent` as provided with _metamodel_ moved
+| moved to _applib_; we introduced _interface_ `MetamodelListener` for convenience to maybe use instead
+[source, java]
+.Example
+----
+@Service
+public class SeedService implements MetamodelListener {
+/..
+ @Override
+ public void onMetamodelLoaded() {
+ // seed database entities
+ }
+}
+----
|===
-== Configuration
+== Commons
Following configuration options changed:
[cols="2a,3a", options="header"]
@@ -35,5 +47,9 @@ Following configuration options changed:
| previously
| new
+| `Result<T>` removed
+| replaced by `Try<T>`; also promoting `Either<L, R>` to non-internal,
+and introducing `Railway<F, S>`
+
|===
[isis] 02/02: ISIS-2997: recreate site index
Posted by 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
commit 9295248cb4aaa93f427524d1527dff6e89270ec9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 8 21:02:22 2022 +0200
ISIS-2997: recreate site index
---
.../pages/index/layout/component/FieldSet.adoc | 2 +-
.../BS3ClearFix.adoc => bootstrap/BSClearFix.adoc} | 6 +++---
.../BSClearFixHidden.adoc} | 6 +++---
.../BSClearFixVisible.adoc} | 6 +++---
.../BS3Col.adoc => bootstrap/BSCol.adoc} | 18 +++++++++---------
.../BS3Element.adoc => bootstrap/BSElement.adoc} | 6 +++---
.../BSElementAbstract.adoc} | 6 +++---
.../BS3Grid.adoc => bootstrap/BSGrid.adoc} | 14 +++++++-------
.../BS3Row.adoc => bootstrap/BSRow.adoc} | 18 +++++++++---------
.../BSRowContent.adoc} | 14 +++++++-------
.../BSRowContentOwner.adoc} | 6 +++---
.../BS3RowOwner.adoc => bootstrap/BSRowOwner.adoc} | 8 ++++----
.../BS3Tab.adoc => bootstrap/BSTab.adoc} | 20 ++++++++++----------
.../BS3TabGroup.adoc => bootstrap/BSTabGroup.adoc} | 20 ++++++++++----------
.../BSTabGroupOwner.adoc} | 8 ++++----
.../BSTabOwner.adoc} | 7 ++++---
.../grid/{bootstrap3 => bootstrap}/HasCssId.adoc | 0
.../grid/{bootstrap3 => bootstrap}/Size.adoc | 0
.../grid/{bootstrap3 => bootstrap}/SizeSpan.adoc | 0
.../grid/{bootstrap3 => bootstrap}/WithinGrid.adoc | 2 +-
.../layout/grid/bootstrap3/BS3TabGroupOwner.adoc | 13 -------------
.../BS3Menu.adoc => bootstrap/BSMenu.adoc} | 12 ++++++------
.../BS3MenuBar.adoc => bootstrap/BSMenuBar.adoc} | 12 ++++++------
.../BS3MenuBars.adoc => bootstrap/BSMenuBars.adoc} | 22 +++++++++++-----------
.../BSMenuSection.adoc} | 10 +++++-----
.../index/services/menu/MenuBarsLoaderService.adoc | 8 ++++----
.../restfulobjects/applib/RestfulMediaType.adoc | 8 ++++----
core/adoc/modules/_overview/pages/about.adoc | 6 +++---
28 files changed, 123 insertions(+), 135 deletions(-)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/component/FieldSet.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/component/FieldSet.adoc
index 7edff01bed..bbba65b660 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/component/FieldSet.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/component/FieldSet.adoc
@@ -74,7 +74,7 @@ As per <div id="...">...</div> : must be unique across entire page.
Whether this fieldset should be used to hold any unreferenced actions (contributed or "native").
-Any layout must have precisely one fieldset or xref:refguide:applib:index/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] that has this attribute set.
+Any layout must have precisely one fieldset or xref:refguide:applib:index/layout/grid/bootstrap/BSCol.adoc[BSCol] that has this attribute set.
[#isUnreferencedProperties__]
=== isUnreferencedProperties()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFix.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFix.adoc
similarity index 93%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFix.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFix.adoc
index cfb1443e0c..c2005332f9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFix.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFix.adoc
@@ -1,12 +1,12 @@
-= BS3ClearFix
+= BSClearFix
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.BS3ClearFix.java
+.BSClearFix.java
----
-class BS3ClearFix {
+class BSClearFix {
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixHidden.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFixHidden.adoc
similarity index 92%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixHidden.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFixHidden.adoc
index c7a4f9897a..58f5b952ae 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixHidden.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFixHidden.adoc
@@ -1,4 +1,4 @@
-= BS3ClearFixHidden
+= BSClearFixHidden
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
One of theResponsive utility classes.
@@ -8,9 +8,9 @@ It is rendered as a (eg) <div class="clearfix hidden-xs ...">
== API
[source,java]
-.BS3ClearFixHidden.java
+.BSClearFixHidden.java
----
-class BS3ClearFixHidden {
+class BSClearFixHidden {
String toCssClass()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixVisible.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFixVisible.adoc
similarity index 93%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixVisible.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFixVisible.adoc
index 3e3cd7b067..b79bd6e6e9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ClearFixVisible.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSClearFixVisible.adoc
@@ -1,4 +1,4 @@
-= BS3ClearFixVisible
+= BSClearFixVisible
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
One of theResponsive utility classes.
@@ -8,9 +8,9 @@ It is rendered as a (eg) <div class="clearfix visible-xs-block ...">
== API
[source,java]
-.BS3ClearFixVisible.java
+.BSClearFixVisible.java
----
-class BS3ClearFixVisible {
+class BSClearFixVisible {
CssDisplay getCssDisplay()
void setCssDisplay(CssDisplay cssDisplay)
String toCssClass()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSCol.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSCol.adoc
index 6e0e3f6146..e8812de78e 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Col.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSCol.adoc
@@ -1,18 +1,18 @@
-= BS3Col
+= BSCol
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
A column within a row which, depending on its _#getSpan()_ , could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
-Pretty much other content can be contained within a column, though most commonly it will be xref:refguide:applib:index/layout/component/FieldSet.adoc[FieldSet] s (a group of properties) or xref:refguide:applib:index/layout/component/CollectionLayoutData.adoc[CollectionLayoutData] s. However, columns can also be used to contain further xref:refguide:applib:index/layout/grid/bootstrap3/BS3Row.adoc[BS3Row] s (creating a nested grid of rows/cols/rows/cols) and xref:refguide:applib:index/layo [...]
+Pretty much other content can be contained within a column, though most commonly it will be xref:refguide:applib:index/layout/component/FieldSet.adoc[FieldSet] s (a group of properties) or xref:refguide:applib:index/layout/component/CollectionLayoutData.adoc[CollectionLayoutData] s. However, columns can also be used to contain further xref:refguide:applib:index/layout/grid/bootstrap/BSRow.adoc[BSRow] s (creating a nested grid of rows/cols/rows/cols) and xref:refguide:applib:index/layout/ [...]
It is rendered as a (eg) <div class="col-md-4 ...">
== API
[source,java]
-.BS3Col.java
+.BSCol.java
----
-class BS3Col {
+class BSCol {
String getId() // <.>
void setId(String id)
int getSpan()
@@ -27,10 +27,10 @@ class BS3Col {
void setSizeSpans(List<SizeSpan> sizeSpans)
List<ActionLayoutData> getActions()
void setActions(List<ActionLayoutData> actions)
- List<BS3Row> getRows()
- void setRows(List<BS3Row> rows)
- List<BS3TabGroup> getTabGroups()
- void setTabGroups(List<BS3TabGroup> tabGroups)
+ List<BSRow> getRows()
+ void setRows(List<BSRow> rows)
+ List<BSTabGroup> getTabGroups()
+ void setTabGroups(List<BSTabGroup> tabGroups)
List<FieldSet> getFieldSets()
void setFieldSets(List<FieldSet> fieldSets)
List<CollectionLayoutData> getCollections()
@@ -87,7 +87,7 @@ Any layout must have precisely one column or xref:refguide:applib:index/layout/c
Whether this column should be used to hold any unreferenced collections (contributed or "native").
-Any layout must have precisely one column or xref:refguide:applib:index/layout/grid/bootstrap3/BS3TabGroup.adoc[BS3TabGroup] that has this attribute set.
+Any layout must have precisely one column or xref:refguide:applib:index/layout/grid/bootstrap/BSTabGroup.adoc[BSTabGroup] that has this attribute set.
[#getDomainObject__]
=== getDomainObject()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Element.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSElement.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Element.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSElement.adoc
index 731166d362..bfe2f1f784 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Element.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSElement.adoc
@@ -1,12 +1,12 @@
-= BS3Element _(interface)_
+= BSElement _(interface)_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.BS3Element.java
+.BSElement.java
----
-interface BS3Element {
+interface BSElement {
String getCssClass() // <.>
void setCssClass(String cssClass)
}
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ElementAbstract.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSElementAbstract.adoc
similarity index 94%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ElementAbstract.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSElementAbstract.adoc
index 9fba7b62c5..6d61ba6aeb 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3ElementAbstract.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSElementAbstract.adoc
@@ -1,4 +1,4 @@
-= BS3ElementAbstract
+= BSElementAbstract
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
Superclass for all layout classes, factoring out the common _#getCssClass()_ attribute.
@@ -6,9 +6,9 @@ Superclass for all layout classes, factoring out the common _#getCssClass()_ att
== API
[source,java]
-.BS3ElementAbstract.java
+.BSElementAbstract.java
----
-class BS3ElementAbstract {
+class BSElementAbstract {
String getCssClass() // <.>
void setCssClass(String cssClass)
}
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Grid.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSGrid.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Grid.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSGrid.adoc
index c2c2fdf0a1..7295f004a9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Grid.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSGrid.adoc
@@ -1,4 +1,4 @@
-= BS3Grid
+= BSGrid
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
This is the top-level for rendering the domain object's properties, collections and actions. It simply consists of a number of rows.
@@ -8,19 +8,19 @@ The element is rendered as a <div class="...">
== API
[source,java]
-.BS3Grid.java
+.BSGrid.java
----
-class BS3Grid {
+class BSGrid {
String getCssClass()
void setCssClass(String cssClass)
- List<BS3Row> getRows()
- void setRows(List<BS3Row> rows)
+ List<BSRow> getRows()
+ void setRows(List<BSRow> rows)
List<String> getMetadataErrors() // <.>
void setMetadataErrors(List<String> metadataErrors)
void visit(Grid.Visitor visitor)
- LinkedHashMap<String, BS3Tab> getAllTabsByName()
+ LinkedHashMap<String, BSTab> getAllTabsByName()
LinkedHashMap<String, HasCssId> getAllCssId()
- BS3Grid getGrid()
+ BSGrid getGrid()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRow.adoc
similarity index 80%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRow.adoc
index 9ee1fcedbb..d035f7988b 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Row.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRow.adoc
@@ -1,25 +1,25 @@
-= BS3Row
+= BSRow
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Contains a row of content, either on the top-level xref:refguide:applib:index/layout/grid/bootstrap3/BS3Grid.adoc[BS3Grid] or at any other lower-level element that can contain rows, eg xref:refguide:applib:index/layout/grid/bootstrap3/BS3Tab.adoc[BS3Tab] .
+Contains a row of content, either on the top-level xref:refguide:applib:index/layout/grid/bootstrap/BSGrid.adoc[BSGrid] or at any other lower-level element that can contain rows, eg xref:refguide:applib:index/layout/grid/bootstrap/BSTab.adoc[BSTab] .
It is rendered as a <div class="row ...">
== API
[source,java]
-.BS3Row.java
+.BSRow.java
----
-class BS3Row {
+class BSRow {
String getId() // <.>
void setId(String id)
- List<BS3RowContent> getCols()
- void setCols(List<BS3RowContent> cols)
+ List<BSRowContent> getCols()
+ void setCols(List<BSRowContent> cols)
String getMetadataError() // <.>
void setMetadataError(String metadataError)
- BS3RowOwner getOwner() // <.>
- void setOwner(BS3RowOwner owner)
- BS3Grid getGrid()
+ BSRowOwner getOwner() // <.>
+ void setOwner(BSRowOwner owner)
+ BSGrid getGrid()
String toString()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowContent.adoc
similarity index 79%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowContent.adoc
index 6024229a1d..b57884168c 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContent.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowContent.adoc
@@ -1,21 +1,21 @@
-= BS3RowContent
+= BSRowContent
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
Common superclass for any content of a row.
-Most commonly the content of a row is xref:refguide:applib:index/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] umns, but it may be either of the xref:refguide:applib:index/layout/grid/bootstrap3/BS3ClearFix.adoc[BS3ClearFix] classes.
+Most commonly the content of a row is xref:refguide:applib:index/layout/grid/bootstrap/BSCol.adoc[BSCol] umns, but it may be either of the xref:refguide:applib:index/layout/grid/bootstrap/BSClearFix.adoc[BSClearFix] classes.
== API
[source,java]
-.BS3RowContent.java
+.BSRowContent.java
----
-class BS3RowContent {
+class BSRowContent {
Size getSize() // <.>
void setSize(Size size)
- BS3RowContentOwner getOwner() // <.>
- void setOwner(BS3RowContentOwner owner)
- BS3Grid getGrid()
+ BSRowContentOwner getOwner() // <.>
+ void setOwner(BSRowContentOwner owner)
+ BSGrid getGrid()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowContentOwner.adoc
similarity index 89%
copy from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc
copy to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowContentOwner.adoc
index 056d815e43..fcc1896e8d 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowContentOwner.adoc
@@ -1,12 +1,12 @@
-= BS3RowContentOwner _(interface)_
+= BSRowContentOwner _(interface)_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.BS3RowContentOwner.java
+.BSRowContentOwner.java
----
-interface BS3RowContentOwner {
+interface BSRowContentOwner {
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowOwner.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowOwner.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowOwner.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowOwner.adoc
index 9572797381..dfc18f8b0a 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowOwner.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSRowOwner.adoc
@@ -1,13 +1,13 @@
-= BS3RowOwner _(interface)_
+= BSRowOwner _(interface)_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.BS3RowOwner.java
+.BSRowOwner.java
----
-interface BS3RowOwner {
- List<BS3Row> getRows()
+interface BSRowOwner {
+ List<BSRow> getRows()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTab.adoc
similarity index 80%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTab.adoc
index b23f517c5a..d4586e5bec 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3Tab.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTab.adoc
@@ -1,23 +1,23 @@
-= BS3Tab
+= BSTab
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Represents a tab within a xref:refguide:applib:index/layout/grid/bootstrap3/BS3TabGroup.adoc[BS3TabGroup] .
+Represents a tab within a xref:refguide:applib:index/layout/grid/bootstrap/BSTabGroup.adoc[BSTabGroup] .
-They simply contain one or more xref:refguide:applib:index/layout/grid/bootstrap3/BS3Row.adoc[BS3Row] s.
+They simply contain one or more xref:refguide:applib:index/layout/grid/bootstrap/BSRow.adoc[BSRow] s.
== API
[source,java]
-.BS3Tab.java
+.BSTab.java
----
-class BS3Tab {
+class BSTab {
String getName()
void setName(String name)
- List<BS3Row> getRows()
- void setRows(List<BS3Row> rows)
- BS3TabOwner getOwner() // <.>
- void setOwner(BS3TabOwner owner)
- BS3Grid getGrid()
+ List<BSRow> getRows()
+ void setRows(List<BSRow> rows)
+ BSTabOwner getOwner() // <.>
+ void setOwner(BSTabOwner owner)
+ BSGrid getGrid()
String toString()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabGroup.adoc
similarity index 86%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabGroup.adoc
index 60fb8650c2..6722156db8 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroup.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabGroup.adoc
@@ -1,25 +1,25 @@
-= BS3TabGroup
+= BSTabGroup
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Represents a tab group containing one or more xref:refguide:applib:index/layout/grid/bootstrap3/BS3Tab.adoc[BS3Tab] s.
+Represents a tab group containing one or more xref:refguide:applib:index/layout/grid/bootstrap/BSTab.adoc[BSTab] s.
== API
[source,java]
-.BS3TabGroup.java
+.BSTabGroup.java
----
-class BS3TabGroup {
+class BSTabGroup {
Boolean isUnreferencedCollections() // <.>
void setUnreferencedCollections(Boolean unreferencedCollections)
Boolean isCollapseIfOne() // <.>
void setCollapseIfOne(Boolean collapseIfOne)
- List<BS3Tab> getTabs()
- void setTabs(List<BS3Tab> tabs)
- BS3TabGroupOwner getOwner() // <.>
- void setOwner(BS3TabGroupOwner owner)
+ List<BSTab> getTabs()
+ void setTabs(List<BSTab> tabs)
+ BSTabGroupOwner getOwner() // <.>
+ void setOwner(BSTabGroupOwner owner)
String getMetadataError() // <.>
void setMetadataError(String metadataError)
- BS3Grid getGrid()
+ BSGrid getGrid()
}
----
@@ -51,7 +51,7 @@ For diagnostics; populated by the framework if and only if a metadata error.
Whether this tab group should be used to hold any unreferenced collections (contributed or "native").
-Any layout must have precisely one tab group or xref:refguide:applib:index/layout/grid/bootstrap3/BS3Col.adoc[BS3Col] that has this attribute set.
+Any layout must have precisely one tab group or xref:refguide:applib:index/layout/grid/bootstrap/BSCol.adoc[BSCol] that has this attribute set.
[#isCollapseIfOne__]
=== isCollapseIfOne()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabOwner.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabGroupOwner.adoc
similarity index 87%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabOwner.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabGroupOwner.adoc
index ea63af9d11..322b286a0b 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabOwner.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabGroupOwner.adoc
@@ -1,13 +1,13 @@
-= BS3TabOwner _(interface)_
+= BSTabGroupOwner _(interface)_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.BS3TabOwner.java
+.BSTabGroupOwner.java
----
-interface BS3TabOwner {
- List<BS3Tab> getTabs()
+interface BSTabGroupOwner {
+ List<BSTabGroup> getTabGroups()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabOwner.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabOwner.adoc
index 056d815e43..a20cc5e173 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3RowContentOwner.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/BSTabOwner.adoc
@@ -1,12 +1,13 @@
-= BS3RowContentOwner _(interface)_
+= BSTabOwner _(interface)_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
== API
[source,java]
-.BS3RowContentOwner.java
+.BSTabOwner.java
----
-interface BS3RowContentOwner {
+interface BSTabOwner {
+ List<BSTab> getTabs()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/HasCssId.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/HasCssId.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/HasCssId.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/HasCssId.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/Size.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/Size.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/Size.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/Size.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/SizeSpan.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/SizeSpan.adoc
similarity index 100%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/SizeSpan.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/SizeSpan.adoc
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/WithinGrid.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/WithinGrid.adoc
similarity index 97%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/WithinGrid.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/WithinGrid.adoc
index fc378a7a36..6f9b64c807 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/WithinGrid.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap/WithinGrid.adoc
@@ -7,7 +7,7 @@
.WithinGrid.java
----
interface WithinGrid {
- BS3Grid getGrid()
+ BSGrid getGrid()
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroupOwner.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroupOwner.adoc
deleted file mode 100644
index 0f2c2f6ca8..0000000000
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/grid/bootstrap3/BS3TabGroupOwner.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-= BS3TabGroupOwner _(interface)_
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-== API
-
-[source,java]
-.BS3TabGroupOwner.java
-----
-interface BS3TabGroupOwner {
- List<BS3TabGroup> getTabGroups()
-}
-----
-
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenu.adoc
similarity index 93%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenu.adoc
index 8d2e36e838..027187d9a6 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3Menu.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenu.adoc
@@ -1,4 +1,4 @@
-= BS3Menu
+= BSMenu
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
@@ -6,16 +6,16 @@ Describes the collection of domain services into menubars, broadly corresponding
== API
[source,java]
-.BS3Menu.java
+.BSMenu.java
----
-class BS3Menu {
- BS3Menu()
- BS3Menu(String named)
+class BSMenu {
+ BSMenu()
+ BSMenu(String named)
String getNamed()
void setNamed(String named)
String getCssClassFa()
void setCssClassFa(String cssClassFa)
- List<BS3MenuSection> getSections()
+ List<BSMenuSection> getSections()
Boolean isUnreferencedActions() // <.>
void setUnreferencedActions(Boolean unreferencedActions)
}
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuBar.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuBar.adoc
index 5c9e43e70f..d731a220f0 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBar.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuBar.adoc
@@ -1,4 +1,4 @@
-= BS3MenuBar
+= BSMenuBar
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] that have the same value of _DomainServiceLayout#named()_ .
@@ -6,12 +6,12 @@ Describes the collection of domain services into menubars, broadly corresponding
== API
[source,java]
-.BS3MenuBar.java
+.BSMenuBar.java
----
-class BS3MenuBar {
- BS3MenuBar()
- List<BS3Menu> getMenus()
- void setMenus(List<BS3Menu> menus)
+class BSMenuBar {
+ BSMenuBar()
+ List<BSMenu> getMenus()
+ void setMenus(List<BSMenu> menus)
}
----
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuBars.adoc
similarity index 81%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuBars.adoc
index 76973d6aed..bc56e722f9 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuBars.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuBars.adoc
@@ -1,4 +1,4 @@
-= BS3MenuBars
+= BSMenuBars
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within xref:refguide:applib:index/annotation/DomainServiceLayout.adoc[DomainServiceLayout] .
@@ -6,17 +6,17 @@ Describes the collection of domain services into menubars, broadly corresponding
== API
[source,java]
-.BS3MenuBars.java
+.BSMenuBars.java
----
-class BS3MenuBars {
- BS3MenuBars()
- BS3MenuBar getPrimary()
- void setPrimary(BS3MenuBar primary)
- BS3MenuBar getSecondary()
- void setSecondary(BS3MenuBar secondary)
- BS3MenuBar getTertiary()
- void setTertiary(BS3MenuBar tertiary)
- BS3MenuBar menuBarFor(DomainServiceLayout.MenuBar menuBar)
+class BSMenuBars {
+ BSMenuBars()
+ BSMenuBar getPrimary()
+ void setPrimary(BSMenuBar primary)
+ BSMenuBar getSecondary()
+ void setSecondary(BSMenuBar secondary)
+ BSMenuBar getTertiary()
+ void setTertiary(BSMenuBar tertiary)
+ BSMenuBar menuBarFor(DomainServiceLayout.MenuBar menuBar)
void visit(Consumer<ServiceActionLayoutData> visitor)
String getMetadataError() // <.>
void setMetadataError(String metadataError)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuSection.adoc
similarity index 89%
rename from antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
rename to antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuSection.adoc
index 151b756787..0287610be6 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap3/BS3MenuSection.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/layout/menubars/bootstrap/BSMenuSection.adoc
@@ -1,15 +1,15 @@
-= BS3MenuSection
+= BSMenuSection
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Corresponds to a domain service that contributes its serviceActions under a particular xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBar.adoc[BS3MenuBar] .
+Corresponds to a domain service that contributes its serviceActions under a particular xref:refguide:applib:index/layout/menubars/bootstrap/BSMenuBar.adoc[BSMenuBar] .
== API
[source,java]
-.BS3MenuSection.java
+.BSMenuSection.java
----
-class BS3MenuSection {
- BS3MenuSection()
+class BSMenuSection {
+ BSMenuSection()
String getNamed()
void setNamed(String named)
List<ServiceActionLayoutData> getServiceActions()
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
index e584dee986..930fa90847 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/menu/MenuBarsLoaderService.adoc
@@ -1,7 +1,7 @@
= MenuBarsLoaderService _(interface)_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Returns the xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] instance (bootstrap3-specific subtype of _org.apache.isis.applib.layout.menubars.MenuBars_ , for the UI.
+Returns the xref:refguide:applib:index/layout/menubars/bootstrap/BSMenuBars.adoc[BSMenuBars] instance (bootstrap3-specific subtype of _org.apache.isis.applib.layout.menubars.MenuBars_ , for the UI.
The default implementation deserializes the `menubars.layout.xml` file read from the classpath.
@@ -14,7 +14,7 @@ The service is _called_ by the default implementation of xref:refguide:applib:in
----
interface MenuBarsLoaderService {
boolean supportsReloading() // <.>
- BS3MenuBars menuBars() // <.>
+ BSMenuBars menuBars() // <.>
}
----
@@ -26,7 +26,7 @@ Whether dynamic reloading of layouts is enabled.
<.> xref:#menuBars__[menuBars()]
+
--
-Returns a new instance of a xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] if possible, else `null` .
+Returns a new instance of a xref:refguide:applib:index/layout/menubars/bootstrap/BSMenuBars.adoc[BSMenuBars] if possible, else `null` .
--
== Members
@@ -41,7 +41,7 @@ If not, then the calling xref:refguide:applib:index/services/menu/MenuBarsServic
[#menuBars__]
=== menuBars()
-Returns a new instance of a xref:refguide:applib:index/layout/menubars/bootstrap3/BS3MenuBars.adoc[BS3MenuBars] if possible, else `null` .
+Returns a new instance of a xref:refguide:applib:index/layout/menubars/bootstrap/BSMenuBars.adoc[BSMenuBars] if possible, else `null` .
include::hooks/MenuBarsLoaderService_010-implementation.adoc[]
diff --git a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/RestfulMediaType.adoc b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/RestfulMediaType.adoc
index 5a18f5109f..866a4ded53 100644
--- a/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/RestfulMediaType.adoc
+++ b/antora/components/refguide-index/modules/viewer/pages/index/restfulobjects/applib/RestfulMediaType.adoc
@@ -29,10 +29,10 @@ class RestfulMediaType {
public static final String APPLICATION_JSON_ACTION_PARAMETER_DESCRIPTION;
public static final String APPLICATION_JSON_ERROR;
public static final String APPLICATION_JSON_TYPE_ACTION_RESULT;
- public static final String APPLICATION_XML_LAYOUT_BS3;
- public static final String APPLICATION_JSON_LAYOUT_BS3;
- public static final String APPLICATION_XML_OBJECT_LAYOUT_BS3;
- public static final String APPLICATION_JSON_OBJECT_LAYOUT_BS3;
+ public static final String APPLICATION_XML_LAYOUT_BS;
+ public static final String APPLICATION_JSON_LAYOUT_BS;
+ public static final String APPLICATION_XML_OBJECT_LAYOUT_BS;
+ public static final String APPLICATION_JSON_OBJECT_LAYOUT_BS;
public static final String APPLICATION_JSON_LAYOUT_MENUBARS;
public static final String APPLICATION_XML_LAYOUT_MENUBARS;
public static final String APPLICATION_XML_OBJECT;
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index d8beeca46d..34dcf31aaa 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -1506,7 +1506,7 @@ org.jmock:jmock:jar:<managed> +
.Document Index Entries
****
-xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout], xref:refguide:applib:index/annotation/BookmarkPolicy.adoc[BookmarkPolicy], xref:refguide:applib:index/annotation/Bounding.adoc[Bounding], xref:refguide:applib:index/annotation/Collecti [...]
+xref:refguide:applib:index/Identifier.adoc[Identifier], xref:refguide:applib:index/IsisModuleApplib.adoc[IsisModuleApplib], xref:refguide:applib:index/ViewModel.adoc[ViewModel], xref:refguide:applib:index/annotation/Action.adoc[Action], xref:refguide:applib:index/annotation/ActionLayout.adoc[ActionLayout], xref:refguide:applib:index/annotation/BookmarkPolicy.adoc[BookmarkPolicy], xref:refguide:applib:index/annotation/Bounding.adoc[Bounding], xref:refguide:applib:index/annotation/Collecti [...]
****
|Apache Isis Core - Code Gen (ByteBuddy)
@@ -1646,7 +1646,7 @@ o.a.i.core.metamodel.services.exceprecog.ExceptionRecognizerForRecoverableExcept
o.a.i.core.metamodel.services.grid.GridLoaderServiceDefault +
o.a.i.core.metamodel.services.grid.GridReaderUsingJaxb +
o.a.i.core.metamodel.services.grid.GridServiceDefault +
-o.a.i.core.metamodel.services.grid.bootstrap3.GridSystemServiceBootstrap +
+o.a.i.core.metamodel.services.grid.bootstrap.GridSystemServiceBootstrap +
o.a.i.core.metamodel.services.layout.LayoutServiceDefault +
o.a.i.core.metamodel.services.metamodel.MetaModelServiceDefault +
o.a.i.core.metamodel.services.registry.ServiceRegistryDefault +
@@ -1765,7 +1765,7 @@ o.a.i.core.runtimeservices.locale.LanguageProviderDefault +
o.a.i.core.runtimeservices.locale.LocaleChoiceProviderDefault +
o.a.i.core.runtimeservices.memento.ObjectMementoServiceDefault +
o.a.i.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault +
-o.a.i.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3 +
+o.a.i.core.runtimeservices.menubars.bootstrap.MenuBarsServiceBS +
o.a.i.core.runtimeservices.message.MessageServiceDefault +
o.a.i.core.runtimeservices.publish.CommandPublisherDefault +
o.a.i.core.runtimeservices.publish.EntityChangesPublisherDefault +