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 2018/09/18 07:40:33 UTC

[isis] branch v2 updated (52399ce -> cd0f74e)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 52399ce  ISIS-1811: CI/CD: bump BASLINE 2.0.0-M1 -> 2.0.0-M2
     new 78cc591  ISIS-1811: removes section from ad.adoc
     add ea7a161  ISIS-1899: adds a diagram of the metamodel
     add a2d8ba8  ISIS-1899: updates docs re: publishing website
     add 37d11c0  ISIS-1899: updates ad.adoc
     new 50aa367  ISIS-1899: updates document.html.erb version to 1.16.2
     new cd0f74e  Merge branch 'master' into v2

The 3 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:
 adocs/documentation/README.adoc                    |  71 +-----
 .../src/main/asciidoc/__versions.adoc              |   3 +-
 .../main/asciidoc/guides/ad/_images/metamodel.png  | Bin 0 -> 38751 bytes
 .../src/main/asciidoc/guides/ad/ad.adoc            | 240 +++++++++++++++++----
 .../cgcom/_cgcom_post-release-successful.adoc      |  52 ++---
 .../cgcom/_cgcom_post-release-unsuccessful.adoc    |  26 +--
 6 files changed, 250 insertions(+), 142 deletions(-)
 create mode 100644 adocs/documentation/src/main/asciidoc/guides/ad/_images/metamodel.png


[isis] 01/03: ISIS-1899: updates document.html.erb version to 1.16.2

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 50aa367dbcc2b8c1e5d58280cc0d9eac8603e6be
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 18 07:11:14 2018 +0100

    ISIS-1899: updates document.html.erb version to 1.16.2
    
    prior to republishing 1.16.2 docs with updated content
---
 adocs/template/document.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index f4c7966..4aa2979 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -203,7 +203,7 @@
                 </form>
             </div>
 
-            <p class="nav navbar-text navbar-right small">v1.16.3-SNAPSHOT</p>
+            <p class="nav navbar-text navbar-right small">v1.16.2</p>
 
         </div>
     </div>


[isis] 03/03: Merge branch 'master' into v2

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit cd0f74e7cc94e3e57db3fd4b0a853b9dbbda928a
Merge: 78cc591 50aa367
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 18 08:39:59 2018 +0100

    Merge branch 'master' into v2
    
    # Conflicts:
    #	adocs/documentation/src/main/asciidoc/__versions.adoc
    #	adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
    #	adocs/template/document.html.erb

 adocs/documentation/README.adoc                    |  71 +-----
 .../src/main/asciidoc/__versions.adoc              |   3 +-
 .../main/asciidoc/guides/ad/_images/metamodel.png  | Bin 0 -> 38751 bytes
 .../src/main/asciidoc/guides/ad/ad.adoc            | 239 ++++++++++++++++++---
 .../cgcom/_cgcom_post-release-successful.adoc      |  52 ++---
 .../cgcom/_cgcom_post-release-unsuccessful.adoc    |  26 +--
 6 files changed, 251 insertions(+), 140 deletions(-)

diff --cc adocs/documentation/src/main/asciidoc/__versions.adoc
index 58f636b,eceea95..af82873
--- a/adocs/documentation/src/main/asciidoc/__versions.adoc
+++ b/adocs/documentation/src/main/asciidoc/__versions.adoc
@@@ -1,4 -1,5 +1,5 @@@
 -:isiscurr: 1.16.2
 -:isisnext: 1.16.3
 -:isisnextafter: 1.16.4
 +:isiscurr: 2.0.0-M1
 +:isisnext: 2.0.0-M2
 +:isisnextafter: 2.0.0-M3
