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:04 UTC
[isis] branch master updated (0f8bfce -> 66a9337)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 0f8bfce ISIS-2003: updates approvals
add 68d36bf ISIS-2003: adds further config options
new 2d16839 Merge branch 'ISIS-2003'
add 164ccc1 ISIS-2003: breaks out approvals into separate files
new 18b0f4f Merge branch 'ISIS-2003'
add 3bcd905 ISIS-2003: uses folders instead of filenames for received vs approved
new 4ac0f53 Merge branch 'ISIS-2003'
new e01c85a ISIS-2003: minor update to approvals for SimpleObjects
add d7f81d5 ISIS-2003: makes facets non-mandatory for facetholders in mml.xsd
new 66a9337 Merge branch 'ISIS-2003'
The 5 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:
.../services/metamodel/MetaModelService6.java | 30 +-
.../services/metamodel/MetaModelExporter.java | 156 +--
.../apache/isis/schema/metamodel/metamodel-1.0.xsd | 137 ++-
.../integtests/mml/MetaModelService_IntegTest.java | 149 +++
...omainAppFixtureScriptsSpecificationProvider.xml | 50 +
...plication.services.homepage.HomePageService.xml | 49 +
...ication.services.homepage.HomePageViewModel.xml | 412 ++++++++
...ainapp.modules.simple.dom.impl.SimpleObject.xml | 1075 ++++++++++++++++++++
...inapp.modules.simple.dom.impl.SimpleObjects.xml | 329 ++++++
.../integtests/mml/approved/java.lang.Long.xml | 2 +
.../integtests/mml/approved/java.lang.Object.xml | 2 +
.../integtests/mml/approved/java.lang.String.xml | 2 +
.../integtests/mml/approved/java.net.URL.xml | 2 +
.../integtests/mml/approved/java.sql.Timestamp.xml | 2 +
.../integtests/mml/approved/java.util.List.xml | 2 +
....applib.services.layout.LayoutService$Style.xml | 2 +
.../approved/org.apache.isis.applib.value.Clob.xml | 2 +
.../application/integtests/mml/approved/void.xml | 2 +
.../application/integtests/mml/received/.gitignore | 1 +
.../{tests => }/smoke/Smoke_IntegTest.java | 2 +-
.../application/integtests/tests/mml/.gitignore | 1 -
.../tests/mml/MetaModelService_IntegTest.java | 71 --
22 files changed, 2259 insertions(+), 221 deletions(-)
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageService.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml
create mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/received/.gitignore
rename example/application/simpleapp/application/src/test/java/domainapp/application/integtests/{tests => }/smoke/Smoke_IntegTest.java (97%)
delete mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/.gitignore
delete mode 100644 example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.java
[isis] 05/05: Merge branch 'ISIS-2003'
Posted by da...@apache.org.
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 66a9337e7cb2fe7e4023d661b1507a28065033b6
Merge: e01c85a d7f81d5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 10:58:17 2018 +0100
Merge branch 'ISIS-2003'
.../main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[isis] 02/05: Merge branch 'ISIS-2003'
Posted by da...@apache.org.
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(-)
[isis] 04/05: ISIS-2003: minor update to approvals for SimpleObjects
Posted by da...@apache.org.
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 e01c85ae646878059256f948d10537611de4e9b9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 10:26:45 2018 +0100
ISIS-2003: minor update to approvals for SimpleObjects
---
.../mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
index 605f7f2..96cc27e 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
@@ -88,7 +88,6 @@
<mml:facet id="org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet" fqcn="org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation">
<mml:attr name="value">NON_IDEMPOTENT</mml:attr>
</mml:facet>
- <mml:facet id="org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet" fqcn="org.apache.isis.core.metamodel.facets.members.describedas.annotprop.DescribedAsFacetOnMemberDerivedFromType"/>
<mml:facet id="org.apache.isis.core.metamodel.facets.all.named.NamedFacet" fqcn="org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated">
<mml:attr name="context">domainapp.modules.simple.dom.impl.SimpleObjects#create()</mml:attr>
<mml:attr name="originalText">Create</mml:attr>
[isis] 01/05: Merge branch 'ISIS-2003'
Posted by da...@apache.org.
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 2d168390d4a51895fac69a684a10f04385d714ba
Merge: 0f8bfce 68d36bf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 00:32:59 2018 +0100
Merge branch 'ISIS-2003'
.../services/metamodel/MetaModelService6.java | 30 ++++++--
.../services/metamodel/MetaModelExporter.java | 90 +++++++++++++---------
2 files changed, 74 insertions(+), 46 deletions(-)
[isis] 03/05: Merge branch 'ISIS-2003'
Posted by da...@apache.org.
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 4ac0f538b88744472e865fcbade93607033b6c9f
Merge: 18b0f4f 3bcd905
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 10:15:04 2018 +0100
Merge branch 'ISIS-2003'
.../application/integtests/mml/.gitignore | 1 -
.../integtests/mml/MetaModelService_IntegTest.java | 29 +++++++++++++++++++---
...mainAppFixtureScriptsSpecificationProvider.xml} | 0
...lication.services.homepage.HomePageService.xml} | 0
...cation.services.homepage.HomePageViewModel.xml} | 0
...inapp.modules.simple.dom.impl.SimpleObject.xml} | 0
...napp.modules.simple.dom.impl.SimpleObjects.xml} | 0
.../java.lang.Long.xml} | 0
.../java.lang.Object.xml} | 0
.../java.lang.String.xml} | 0
.../java.net.URL.xml} | 0
.../java.sql.Timestamp.xml} | 0
.../java.util.List.xml} | 0
...applib.services.layout.LayoutService$Style.xml} | 0
.../org.apache.isis.applib.value.Clob.xml} | 0
.../mml/{_void.approved.xml => approved/void.xml} | 0
.../application/integtests/mml/received/.gitignore | 1 +
17 files changed, 27 insertions(+), 4 deletions(-)