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/08 01:45:18 UTC

[2/2] 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/1a763a51
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1a763a51
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1a763a51

Branch: refs/heads/master
Commit: 1a763a517ca4751408ec7840e539734065c57739
Parents: 0eb5f82
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 8 00:44:38 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 8 00:44:38 2015 +0100

----------------------------------------------------------------------
 .../resources/archetype-resources/webapp/pom.xml  | 11 -----------
 .../main/resources/domainapp/webapp/welcome.html  | 10 +++++-----
 .../webapp/src/main/webapp/about/index.html       | 18 ++++++++----------
 .../resources/projects/basic/archetype.properties |  2 +-
 4 files changed, 14 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/1a763a51/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 5eac9e2..da107f7 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
@@ -346,18 +346,7 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-        	<id>neo4j</id>
-        	<dependencies>
-		        <dependency>
-		        	<groupId>org.datanucleus</groupId>
-		        	<artifactId>datanucleus-neo4j</artifactId>
-		        	<version>4.0.4</version>
-		        </dependency>
-        	</dependencies>
-        </profile>
     </profiles>
 
 
-
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/1a763a51/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/domainapp/webapp/welcome.html
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/domainapp/webapp/welcome.html b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/domainapp/webapp/welcome.html
index 4661b68..14c9c85 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/domainapp/webapp/welcome.html
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/resources/domainapp/webapp/welcome.html
@@ -25,14 +25,14 @@
     domain-driven apps in Java.
     <br/>
     <br/>
-    This app has been generated using Isis' 
+    This app has been generated using Apache Isis'
     <a href="http://isis.apache.org/intro/getting-started/simple%61pp-archetype.html" target="_blank">SimpleApp</a> archetype,
-    which configures Isis' most commonly used components as part of a very simple and purposefully minimal application.
+    to create a purposefully minimal application that nevertheless includes fixture data, integration tests and BDD specs.
     <br/>
     <br/>
-    The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObject.java"  target="_blank">SimpleObject</a>,
-    along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObjects.java"  target="_blank">SimpleObjects</a>.
+    The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObject.java"  target="_blank"><tt>SimpleObject</tt></a>,
+    along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObjects.java"  target="_blank"><tt>SimpleObjects</tt></a>.
     <br/>
     <br/>
-    For more details, see the <a href="http://isis.apache.org/documentation.html" target="_blank">Isis website</a>.
+    For more details, see the <a href="http://isis.apache.org/documentation.html" target="_blank">Apache Isis website</a>.
 </p>

http://git-wip-us.apache.org/repos/asf/isis/blob/1a763a51/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
index 8c575a1..98b2e62 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/about/index.html
@@ -60,15 +60,13 @@ ${symbol_pound}wrapper {
             <img alt="Isis Logo" src="about/images/isis-logo.png" />
              
             <p>
-            <a href="http://isis.apache.org" target="_blank">Apache Isis</a>&trade; is a framework to let you rapidly develop
-            domain-driven apps in Java.  This app has been generated using Isis' 
-            <a href="http://isis.apache.org/intro/getting-started/simple%61pp-archetype.html" target="_blank">SimpleApp</a> archetype,
-            which configures Isis to run a very simple and purposefully minimal application.
-            
-            <p>
-            The app itself consists of a single domain class, 
-            <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/domainapp/dom/module/simple/SimpleObject.java"  target="_blank"><tt>SimpleObject</tt></a>,
-            along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/domainapp/dom/module/simple/SimpleObjects.java" target="_blank"><tt>SimpleObjects</tt></a>.
+                This app has been generated using Apache Isis'
+                <a href="http://isis.apache.org/intro/getting-started/simple%61pp-archetype.html" target="_blank">SimpleApp</a> archetype,
+                to create a purposefully minimal application that nevertheless includes fixture data, integration tests and BDD specs.
+                <br/>
+                <br/>
+                The app itself consists of a single domain class, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObject.java"  target="_blank"><tt>SimpleObject</tt></a>,
+                along with an equally simple (factory/repository) domain service, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/dom/src/main/java/dom/simple/SimpleObjects.java"  target="_blank"><tt>SimpleObjects</tt></a>.
             </p>
 
             <p>To access the app:</p>
@@ -91,7 +89,7 @@ ${symbol_pound}wrapper {
                     </p>
                     <p>
                         provides access to a RESTful API conformant with the
-                        <a href="http://restfulobjects.org">Restful Objects</a> spec</td>.  This is part of Isis Core.  The
+                        <a href="http://restfulobjects.org">Restful Objects</a> spec</td>.  This is part of Apache Isis Core.  The
                         implementation technology is JBoss RestEasy.
                     </p>
                 </li>

http://git-wip-us.apache.org/repos/asf/isis/blob/1a763a51/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 459eea2..843f345 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 Jul 07 07:57:37 BST 2015
+#Wed Jul 08 00:44:31 BST 2015
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it