- :isisdev: {isisnext}-SNAPSHOT
+ :isisdev: {isisnext}-SNAPSHOT
+ :isisdevafter: {isisnextafter}-SNAPSHOT
diff --cc adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
index f1ca950,16e305a..4a22885
--- a/adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
@@@ -70,133 -68,81 +70,144 @@@ All of these have the same Maven `group
  | `isis-core-applib`
  | Core application library.
  
 +| `isis-core-commons`
 +| Commons library
 +
 +
- | `isis-core-integtestsupport`
++| `isis-core-detached-test`
 +|
 +
- | `isis-core-log4j`
- |
+ | `isis-core-integtestsupport`
+ | Integration test support.
+ Application integration tests typically extend from adapter superclasses defined in this module.
  
- | `isis-maven-plugin`
- |
+ | `isis-core-log4j`
+ | Configures Log4j as the logging framework
  
  | `isis-core-metamodel`
- |
+ | The classes that make up the metamodel which is used to render the UI.
+ 
+ See the xref:ad.adoc#__ad_metamodel[section below] which also includes a simplified UML diagram of these classes.
  
  | `isis-core-runtime`
- |
+ | The classes that make up runtime management and persistence of domain objects, as well as framework for security (concepts of authentication or authorisation).
+ 
  
  | `isis-core-schema`
- |
+ | Defines XSDs and generated classes that capture commands and interactions in XML form.
  
  | `isis-core-security`
- |
+ | Defines a "bypass" implementation of security, for prototyping only.
+ 
+ Using this implementation, any user/password is accepted and
  
  | `isis-core-security-shiro`
- |
+ | Defines an implementation of security authentication which delegates to Apache Shiro.
  
  | `isis-core-specsupport`
- |
+ | Application BDD specs typically inherit from classes defined in this module.
  
  | `isis-core-unittestsupport`
- |
- 
- | `isis-core-unittestsupport-test`
- |
+ | Application unit tests may use some of the utilities defined in this module.
  
  | `isis-core-viewer-restfulobjects-applib`
- |
+ | Defines a client-side Java library for interacting with the REST API exposed by the Restful Objects viewer.
  
  | `isis-core-viewer-restfulobjects-rendering`
- |
+ | Provides a `RepresentationService` API and a lower-level `ContentNegotiationService` API, along with implementations of each.
+ 
+ These implementations provide support for the representations defined by Restful Objects spec v1.0, as well as a number of other Apache Isis-specific representations.
  
  | `isis-core-viewer-restfulobjects-server`
- |
+ | Defines the JAX-RS resources supported by the Restful Objects viewer.
+ 
+ These parse the input, delegate to the runtime for a response, and hand control to the rendering module to generate a representation.
  
  | `isis-core-viewer-wicket-applib`
- |
+ | Currently just defines `WicketDeveloperUtilitiesService`, for clearing the cache.
  
  | `isis-core-viewer-wicket-impl`
- |
+ | The top-level integration with Wicket, for example defining the Apache Isis-specific implementations/subclasses of the Wicket APIs for application, web session, localizer and request cycle.
+ 
+ Also defines registries of pages and components, as well as a number of domain services and mixins (for use by applications) that are only available within the Wicket viewer.
  
  | `isis-core-viewer-wicket-model`
- |
+ | Serializable mementos representing the state of runtime domain objects (or their individual members).
  
  | `isis-core-viewer-wicket-ui`
- |
+ | UI components that render the moduls.
  
 -//| `isis-webdocker`
 -//| Creates a Docker image for Tomcat that also contains the Apache Isis libraries, thereby enabling "skinny war" support.
 +| `isis-webdocker`
- |
++| Creates a Docker image for Tomcat that also contains the Apache Isis libraries, thereby enabling "skinny war" support.
+ 
 -// commented out because only added in 1.16.3-SNAPSHOT
  
  | `isis-core-webserver`
- |
+ | For development within an IDE, provides a utility class to bootstrap the application (using Jetty).
  
  | `isis-core-wrapper`
- |
+ | Provides an implementation of the `WrapperFactory` domain service.
+ 
  
 +
 +|===
 +
 +
 +=== core/plugins
 +
 +The `core/plugins` modules ...
 +
 +All of these have the same Maven `groupId`, namely `org.apache.isis.core`.
 +
 +.Plugin Modules
 +[monotree]
 +----
 +> core/
 +>> plugins/
 +>>> codegen-bytebuddy/      # isis-core-plugins-codegen-bytebuddy
 +>>> codegen-javassist/      # isis-core-plugins-codegen-javassist
 +>>> discovery-reflections/  # isis-core-plugins-discovery-reflections
 +>>> eventbus-axon/          # isis-core-plugins-eventbus-axon
 +>>> eventbus-guava/         # isis-core-plugins-eventbus-guava
 +>>> jaxrs-resteasy-3/       # isis-core-plugins-jaxrs-resteasy-3
 +>>> jaxrs-resteasy-4/       # isis-core-plugins-jaxrs-resteasy-4
 +>>> jdo-datanucleus-4/      # isis-core-plugins-jdo-datanucleus-4
 +>>> jdo-datanucleus-5/      # isis-core-plugins-jdo-datanucleus-5
 +----
 +
 +.core/mavendeps maven modules
 +[cols="2a,4a", options="header"]
  |===
  
 +| Module
 +| Description
 +| `isis-core-plugins-codegen-bytebuddy`
 +|
 +
 +| `isis-core-plugins-codegen-javassist`
 +|
 +
 +| `isis-core-plugins-discovery-reflections`
 +|
 +
 +| `isis-core-plugins-eventbus-axon`
 +|
 +
 +| `isis-core-plugins-eventbus-guava`
 +|
 +
 +| `isis-core-plugins-jaxrs-resteasy-3`
 +|
 +
 +| `isis-core-plugins-jaxrs-resteasy-4`
 +|
 +
 +| `isis-core-plugins-jdo-datanucleus-4`
 +|
  
 +| `isis-core-plugins-jdo-datanucleus-5`
 +|
 +
 +|===
  
  
  === core/mavendeps


[isis] 02/03: ISIS-1811: removes section from ad.adoc

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 78cc5919d09f71bd60f467eae2ad91e5085db88a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 18 08:33:36 2018 +0100

    ISIS-1811: removes section from ad.adoc
---
 adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc b/adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
index 90aa712..f1ca950 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ad/ad.adoc
@@ -359,6 +359,3 @@ Its Maven `groupId` is `org.apache.isis.tools`.
 
 
 
-[[__ad_plugins]]
-== Plugins
-