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 2016/05/21 07:10:57 UTC
[56/56] [abbrv] isis git commit: ISIS-1335: recreating simpleapp
archetype for 1.13.0-SNAPSHOT
ISIS-1335: recreating simpleapp archetype for 1.13.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cbb4c4cb
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cbb4c4cb
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cbb4c4cb
Branch: refs/heads/master
Commit: cbb4c4cb1718fed111b675cb28813be4478a24c4
Parents: 16c60a5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat May 21 08:09:41 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat May 21 08:09:41 2016 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 6 ++--
.../META-INF/maven/archetype-metadata.xml | 6 ----
.../app/services/homepage/HomePageService.java | 11 -------
.../services/homepage/HomePageViewModel.java | 5 +--
.../java/domainapp/dom/simple/SimpleObject.java | 33 +++++++++++++++++++-
.../domainapp/dom/simple/SimpleObjects.java | 19 ++++++-----
.../src/main/webapp/WEB-INF/logging.properties | 11 +++++++
.../webapp/src/main/webapp/WEB-INF/web.xml | 24 +++++++++++---
.../projects/basic/archetype.properties | 2 +-
9 files changed, 79 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 2d9abe4..2195a60 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
@@ -29,14 +29,14 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</extension>
</extensions>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
index 847ea88..ef9a445 100644
--- a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -61,12 +61,6 @@
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageService.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageService.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageService.java
index 8efe0fd..744ac0b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageService.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageService.java
@@ -22,22 +22,11 @@
package domainapp.app.services.homepage;
import org.apache.isis.applib.annotation.Action;
-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.HomePage;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-=======
-import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
-import org.apache.isis.applib.services.layout.Object_downloadLayoutXml;
-import org.apache.isis.applib.services.layout.Object_rebuildMetamodel;
-
-import domainapp.app.services.homepage.HomePageViewModel;
->>>>>>> ISIS-1343: extend ActionI invocation to take the targetAdapter, mixedInAdapter (can be null) and arg array.:example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/prototyping/HideMixinsForHomePage.java
@DomainService(
nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY // trick to suppress the actions from the top-level menu
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.java
index 86593d3..5072ea8 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.java
@@ -24,6 +24,7 @@ package domainapp.app.services.homepage;
import java.util.List;
import org.apache.isis.applib.annotation.ViewModel;
+import org.apache.isis.applib.services.i18n.TranslatableString;
import domainapp.dom.simple.SimpleObject;
import domainapp.dom.simple.SimpleObjects;
@@ -32,8 +33,8 @@ import domainapp.dom.simple.SimpleObjects;
public class HomePageViewModel {
//region > title
- public String title() {
- return getObjects().size() + " objects";
+ public TranslatableString title() {
+ return TranslatableString.tr("{num} objects", "num", getObjects().size());
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/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 5e9a6f6..8c4b31c 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
@@ -25,8 +25,12 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
@@ -58,7 +62,9 @@ import org.apache.isis.applib.util.ObjectContracts;
+ "WHERE name.indexOf(:name) >= 0 ")
})
@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
-@DomainObject
+@DomainObject(
+ publishing = Publishing.ENABLED
+)
public class SimpleObject implements Comparable<SimpleObject> {
public static final int NAME_LENGTH = 40;
@@ -69,12 +75,15 @@ public class SimpleObject implements Comparable<SimpleObject> {
}
+
public static class NameDomainEvent extends PropertyDomainEvent<SimpleObject,String> {}
@javax.jdo.annotations.Column(
allowsNull="false",
length = NAME_LENGTH
)
@Property(
+ command = CommandReification.ENABLED,
+ publishing = Publishing.ENABLED,
domainEvent = NameDomainEvent.class
)
private String name;
@@ -91,6 +100,28 @@ public class SimpleObject implements Comparable<SimpleObject> {
+ public static class UpdateNameDomainEvent extends ActionDomainEvent<SimpleObject> {}
+ @Action(
+ command = CommandReification.ENABLED,
+ publishing = Publishing.ENABLED,
+ semantics = SemanticsOf.IDEMPOTENT,
+ domainEvent = UpdateNameDomainEvent.class
+ )
+ @MemberOrder(name="name", sequence = "1") // associate with 'name' property
+ public SimpleObject updateName(@ParameterLayout(named="Name") final String name) {
+ setName(name);
+ return this;
+ }
+ public String default0UpdateName() {
+ return getName();
+ }
+ public TranslatableString validate0UpdateName(final String name) {
+ return validateName(name);
+ }
+
+
+
+
public static class DeleteDomainEvent extends ActionDomainEvent<SimpleObject> {}
@Action(
domainEvent = DeleteDomainEvent.class,
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
index 5679f4d..e7f2725 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObjects.java
@@ -23,7 +23,6 @@ package domainapp.dom.simple;
import java.util.List;
-import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.BookmarkPolicy;
@@ -54,8 +53,10 @@ public class SimpleObjects {
//endregion
//region > listAll (action)
+ public static class ListAllEvent extends ActionDomainEvent<SimpleObjects> {}
@Action(
- semantics = SemanticsOf.SAFE
+ semantics = SemanticsOf.SAFE,
+ domainEvent = ListAllEvent.class
)
@ActionLayout(
bookmarking = BookmarkPolicy.AS_ROOT
@@ -67,8 +68,10 @@ public class SimpleObjects {
//endregion
//region > findByName (action)
+ public static class FindByNameEvent extends ActionDomainEvent<SimpleObjects> {}
@Action(
- semantics = SemanticsOf.SAFE
+ semantics = SemanticsOf.SAFE,
+ domainEvent = FindByNameEvent.class
)
@ActionLayout(
bookmarking = BookmarkPolicy.AS_ROOT
@@ -87,18 +90,14 @@ public class SimpleObjects {
//endregion
//region > create (action)
- public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjects> {
- public CreateDomainEvent(final SimpleObjects source, final Identifier identifier, final Object... arguments) {
- super(source, identifier, arguments);
- }
- }
-
+ public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjects> {}
@Action(
domainEvent = CreateDomainEvent.class
)
@MemberOrder(sequence = "3")
public SimpleObject create(
- final @ParameterLayout(named="Name") String name) {
+ @ParameterLayout(named="Name")
+ final String name) {
final SimpleObject obj = repositoryService.instantiate(SimpleObject.class);
obj.setName(name);
repositoryService.persist(obj);
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties
index 9c2d735..8a00c75 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -78,6 +78,17 @@ log4j.appender.wicket.i18n.layout=org.apache.log4j.PatternLayout
log4j.appender.wicket.i18n.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
+log4j.appender.PublisherServiceLogging=org.apache.log4j.FileAppender
+log4j.appender.PublisherServiceLogging.File=./logs/PublisherServiceLogging.log
+log4j.appender.PublisherServiceLogging.Append=false
+log4j.appender.PublisherServiceLogging.layout=org.apache.log4j.PatternLayout
+log4j.appender.PublisherServiceLogging.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
+
+
+${symbol_pound} profiling via PublisherService
+log4j.logger.org.apache.isis.applib.services.publish.PublisherServiceLogging=DEBUG,PublisherServiceLogging
+log4j.additivity.log4j.logger.org.apache.isis.applib.services.publish.PublisherServiceLogging=false
+
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
index d5e7f23..6bf94f5 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
@@ -109,10 +109,6 @@
</filter>
<filter-mapping>
<filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
<url-pattern>*.css</url-pattern>
</filter-mapping>
<filter-mapping>
@@ -125,10 +121,22 @@
</filter-mapping>
<filter-mapping>
<filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.jpeg</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
<url-pattern>*.gif</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.svg</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
+ <url-pattern>*.js</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>ResourceCachingFilter</filter-name>
<url-pattern>*.html</url-pattern>
</filter-mapping>
<filter-mapping>
@@ -154,10 +162,18 @@
</servlet-mapping>
<servlet-mapping>
<servlet-name>Resource</servlet-name>
+ <url-pattern>*.jpeg</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
<url-pattern>*.gif</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Resource</servlet-name>
+ <url-pattern>*.svg</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Resource</servlet-name>
<url-pattern>*.js</url-pattern>
</servlet-mapping>
<servlet-mapping>
http://git-wip-us.apache.org/repos/asf/isis/blob/cbb4c4cb/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 33bf84a..74ec66f 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 Apr 09 07:08:53 BST 2016
+#Sat May 21 08:08:33 BST 2016
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it