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/09/17 11:46:58 UTC
[09/10] isis git commit: ISIS-1195: recreating simpleapp archetype
ISIS-1195: 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/4ec74f82
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4ec74f82
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4ec74f82
Branch: refs/heads/master
Commit: 4ec74f82b06635fcffb48de489de9cd7b635bbf4
Parents: 4cad017
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 17 09:15:07 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 17 09:15:07 2015 +0100
----------------------------------------------------------------------
.../resources/archetype-resources/dom/pom.xml | 4 ++-
.../domainapp/dom/DomainAppDomManifest.java | 31 +++-----------------
.../java/domainapp/dom/simple/SimpleObject.java | 1 -
.../projects/basic/archetype.properties | 2 +-
4 files changed, 8 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4ec74f82/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 747bacf..db2bcdf 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
@@ -154,6 +154,9 @@
<profile>
<id>isis-validate</id>
<activation>
+ <property>
+ <name>isis-validate</name>
+ </property>
</activation>
<build>
<plugins>
@@ -163,7 +166,6 @@
<version>${isis.version}</version>
<configuration>
<appManifest>domainapp.dom.DomainAppDomManifest</appManifest>
- <isisConfigDir>../webapp/src/main/webapp/WEB-INF</isisConfigDir>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/4ec74f82/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/DomainAppDomManifest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/DomainAppDomManifest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/DomainAppDomManifest.java
index e7f0875..5bc404b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/DomainAppDomManifest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/DomainAppDomManifest.java
@@ -30,13 +30,10 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
/**
- * Bootstrap the application.
+ * Provided for <tt>isis-maven-plugin</tt>.
*/
public class DomainAppDomManifest implements AppManifest {
- /**
- * Load all services and entities found in (the packages and subpackages within) these modules
- */
@Override
public List<Class<?>> getModules() {
return Arrays.asList(
@@ -44,44 +41,24 @@ public class DomainAppDomManifest implements AppManifest {
);
}
- /**
- * No additional services.
- */
@Override
public List<Class<?>> getAdditionalServices() {
return Collections.emptyList();
}
- /**
- * Use shiro for authentication.
- *
- * <p>
- * NB: this is ignored for integration tests, which always use "bypass".
- * </p>
- */
@Override
public String getAuthenticationMechanism() {
- return "shiro";
+ return null;
}
- /**
- * Use shiro for authorization.
- *
- * <p>
- * NB: this is ignored for integration tests, which always use "bypass".
- * </p>
- */
@Override
public String getAuthorizationMechanism() {
- return "shiro";
+ return null;
}
- /**
- * No fixtures.
- */
@Override
public List<Class<? extends FixtureScript>> getFixtures() {
- return Collections.emptyList();
+ return null;
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/4ec74f82/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 f756587..954cfe8 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
@@ -115,7 +115,6 @@ public class SimpleObject implements Comparable<SimpleObject> {
return this;
}
-
public String default0UpdateName() {
return getName();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4ec74f82/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 b0954aa..12eb151 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 @@
-#Wed Sep 16 17:36:27 BST 2015
+#Thu Sep 17 09:14:56 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it