You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/11/18 12:11:08 UTC
[isis] 03/04: ISIS-2062: inlines some pages for vro
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8f1f12dc613c2c50888644b1e0f65d30b72e03b5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Nov 18 10:10:05 2019 +0000
ISIS-2062: inlines some pages for vro
---
.../pages/deployment/externalized-configuration.adoc | 2 +-
core/plugins/jdo/src/main/doc/modules/ROOT/nav.adoc | 20 --------------------
.../src/main/doc/modules/ROOT/pages/configuring.adoc | 6 ++++++
.../modules/ROOT/pages/configuring/bulk-load.adoc | 1 +
.../disabling-persistence-by-reachability.adoc | 1 +
.../ROOT/pages/configuring/persistence-xml.adoc | 1 +
.../modules/ROOT/pages/configuring/properties.adoc | 6 ++++--
.../pages/configuring/using-jndi-data-source.adoc | 1 +
.../src/main/doc/modules/ROOT/pages/db-schemas.adoc | 1 +
.../main/doc/modules/ROOT/pages/hints-and-tips.adoc | 6 ++++++
.../pages/hints-and-tips/diagnosing-n-plus-1.adoc | 5 +++--
.../doc/modules/ROOT/pages/hints-and-tips/java8.adoc | 4 +++-
.../pages/hints-and-tips/jdoql-and-timestamps.adoc | 3 ++-
.../hints-and-tips/overriding-jdo-annotations.adoc | 3 ++-
.../subtype-entity-not-fully-populated.adoc | 3 ++-
.../typesafe-queries-and-fetchgroups.adoc | 5 +++--
.../main/doc/modules/ROOT/pages/jdo-mappings.adoc | 5 ++++-
.../mandatory-properties-in-subtypes.adoc | 1 +
.../ROOT/pages/jdo-mappings/mapping-to-a-view.adoc | 1 +
...doc => one-to-m-bidirectional-relationships.adoc} | 1 +
.../ContentNegotiationService.adoc | 2 +-
.../modules/ROOT/pages/configuration-properties.adoc | 10 +++++-----
.../main/doc/modules/ROOT/pages/hints-and-tips.adoc | 9 +++++++++
.../main/doc/modules/ROOT/partials/module-nav.adoc | 19 +------------------
site-scratch.yml | 12 ++++++------
25 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc b/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
index 6c271ac..0ac4ecd 100644
--- a/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
+++ b/antora/components/userguide/modules/btb/pages/deployment/externalized-configuration.adoc
@@ -256,4 +256,4 @@ The cost of these proxies can be mitigated using:
== Using a JNDI Datasource
-See the guidance in the xref:odn:ROOT:configuring/using-jndi-data-source.adoc[configuring datanucleus] section.
\ No newline at end of file
+See the guidance in the xref:odn:ROOT:configuring.adoc#using-jndi-data-source[configuring datanucleus] section.
\ No newline at end of file
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/nav.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/nav.adoc
index 9f4575d..a0b16ee 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/nav.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/nav.adoc
@@ -1,24 +1,4 @@
* xref:configuring.adoc[Configuring]
-** xref:configuring/properties.adoc[Properties]
-** xref:configuring/bulk-load.adoc[Bulk Load]
-** xref:configuring/disabling-persistence-by-reachability.adoc[Disabling Persistence by Reachability]
-** xref:configuring/persistence-xml.adoc[Persistence XML]
-** xref:configuring/using-jndi-data-source.adoc[Using JNDI Data Source]
-
-
* xref:jdo-mappings.adoc[JDO Mappings]
-** xref:jdo-mappings/1-to-m-bidirectional-relationships.adoc[1-to-m bidirectional relationships]
-** xref:jdo-mappings/mandatory-properties-in-subtypes.adoc[Mandatory properties in subtypes]
-** xref:jdo-mappings/mapping-to-a-view.adoc[Mapping to a View]
-
-
* xref:db-schemas.adoc[DB Schemas]
-
-
* xref:hints-and-tips.adoc[Hints-n-Tips]
-** xref:hints-and-tips/overriding-jdo-annotations.adoc[Overriding JDO Annotations]
-** xref:hints-and-tips/subtype-entity-not-fully-populated.adoc[Subtype entity not fully populated]
-** xref:hints-and-tips/java8.adoc[Java 8]
-** xref:hints-and-tips/diagnosing-n-plus-1.adoc[Diagnosing n-plus-1]
-** xref:hints-and-tips/typesafe-queries-and-fetchgroups.adoc[Typesafe Queries and Fetchgroups]
-** xref:hints-and-tips/jdoql-and-timestamps.adoc[JDOQL and Timestamps]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
index a87752f..6e43abc 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring.adoc
@@ -1,3 +1,4 @@
+[[configuring]]
= Configuring DataNucleus
: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 [...]
include::_attributes.adoc[]
@@ -10,3 +11,8 @@ In theory it could also hold mappings, though in Apache Isis we tend to use anno
Furthermore, DataNucleus will search for various other XML mapping files, eg `mappings.jdo`. A full list can be found http://www.datanucleus.org/products/datanucleus/jdo/metadata.html[here]. The metadata in these XML can be used to override the annotations of annotated entities; see xref:userguide:btb:about.adoc#overriding-jdo-annotations[Overriding JDO Annotatons] for further discussion.
+include::configuring/properties.adoc[leveloffset=+1]
+include::configuring/bulk-load.adoc[leveloffset=+1]
+include::configuring/disabling-persistence-by-reachability.adoc[leveloffset=+1]
+include::configuring/persistence-xml.adoc[leveloffset=+1]
+include::configuring/using-jndi-data-source.adoc[leveloffset=+1]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
index 7748fe2..a2962e9 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/bulk-load.adoc
@@ -1,3 +1,4 @@
+[[bulk-load]]
= Bulk Load of Standalone Collections
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
index f8aeae0..82b8487 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/disabling-persistence-by-reachability.adoc
@@ -1,3 +1,4 @@
+[[disabling-persistence-by-reachability]]
= Persistence by Reachability
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
index e203def..8ffe3d9 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/persistence-xml.adoc
@@ -1,3 +1,4 @@
+[[persistence-xml]]
= `persistence.xml`
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
index 8913ca4..7fffc4b 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/properties.adoc
@@ -1,7 +1,9 @@
+[[properties]]
= Configuration Properties
: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 [...]
include::_attributes.adoc[]
+WARNING: TODO: v2: these are now in core config properties
These configuration properties are typically stored in `WEB-INF/persistor_datanucleus.properties`. However, you can place all configuration properties into `WEB-INF/isis.properties` if you wish (the configuration properties from all config files are merged together).
@@ -23,7 +25,7 @@ These configuration properties are typically stored in `WEB-INF/persistor_datanu
(`false`)
|Enables bulk load of standalone collections.
-Further xref:odn:ROOT:configuring/bulk-load.adoc[discussion below].
+Further xref:odn:ROOT:configuring.adoc#bulk-load[discussion below].
|`isis.persistor.` +
`datanucleus.` +
@@ -91,7 +93,7 @@ Only intended for "emergency use" as a workaround while pending fix/patch to Apa
`datanucleus.persistenceByReachabilityAtCommit`
|`false`
|We recommend this setting is disabled. +
-Further xref:odn:ROOT:configuring/disabling-persistence-by-reachability.adoc[discussion below].
+Further xref:odn:ROOT:configuring.adoc#disabling-persistence-by-reachability[discussion below].
|===
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
index 772b33b..bf35a14 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/configuring/using-jndi-data-source.adoc
@@ -1,3 +1,4 @@
+[[using-jndi-data-source]]
= Using JNDI DataSource
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
index 4f47f6d..b3717a0 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/db-schemas.adoc
@@ -1,3 +1,4 @@
+[[db-schemas]]
= Database Schemas
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
index 4de9310..a7e125b 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
@@ -10,3 +10,9 @@ This chapter provides some solutions for problems we've encountered ourselves or
+include::hints-and-tips/overriding-jdo-annotations.adoc[leveloffset=+1]
+include::hints-and-tips/subtype-entity-not-fully-populated.adoc[leveloffset=+1]
+include::hints-and-tips/java8.adoc[leveloffset=+1]
+include::hints-and-tips/diagnosing-n-plus-1.adoc[leveloffset=+1]
+include::hints-and-tips/typesafe-queries-and-fetchgroups.adoc[leveloffset=+1]
+include::hints-and-tips/jdoql-and-timestamps.adoc[leveloffset=+1]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
index 3a6756f..af7805c 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/diagnosing-n-plus-1.adoc
@@ -1,6 +1,7 @@
-include::_attributes.adoc[]
+[[diagnosing-n-plus-1]]
= Diagnosing n+1 Issues
: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 [...]
+include::_attributes.adoc[]
(As of DN 4.1) set a break point in `FetchRequest#execute(...)`:
@@ -11,4 +12,4 @@ The "Variables" pane will tell you which field(s) are being loaded, and the stac
For example, it may be that an object is being loaded in a table and the initial query did not eagerly load that field.
In such a case, consider using fetch groups in the initial repository query to bring the required data into memory with just one SQL call.
-See xref:odn:ROOT:hints-and-tips/typesafe-queries-and-fetchgroups.adoc[this hint/tip] for further details.
\ No newline at end of file
+See xref:odn:ROOT:hints-and-tips.adoc#typesafe-queries-and-fetchgroups[this hint/tip] for further details.
\ No newline at end of file
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
index ef0a3c6..52e13e8 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/java8.adoc
@@ -1,8 +1,10 @@
-include::_attributes.adoc[]
+[[java8]]
= Java8
: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 [...]
+include::_attributes.adoc[]
+WARNING: TODO: v2: should probably just remove this section.
DataNucleus 4.x supports Java 7, but can also be used with Java 8, eg for streams support against collections managed
by DataNucleus.
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
index af55fb5..d43f9cd 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/jdoql-and-timestamps.adoc
@@ -1,6 +1,7 @@
-include::_attributes.adoc[]
+[[jdoql-and-timestamps]]
= JDOQL and Timestamps
: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 [...]
+include::_attributes.adoc[]
Beware of entities with a property called "timestamp": you run the risk of "timestamp" being treated as a keyword in certain contexts, probably not as you intended.
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
index 1c272e5..cfa044b 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/overriding-jdo-annotations.adoc
@@ -1,6 +1,7 @@
-include::_attributes.adoc[]
+[[overriding-jdo-annotations]]
= Overriding JDO Annotations
: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 [...]
+include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
index 3711ebd..31c7816 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/subtype-entity-not-fully-populated.adoc
@@ -1,6 +1,7 @@
-include::_attributes.adoc[]
+[[subtype-entity-not-fully-populated]]
= Subtype not fully populated
: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 [...]
+include::_attributes.adoc[]
Taken from link:http://markmail.org/message/ovgai56uqgfgnrx7[this thread] on the Apache Isis users mailing list...
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
index a459987..1448b0a 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/hints-and-tips/typesafe-queries-and-fetchgroups.adoc
@@ -1,11 +1,12 @@
-include::_attributes.adoc[]
+[[typesafe-queries-and-fetchgroups]]
= Typesafe Queries and Fetch-groups
: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 [...]
+include::_attributes.adoc[]
Fetch groups provide a means to hint to DataNucleus that it should perform a SQL join when querying.
-A common use case is to avoid the xref:odn:ROOT:hints-and-tips/diagnosing-n-plus-1.adoc[n+1] issue.
+A common use case is to avoid the xref:odn:ROOT:hints-and-tips.adoc#diagnosing-n-plus-1[n+1] issue.
(So far as I could ascertain) it isn't possible to specify fetch group hints using JDOQL, but it is possible to specify them using the programmatic API or using typesafe queries.
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
index 51c7e0a..a826a5c 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings.adoc
@@ -1,7 +1,10 @@
+[[jdo-mappings]]
= JDO Mappings
: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 [...]
include::_attributes.adoc[]
-
+include::jdo-mappings/one-to-m-bidirectional-relationships.adoc[leveloffset=+1]
+include::jdo-mappings/mandatory-properties-in-subtypes.adoc[leveloffset=+1]
+include::jdo-mappings/mapping-to-a-view.adoc[leveloffset=+1]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
index 6edee88..71e38b2 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mandatory-properties-in-subtypes.adoc
@@ -1,3 +1,4 @@
+[[mandatory-properties-in-subtypes]]
= Mandatory Properties in Subtypes
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
index 71e0f10..fb6f0b5 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/mapping-to-a-view.adoc
@@ -1,3 +1,4 @@
+[[mapping-to-a-view]]
= Mapping to a View
: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 [...]
include::_attributes.adoc[]
diff --git a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
similarity index 99%
rename from core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc
rename to core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
index 06bad36..23dcdef 100644
--- a/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/1-to-m-bidirectional-relationships.adoc
+++ b/core/plugins/jdo/src/main/doc/modules/ROOT/pages/jdo-mappings/one-to-m-bidirectional-relationships.adoc
@@ -1,3 +1,4 @@
+[[one-to-m-bidirectional-relationships]]
= 1-m Bidirectional relationships
: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 [...]
include::_attributes.adoc[]
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc b/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
index 3c2a7c1..f54bafe 100644
--- a/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
+++ b/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
@@ -16,7 +16,7 @@ Instead you need to create some sort of stable facade over your domain entities,
+
If the underlying entities change, then care must be taken to ensure that structure of the view model nevertheless is unchanged.
-* a second option is to solve the problem at the persistence layer, but defining a (SQL) view in the database and then xref:odn:ROOT:jdo-mappings/mapping-to-a-view.adoc[mapping this] to a (read-only) entity. Again this is surfaced by the RO viewer. +
+* a second option is to solve the problem at the persistence layer, but defining a (SQL) view in the database and then xref:odn:ROOT:jdo-mappings.adoc#mapping-to-a-view[mapping this] to a (read-only) entity. Again this is surfaced by the RO viewer. +
+
If the underlying tables change (as the result of a change in their corresponding domain entities) then once more the view must be refactored so that it still presents the same structure.
diff --git a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
index 12f742b..1598c22 100644
--- a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
+++ b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/configuration-properties.adoc
@@ -3,12 +3,12 @@
include::_attributes.adoc[]
-The Restful Objects viewer provides a couple of configuration option that extend/simplify/alter the representations
-generated from the Restful Objects specification.
+WARNING: TODO: v2 : moved instead to core config.
-These configuration properties are typically stored in `WEB-INF/viewer_restfulobjects.properties`. However, you can
-place all configuration properties into `WEB-INF/isis.properties` if you wish (the configuration properties from all
-config files are merged together).
+The Restful Objects viewer provides a couple of configuration option that extend/simplify/alter the representations generated from the Restful Objects specification.
+
+These configuration properties are typically stored in `WEB-INF/viewer_restfulobjects.properties`.
+However, you can place all configuration properties into `WEB-INF/isis.properties` if you wish (the configuration properties from all config files are merged together).
== Standard
diff --git a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
index 764b8f8..bf4d386 100644
--- a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
+++ b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/pages/hints-and-tips.adoc
@@ -11,3 +11,12 @@ Since the Restful Objects viewer is designed for computer programs to interact w
This section provides a few hints-and-tips to help you on your way.
+include::hints-and-tips/using-chrome-devtools.adoc[leveloffset=+1]
+include::hints-and-tips/angular-tips.adoc[leveloffset=+1]
+include::hints-and-tips/pretty-printing.adoc[leveloffset=+1]
+include::hints-and-tips/restful-image-property.adoc[leveloffset=+1]
+include::hints-and-tips/view-model-as-parameter.adoc[leveloffset=+1]
+include::hints-and-tips/troubleshooting.adoc[leveloffset=+1]
+
+//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
+
diff --git a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
index 2162b36a..83f1084 100644
--- a/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
+++ b/core/viewer-restfulobjects/src/main/doc/modules/ROOT/partials/module-nav.adoc
@@ -1,26 +1,9 @@
* xref:vro:ROOT:ro-spec.adoc[RO Spec]
-
* xref:vro:ROOT:architecture.adoc[Architecture]
-
* xref:vro:ROOT:layout-resources.adoc[Layout Resources]
-
* xref:vro:ROOT:health-check.adoc[Health Check]
-
* xref:vro:ROOT:simplified-representations.adoc[Simplified Representations]
-
* xref:vro:ROOT:configuration-properties.adoc[Configuration Properties]
-
-* xref:vro:ROOT:security.adoc[Hints-n-Tips]
-
+* xref:vro:ROOT:security.adoc[Security]
* xref:vro:ROOT:hints-and-tips.adoc[Hints-n-Tips]
-** xref:vro:ROOT:hints-and-tips/using-chrome-devtools.adoc[Using Chrome DevTools]
-** xref:vro:ROOT:hints-and-tips/angular-tips.adoc[Angular Tips]
-** xref:vro:ROOT:hints-and-tips/pretty-printing.adoc[Pretty Printing]
-** xref:vro:ROOT:hints-and-tips/restful-image-property.adoc[Restful Image Property]
-** xref:vro:ROOT:hints-and-tips/view-model-as-parameter.adoc[View Model as Parameter]
-** xref:vro:ROOT:hints-and-tips/troubleshooting.adoc[Troubleshooting]
-
-//https://lists.apache.org/thread.html/cbd18320bbf6e5c5e767283f9e675cf56e7f4692c109e1e79dbaa90a@%3Cusers.isis.apache.org%3E // FIXME: to add
-
-
diff --git a/site-scratch.yml b/site-scratch.yml
index f71b771..d343ec8 100644
--- a/site-scratch.yml
+++ b/site-scratch.yml
@@ -51,9 +51,9 @@ content:
# - url: .
# start_path: core/plugins/codegen-bytebuddy/src/main/doc # core
# branches: HEAD
-# - url: .
-# start_path: core/plugins/jaxrs-resteasy-4/src/main/doc # vro
-# branches: HEAD
+ - url: .
+ start_path: core/plugins/jaxrs-resteasy-4/src/main/doc # vro
+ branches: HEAD
- url: .
start_path: core/plugins/jdo/src/main/doc # odn
branches: HEAD
@@ -147,9 +147,9 @@ content:
# - url: .
# start_path: extensions/testing/specsupport/src/main/doc # testing
# branches: HEAD
-# - url: .
-# start_path: extensions/vro/restclient/src/main/doc # vro
-# branches: HEAD
+ - url: .
+ start_path: extensions/vro/restclient/src/main/doc # vro
+ branches: HEAD
# - url: .
# start_path: extensions/vw/asciidoc/src/main/doc # vw
# branches: HEAD