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/07/07 08:58:18 UTC
isis git commit: ISIS-1052: recreating simpleapp archetype
Repository: isis
Updated Branches:
refs/heads/master cc1eb2b07 -> a79eb83ad
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/a79eb83a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a79eb83a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a79eb83a
Branch: refs/heads/master
Commit: a79eb83adb99a0dbdba171bcbd51a997ebf10fa3
Parents: cc1eb2b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jul 7 07:57:44 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jul 7 07:57:44 2015 +0100
----------------------------------------------------------------------
.../main/java/domainapp/fixture/DomainAppFixturesService.java | 2 +-
.../src/main/resources/archetype-resources/webapp/pom.xml | 4 ++++
.../src/test/resources/projects/basic/archetype.properties | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a79eb83a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
index 1cc395d..c21a081 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/domainapp/fixture/DomainAppFixturesService.java
@@ -47,7 +47,7 @@ import domainapp.fixture.scenarios.RecreateSimpleObjects;
public class DomainAppFixturesService extends FixtureScripts {
public DomainAppFixturesService() {
- super("domainapp", MultipleExecutionStrategy.EXECUTE);
+ super(DomainAppFixturesService.class.getPackage().getName(), MultipleExecutionStrategy.EXECUTE);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/a79eb83a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
index f9f37d0..5eac9e2 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml
@@ -93,6 +93,10 @@
<Build-Label>${project.version}</Build-Label>
</manifestEntries>
</archive>
+ <packagingExcludes>WEB-INF/lib/isis-core-webserver*.jar,
+ WEB-INF/lib/javax.servlet-api-*.jar,
+ WEB-INF/lib/javax.websocket-api-*.jar,
+ WEB-INF/lib/jetty-all-*.jar</packagingExcludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/isis/blob/a79eb83a/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 98f763b..459eea2 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 @@
-#Tue Jun 16 21:15:49 BST 2015
+#Tue Jul 07 07:57:37 BST 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it