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/10/09 09:59:06 UTC

[isis] 02/05: Merge branch 'ISIS-2003'

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 18b0f4fff621cacfc2517ede53e41df2020e1da0
Merge: 2d16839 164ccc1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 09:01:04 2018 +0100

    Merge branch 'ISIS-2003'
    
    # Conflicts:
    #	example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml

 .../services/metamodel/MetaModelExporter.java      |   72 +-
 .../apache/isis/schema/metamodel/metamodel-1.0.xsd |  135 ++-
 .../integtests/{tests => }/mml/.gitignore          |    0
 .../mml/MetaModelService_IntegTest.java            |   69 +-
 ...ixtureScriptsSpecificationProvider.approved.xml |   50 +
 ....services.homepage.HomePageService.approved.xml |   49 +
 ...ervices.homepage.HomePageViewModel.approved.xml |  412 ++++++++
 ...dules.simple.dom.impl.SimpleObject.approved.xml | 1075 ++++++++++++++++++++
 ...ules.simple.dom.impl.SimpleObjects.approved.xml |  330 ++++++
 .../integtests/mml/_java.lang.Long.approved.xml    |    2 +
 .../integtests/mml/_java.lang.Object.approved.xml  |    2 +
 .../integtests/mml/_java.lang.String.approved.xml  |    2 +
 .../integtests/mml/_java.net.URL.approved.xml      |    2 +
 .../mml/_java.sql.Timestamp.approved.xml           |    2 +
 .../integtests/mml/_java.util.List.approved.xml    |    2 +
 ...ervices.layout.LayoutService$Style.approved.xml |    2 +
 ..._org.apache.isis.applib.value.Clob.approved.xml |    2 +
 .../application/integtests/mml/_void.approved.xml  |    2 +
 .../{tests => }/smoke/Smoke_IntegTest.java         |    2 +-
 19 files changed, 2100 insertions(+), 112 deletions(-)