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 2015/03/12 13:43:51 UTC
[5/5] isis git commit: ISIS-1052: recreating simpleapp archetype
ISIS-1052: 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/946e4404
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/946e4404
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/946e4404
Branch: refs/heads/master
Commit: 946e4404da1e9816b15072fa57a68ecda700ad69
Parents: d9a886e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Mar 12 12:32:14 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Mar 12 12:39:02 2015 +0000
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 4 ++--
.../java/domainapp/dom/modules/simple/SimpleObjects.java | 11 +++++++++++
.../test/java/domainapp/integtests/specs/RunSpecs.java | 3 ++-
.../webapp/src/main/webapp/WEB-INF/logging.properties | 4 ++++
.../main/webapp/WEB-INF/persistor_datanucleus.properties | 9 ++++++++-
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 6 +++---
.../test/resources/projects/basic/archetype.properties | 2 +-
7 files changed, 31 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 3e91365..0338723 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>
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
index 71dea09..4458905 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/modules/simple/SimpleObjects.java
@@ -23,6 +23,7 @@ package domainapp.dom.modules.simple;
import java.util.List;
import org.apache.isis.applib.DomainObjectContainer;
+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;
@@ -32,6 +33,7 @@ import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.query.QueryDefault;
+import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
@DomainService(repositoryFor = SimpleObject.class)
@DomainServiceLayout(menuOrder = "10")
@@ -71,6 +73,15 @@ 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);
+ }
+ }
+
+ @Action(
+ domainEvent = CreateDomainEvent.class
+ )
@MemberOrder(sequence = "3")
public SimpleObject create(
final @ParameterLayout(named="Name") String name) {
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
index f4bdd18..eb10242 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/src/test/java/domainapp/integtests/specs/RunSpecs.java
@@ -19,6 +19,7 @@
*/
package domainapp.integtests.specs;
+import cucumber.api.CucumberOptions;
import cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith;
@@ -28,7 +29,7 @@ import org.junit.runner.RunWith;
* Runs scenarios in all <tt>.feature</tt> files (this package and any subpackages).
*/
@RunWith(Cucumber.class)
-@Cucumber.Options(
+@CucumberOptions(
format = {
"html:target/cucumber-html-report"
,"json:target/cucumber.json"
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/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 95d8680..f4c2324 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
@@ -180,6 +180,10 @@ log4j.logger.org.apache.isis.core.runtime.installers.InstallerLookupDefault=WARN
log4j.additivity.org.apache.isis.core.runtime.installers.InstallerLookupDefault=false
+${symbol_pound} quieten Shiro
+log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console
+log4j.additivity.log4j.logger.org.apache.shiro.realm.AuthorizingRealm=false
+
${symbol_pound} Application-specific logging
log4j.logger.dom.simple.SimpleObject=DEBUG, Stderr
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
index 4a10f92..2be805e 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
@@ -24,7 +24,14 @@ ${symbol_pound}
${symbol_pound} identifies @PersistenceCapable entities to be eagerly registered
${symbol_pound} if move class to other package (eg com.mycompany.myapp.dom) then update
-isis.persistor.datanucleus.RegisterEntities.packagePrefix=dom
+isis.persistor.datanucleus.RegisterEntities.packagePrefix=domainapp.dom.modules
+
+${symbol_pound}
+${symbol_pound} hook to perform additional initialization when JDO class metadata is loaded
+${symbol_pound} default implementation will attempt to run 'create schema' for the specified schema.
+${symbol_pound}
+${symbol_pound}isis.persistor.datanucleus.classMetadataLoadedListener=org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaFromClassMetadata
+
${symbol_pound} whether to persist the event data as a "clob" or as a "zipped" byte[]
${symbol_pound} default is "zipped"
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
index a643d86..971ae69 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini
@@ -87,7 +87,7 @@ guest = guest, user_role
# role = perm1, perm2, perm3, ...
# perm in format: packageName:className:memberName:r,w
-user_role = *:ToDoItemsJdo:*:*,\
- *:ToDoItem:*:*
-self-install_role = *:ToDoItemsFixturesService:install:*
+user_role = *:SimpleObjects:*:*,\
+ *:SimpleObject:*:*
+self-install_role = *:DomainAppFixtureService:*:*
admin_role = *
http://git-wip-us.apache.org/repos/asf/isis/blob/946e4404/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 8a3f01b..78c7aae 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 @@
-#Fri Feb 20 20:40:24 GMT 2015
+#Thu Mar 12 12:32:07 GMT 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it