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 2015/05/03 18:05:34 UTC
isis git commit: ISIS-1133: more adocs - working through datanucleus
stuff.
Repository: isis
Updated Branches:
refs/heads/master ef1e765c8 -> 8a3235680
ISIS-1133: more adocs - working through datanucleus stuff.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8a323568
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8a323568
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8a323568
Branch: refs/heads/master
Commit: 8a32356802e0e26fc118a60aa43af852a22d8e83
Parents: ef1e765
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 3 17:05:21 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 3 17:05:21 2015 +0100
----------------------------------------------------------------------
.../user-guide/__/enabling-logging.adoc | 35 ------
.../_user-guide_how-tos_ui-hints.adoc | 56 +--------
...e_how-tos_ui-hints_action-icons-and-css.adoc | 60 ++++++++++
...-guide_how-tos_ui-hints_eager-rendering.adoc | 57 +++++++++
.../_user-guide_how-tos_ui-hints_layout.adoc | 14 +++
...how-tos_ui-hints_names-and-descriptions.adoc | 31 +++++
...ow-tos_ui-hints_object-titles-and-icons.adoc | 24 ++++
...reference_configuration-properties_core.adoc | 11 +-
...tion-properties_datanucleus-objectstore.adoc | 26 ++++
...bjectstore_eagerly-registering-entities.adoc | 18 +++
.../_user-guide_testing_integ-test-support.adoc | 119 ++++++++++++++++++-
11 files changed, 359 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/__/enabling-logging.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/__/enabling-logging.adoc b/adocs/documentation/src/main/asciidoc/user-guide/__/enabling-logging.adoc
deleted file mode 100644
index 0450236..0000000
--- a/adocs/documentation/src/main/asciidoc/user-guide/__/enabling-logging.adoc
+++ /dev/null
@@ -1,35 +0,0 @@
-Title: Enabling Logging
-
-Sometimes you just need to see what is going on. There are various ways in which logging can be enabled, here are some ideas.
-
-=== In Apache Isis
-
-Modify `WEB-INF/logging.properties` (a log4j config file)
-
-=== In DataNucleus
-
-As per the http://www.datanucleus.org/products/accessplatform/logging.html[DN logging page]
-
-=== In the JDBC Driver
-
-Configure log4jdbc JDBC rather than the vanilla driver (see `WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see `WEB-INF/logging.properties`).
-
-There are examples of both in the link:../../../intro/getting-started/simpleapp-archetype.html[simpleapp archetype].
-
-=== In the Database
-
-==== HSQLDB Logging
-
-Add `;sqllog=3` to the end of the JDBC URL.
-
-==== PostgreSQL Logging
-
-In `postgresql\9.2\data\postgresql.conf`:
-
-Will then log to `postgresql\9.2\data\pg_log` directory.
-
-Note that you must restart the service for this to be picked up.
-
-==== MS SQL Server Logging
-
-Use the excellent SQL Profiler tool.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints.adoc
index 9d94f97..f8e6e1a 100644
--- a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints.adoc
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints.adoc
@@ -5,59 +5,13 @@
IMPORTANT: TODO
-## Icons and Titles
+include::_user-guide_how-tos_ui-hints_object-titles-and-icons.adoc[leveloffset=+1]
-### Object Title
+include::_user-guide_how-tos_ui-hints_names-and-descriptions.adoc[leveloffset=+1]
-#### Titles in Tables
+include::_user-guide_how-tos_ui-hints_layout.adoc[leveloffset=+1]
-#### Hide part of a title
+include::_user-guide_how-tos_ui-hints_eager-rendering.adoc[leveloffset=+1]
-### Object Icon
-
-### Object CSS Styling
-
-## Names and Descriptions
-
-NOTE: see also i18n (TODO: convert to link)
-
-### Class (object)
-
-### Property
-
-### Collections
-
-### Actions
-
-### Action Parameters
-
-Use `@ParameterLayout(named=...)` or `@Named(...)`
-
-[TIP]
-====
-If you're running on Java 8, then note that it's possible to write Isis applications without using `@ParameterLayout(named=...)` annotation. Support for this can be found in the http://github.com/isisaddons/isis-metamodel-paraname8}[Isis addons' paraname8] metamodel extension (non-ASF). (In the future we'll fold this into core). See also our guidance on <<_upgrading_to_java_8_1_9_0_snapshot_and_later,upgrading to Java 8>>.
-====
-
-
-
-
-## Layout
-
-### Layout using annotations
-
-### Dynamic layouts
-
-### Application menu layout
-
-
-
-## Standardized font-awesome icons and CSS
-
-Use the following settings in isis.properties to apply CSS and font-awesome icons to object members (properties, collections and actions) based on their names.
-
-[source]
-----
-isis.reflector.facet.cssClassFa.patterns=\
-isis.reflector.facet.cssClass.patterns=\
-----
+include::_user-guide_how-tos_ui-hints_action-icons-and-css.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_action-icons-and-css.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_action-icons-and-css.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_action-icons-and-css.adoc
new file mode 100644
index 0000000..a2db15e
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_action-icons-and-css.adoc
@@ -0,0 +1,60 @@
+= Action Icons and CSS
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+
+Apache Isis allows link:fortawesome.github.io/Font-Awesome/icons/[font awesome] icons to be associated with each action, and for link:http://getbootstrap.com/css/#buttons[Bootstrap CSS] to be applied to action rendered as buttons.
+
+These UI hint can be applied either to individual actions, or can be applied en-masse using pattern matching.
+
+== Per action
+
+IMPORTANT: TODO - more words here...
+
+* `@CssClassFa`
+* `@CssClass`
+
+Alternatively, you can specify these hints in the `Xxx.layout.json` for the entity:
+
+IMPORTANT: TODO
+
+
+== Per pattern matching
+
+Rather than annotating every action with `@CssClassFa` and `@CssClass`, you can instead specify the UI hint globally using regular expressions.
+
+The `isis.reflector.facet.cssClassFa.patterns` is a comma separated list of key:value pairs, eg:
+
+[source,ini]
+----
+isis.reflector.facet.cssClassFa.patterns=\
+ new.*:fa-plus,\
+ add.*:fa-plus-square,\
+ create.*:fa-plus,\
+ list.*:fa-list, \
+ all.*:fa-list, \
+ download.*:fa-download, \
+ upload.*:fa-upload, \
+ execute.*:fa-bolt, \
+ run.*:fa-bolt
+----
+
+where the key is a regex matching action names (eg `create.*`) and the value is a link:fortawesome.github.io/Font-Awesome/icons/[font-awesome] icon name (eg `fa-plus`) to be applied (as per `@CssClassFa()`) to all action members matching the regex.
+
+Similarly, the `isis.reflector.facet.cssClass.patterns` is a comma separated list of key:value pairs, eg:
+
+[source,ini]
+----
+isis.reflector.facet.cssClass.patterns=\
+ delete.*:btn-warning
+----
+
+where (again)the key is a regex matching action names (eg `delete.*`) and the value is a link:http://getbootstrap.com/css/[Bootstrap] CSS button class (eg `btn-warning) to be applied (as per `@CssClass()`) to all action members matching the regex.
+
+[TIP]
+====
+We strongly recommend that you use this technique rather than annotating each action with `@CssClassFa` or `@CssClass`. Not only is the code more maintainable, you'll also find that it forces you to be consistent in your action names.
+====
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_eager-rendering.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_eager-rendering.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_eager-rendering.adoc
new file mode 100644
index 0000000..1636aac
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_eager-rendering.adoc
@@ -0,0 +1,57 @@
+= Eager rendering
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+
+By default, collections all rendered lazily, in other words in a "collapsed" table view:
+
+IMPORTANT: TODO - screenshot here
+
+For the more commonly used collections we want to show the table expanded:
+
+IMPORTANT: TODO - screenshot here
+
+For this we annotate the collection using the `@CollectionLayout(render=RenderType.EAGERLY`; for example
+
+[source,java]
+----
+@javax.jdo.annotations.Persistent(table="ToDoItemDependencies")
+private Set<ToDoItem> dependencies = new TreeSet<>();
+@Collection
+@CollectionLayout(
+ render = RenderType.EAGERLY
+)
+public Set<ToDoItem> getDependencies() {
+ return dependencies;
+}
+----
+
+Alternatively, it can be specified the `Xxx.layout.json` file:
+
+[source,javascript]
+----
+"dependencies": {
+ "collectionLayout": {
+ "render": "EAGERLY"
+ },
+}
+----
+
+[WARNING]
+====
+It might be thought that collections that are eagerly rendered should also be eagerly loaded from the database by enabling the `defaultFetchGroup` attribute:
+
+[source,java]
+----
+@javax.jdo.annotations.Persistent(table="ToDoItemDependencies", defaultFetchGroup="true")
+private Set<ToDoItem> dependencies = new TreeSet<>();
+...
+----
+
+While this can be done, it's likely to be a bad idea, because doing so will cause DataNucleus to query for more data than required even if the object is being rendered within some referencing object's table.
+
+Of course, your mileage may vary, so don't think you can't experiment.
+====
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_layout.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_layout.adoc
new file mode 100644
index 0000000..8f8bdcf
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_layout.adoc
@@ -0,0 +1,14 @@
+= Layout
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+IMPORTANT: TODO
+
+
+== Layout using annotations
+
+== Dynamic layouts
+
+== Application menu layout
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_names-and-descriptions.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_names-and-descriptions.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_names-and-descriptions.adoc
new file mode 100644
index 0000000..042312f
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_names-and-descriptions.adoc
@@ -0,0 +1,31 @@
+= Names and Descriptions
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+IMPORTANT: TODO
+
+
+
+NOTE: see also <<_i18n, Internationalization>>
+
+=== Class (object)
+
+=== Property
+
+=== Collections
+
+=== Actions
+
+=== Action Parameters
+
+Use `@ParameterLayout(named=...)` or `@Named(...)`
+
+[TIP]
+====
+If you're running on Java 8, then note that it's possible to write Isis applications without using `@ParameterLayout(named=...)` annotation. Support for this can be found in the http://github.com/isisaddons/isis-metamodel-paraname8}[Isis addons' paraname8] metamodel extension (non-ASF). (In the future we'll fold this into core). See also our guidance on <<_upgrading_to_java_8_1_9_0_snapshot_and_later,upgrading to Java 8>>.
+====
+
+
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_object-titles-and-icons.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_object-titles-and-icons.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_object-titles-and-icons.adoc
new file mode 100644
index 0000000..02b1c25
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_how-tos_ui-hints_object-titles-and-icons.adoc
@@ -0,0 +1,24 @@
+= Object Titles and Icons
+: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 agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+:_basedir: ../
+:_imagesdir: images/
+
+IMPORTANT: TODO
+
+
+== Object Title
+
+=== Titles in Tables
+
+=== Hide part of a title
+
+
+
+== Object Icon
+
+
+
+
+== Object CSS Styling
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_core.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_core.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_core.adoc
index d848f8d..ff525c0 100644
--- a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_core.adoc
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_core.adoc
@@ -27,6 +27,15 @@ IMPORTANT: WIP...
|`true`,`_false_`
| Disables concurrency checking globally. Only intended for "emergency use" as a workaround while pending fix/patch to Isis itself. (Note that there is no "datanucleus" in the property).
-|===
+|`isis.reflector.facet.` +
+`cssClassFa.patterns`
+|regex:fa-icon,regex2:fa-icon2,...
+|Comma separated list of key:value pairs, where the key is a regex matching action names (eg `create.*`) and the value is a link:fortawesome.github.io/Font-Awesome/icons/[font-awesome] icon name (eg `fa-plus`) to be applied (as per `@CssClassFa()`) to all action members matching the regex.
+
+|`isis.reflector.facet.` +
+`cssClass.patterns`
+|regex:css1,regex2:css2,...
+|Comma separated list of key:value pairs, where the key is a regex matching action names (eg `delete.*`) and the value is a link:http://getbootstrap.com/css/[Bootstrap] CSS button class (eg `btn-warning) to be applied (as per `@CssClass()`) to all action members matching the regex.
+|===
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore.adoc
index 6db85ef..d3ae171 100644
--- a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore.adoc
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore.adoc
@@ -20,6 +20,32 @@ These configuration properties are typically stored in `WEB-INF/persistor_datanu
|
| Passed through directly to Datanucleus (with `isis.persistor.datanucleus.impl` prefix stripped)
+
+ // run-in memory
+ addDataNucleusProperty("javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
+ addDataNucleusProperty("javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
+ addDataNucleusProperty("javax.jdo.option.ConnectionUserName", "sa");
+ addDataNucleusProperty("javax.jdo.option.ConnectionPassword", "");
+
+ // Don't do validations that consume setup time.
+ addDataNucleusProperty(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_ALL, "true");
+ addDataNucleusProperty(PropertyNames.PROPERTY_SCHEMA_VALIDATE_ALL, "false");
+
+ // other properties as per WEB-INF/persistor_datanucleus.properties
+ addDataNucleusProperty("datanucleus.persistenceByReachabilityAtCommit", "false");
+ addDataNucleusProperty("datanucleus.identifier.case", "MixedCase");
+ addDataNucleusProperty("datanucleus.cache.level2.type","none");
+ addDataNucleusProperty("datanucleus.cache.level2.mode","ENABLE_SELECTIVE");
+
+ // automatically install any fixtures that might have been registered
+ add(DataNucleusObjectStore.INSTALL_FIXTURES_KEY , "true");
+
+ add(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, ""+PersistenceConstants.ENFORCE_SAFE_SEMANTICS_DEFAULT);
+
+ add("isis.deploymentType", "server_prototype");
+
+
+
|`isis.persistor.datanucleus.impl` +
`.datanucleus.persistenceByReachabilityAtCommit
|false
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore_eagerly-registering-entities.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore_eagerly-registering-entities.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore_eagerly-registering-entities.adoc
index 4275763..3748ac3 100644
--- a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore_eagerly-registering-entities.adoc
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_reference_configuration-properties_datanucleus-objectstore_eagerly-registering-entities.adoc
@@ -23,3 +23,21 @@ In the `persistor_datanucleus.properties`, specify the package prefix(es) of you
The value of this property can be a comma-separated list (if there is more than one package or Maven module that holds persistable entities).
+
+== Integration Testing
+
+The `IsisConfigurationForJdoIntegTests`, recommended for use in <<_integration_testing, Integration Testing>> provides the `#addRegisterEntitiesPackagePrefix()` method to set up this configuration property:
+
+[source,java]
+.Integration test bootstrapping
+----
+private static class SimpleAppSystemBuilder extends IsisSystemForTest.Builder {
+ ...
+ private static IsisConfiguration testConfiguration() {
+ final IsisConfigurationForJdoIntegTests testConfiguration = new IsisConfigurationForJdoIntegTests();
+ testConfiguration.addRegisterEntitiesPackagePrefix("domainapp.dom.modules"); // <1>
+ return testConfiguration;
+ }
+}
+----
+<1> specify the package prefix(es) for integration testing.
http://git-wip-us.apache.org/repos/asf/isis/blob/8a323568/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_testing_integ-test-support.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_testing_integ-test-support.adoc b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_testing_integ-test-support.adoc
index 399c2e7..1435e89 100644
--- a/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_testing_integ-test-support.adoc
+++ b/adocs/documentation/src/main/asciidoc/user-guide/_user-guide_testing_integ-test-support.adoc
@@ -3,17 +3,126 @@
:_basedir: ../
:_imagesdir: images/
+
IMPORTANT: TODO
-## Introduction
+== Bootstrapping
-IMPORTANT: TODO
+[source,java]
+.Integration test bootstrapping
+----
+private static class SimpleAppSystemBuilder extends IsisSystemForTest.Builder {
-## Using the WrapperFactory
+ public SimpleAppSystemBuilder() {
+ withLoggingAt(org.apache.log4j.Level.INFO);
+ with(testConfiguration());
+ with(new DataNucleusPersistenceMechanismInstaller());
-IMPORTANT: TODO
+ // services annotated with @DomainService
+ withServicesIn( "domainapp" );
+ }
+
+ private static IsisConfiguration testConfiguration() {
+ final IsisConfigurationForJdoIntegTests testConfiguration = new IsisConfigurationForJdoIntegTests(); // <1>
+
+ testConfiguration.addRegisterEntitiesPackagePrefix("domainapp.dom.modules");
+ return testConfiguration;
+ }
+}
+----
+<1> uses `IsisConfigurationForJdoIntegTests` for in-memory HSQLDB and other standard settings, see <<_isisconfigurationforjdointegtests, below>>.
+
+The <<_simpleapp_archetype, SimpleApp archetype>> is already set up to do this.
+
+
+
+== IsisConfigurationForJdoIntegTests
+
+IMPORTANT: WIP...
+
+When running integration tests with the JDO/DataNucleus Objectstore, there are certain standard configuration properties that are usually set. For example, integration tests are usually run against an in-memory HSQLDB database.
+
+To remove a little bit of boilerplate, the `IsisConfigurationForJdoIntegTests` class (in the `org.apache.isis.objectstore.jdo.datanucleus` package) can be used to bootstrap the application.
+
+
+.Default Configuration Properties for Integration Tests
+[cols="2a,1,3a", options="header"]
+|===
+|Property
+|Value
+|Description
+
+|`isis.persistor.datanucleus.impl.` +
+`javax.jdo.option.ConnectionURL`
+|jdbc:hsqldb:mem:test
+|JDBC URL
+
+|`isis.persistor.datanucleus.impl.` +
+`javax.jdo.option.ConnectionDriverName`
+|org.hsqldb.jdbcDriver
+|JDBC Driver
-## IsisConfigurationForJdoIntegTests
+|`isis.persistor.datanucleus.impl.` +
+`javax.jdo.option.ConnectionUserName`
+|sa
+|Username
+
+|`isis.persistor.datanucleus.impl.` +
+`javax.jdo.option.ConnectionPassword`
+|<empty string>
+|Password
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.schema.autoCreateAll`
+|true
+|Recreate DB for each test run (an in-memory database)
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.schema.validateAll`
+|false
+|Disable validations (minimize bootstrap time)
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.persistenceByReachabilityAtCommit`
+|false
+|As per WEB-INF/persistor_datanucleus.properties
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.identifier.case`
+|MixedCase
+|As per WEB-INF/persistor_datanucleus.properties
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.cache.level2.type`
+|none
+|As per WEB-INF/persistor_datanucleus.properties
+
+|`isis.persistor.datanucleus.impl.` +
+`datanucleus.cache.level2.mode`
+|ENABLE_SELECTIVE
+|As per WEB-INF/persistor_datanucleus.properties
+
+|`isis.persistor.datanucleus.` +
+`install-fixtures`
+|true
+|Automatically install any fixtures that might have been registered
+
+|`isis.persistor.` +
+`enforceSafeSemantics`
+|false
+|
+
+|`isis.deploymentType`
+|server_prototype
+|
+|===
+
+
+
+== WrapperFactory
IMPORTANT: TODO
+
+
+