ISIS-1287: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/52481026 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/52481026 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/52481026 Branch: refs/heads/master Commit: 52481026a38abb1f38ca69c8911644f1e6190acf Parents: 4fe2902 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Fri Mar 25 10:54:29 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Fri Mar 25 10:54:29 2016 +0000 ---------------------------------------------------------------------- example/archetype/simpleapp/pom.xml | 2 +- .../homepage/HomePageViewModel.layout.xml | 5 ++ .../prototyping/HideMixinsForHomePage.java | 56 -------------------- .../resources/archetype-resources/dom/pom.xml | 7 ++- .../java/domainapp/dom/simple/SimpleObject.java | 4 ++ .../dom/simple/SimpleObject.layout.xml | 4 +- .../archetype-resources/integtests/pom.xml | 3 -- .../main/resources/archetype-resources/pom.xml | 4 +- .../projects/basic/archetype.properties | 2 +- 9 files changed, 20 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index a0b38f1..61b619f 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -44,7 +44,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>1.12.0-SNAPSHOT</version> + <version>1.12.0</version> <relativePath>../../../core/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml index f9c33fc..036ca8e 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml @@ -28,6 +28,8 @@ <bs3:col span="12" unreferencedActions="true"> <domainObject/> <action id="clearHints" hidden="EVERYWHERE"/> + <action id="downloadLayoutXml" hidden="EVERYWHERE"/> + <action id="rebuildMetamodel" hidden="EVERYWHERE"/> </bs3:col> </bs3:row> </bs3:col> @@ -40,6 +42,9 @@ </bs3:col> </bs3:row> <bs3:row> + + </bs3:row> + <bs3:row> <bs3:col span="0"> <fieldSet name="General" id="general" unreferencedProperties="true"/> </bs3:col> http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java deleted file mode 100644 index b5c0a7b..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java +++ /dev/null @@ -1,56 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * 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. - */ -package domainapp.app.services.prototyping; - -import java.util.List; - -import com.google.common.eventbus.Subscribe; - -import org.apache.isis.applib.AbstractSubscriber; -import org.apache.isis.applib.annotation.DomainService; -import org.apache.isis.applib.annotation.NatureOfService; -import org.apache.isis.applib.services.layout.Object_downloadLayoutXml; -import org.apache.isis.applib.services.layout.Object_rebuildMetamodel; - -import domainapp.app.services.homepage.HomePageViewModel; - -@DomainService( - nature = NatureOfService.DOMAIN -) -public class HideMixinsForHomePage extends AbstractSubscriber{ - - @Subscribe - public void on(Object_rebuildMetamodel.ActionDomainEvent ev) { - final List<Object> arguments = ev.getArguments(); - if(arguments.get(0) instanceof HomePageViewModel) { - ev.hide(); - } - } - - @Subscribe - public void on(Object_downloadLayoutXml.ActionDomainEvent ev) { - final List<Object> arguments = ev.getArguments(); - if(arguments.get(0) instanceof HomePageViewModel) { - ev.hide(); - } - } -} http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml index 2d7b105..fbaca0c 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml @@ -180,7 +180,12 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>16.0.1</version> + <version>19.0.20150826</version> + </dependency> + <dependency> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>2.3.1</version> </dependency> </dependencies> <executions> http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java index 417f5fa..5e9a6f6 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.java @@ -26,6 +26,7 @@ import javax.jdo.annotations.VersionStrategy; import org.apache.isis.applib.annotation.Action; import org.apache.isis.applib.annotation.DomainObject; +import org.apache.isis.applib.annotation.Property; import org.apache.isis.applib.annotation.SemanticsOf; import org.apache.isis.applib.services.eventbus.ActionDomainEvent; import org.apache.isis.applib.services.eventbus.PropertyDomainEvent; @@ -73,6 +74,9 @@ public class SimpleObject implements Comparable<SimpleObject> { allowsNull="false", length = NAME_LENGTH ) + @Property( + domainEvent = NameDomainEvent.class + ) private String name; public String getName() { return name; http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml index 4cbc4f7..7dd3383 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml @@ -35,9 +35,7 @@ <bs3:col span="12"> <c:fieldSet name="Name"> <c:action id="delete"/> - <c:property id="name" namedEscaped="true"> - <c:action id="updateName" position="BELOW"/> - </c:property> + <c:property id="name" namedEscaped="true"/> </c:fieldSet> </bs3:col> </bs3:row> http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml index c1628f8..84f8899 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml @@ -155,9 +155,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <testFailureIgnore>true</testFailureIgnore> - </configuration> </plugin> <plugin> <groupId>net.masterthought</groupId> http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml index 7194010..a35dbac 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -32,7 +32,7 @@ </prerequisites> <properties> - <isis.version>1.12.0-SNAPSHOT</isis.version> + <isis.version>1.12.0</isis.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -119,7 +119,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> + <version>2.19.1</version> <configuration> <includes> <include>**/*Test.java</include> http://git-wip-us.apache.org/repos/asf/isis/blob/52481026/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties index 6a6f45c..1c3daeb 100644 --- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties +++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties @@ -1,4 +1,4 @@ -#Sat Mar 19 14:39:01 GMT 2016 +#Fri Mar 25 10:54:14 GMT 2016 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it
