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/11/22 11:18:55 UTC
[11/11] isis git commit: ISIS-1538: recreating simpleapp archetype
ISIS-1538: 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/2844a93e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2844a93e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2844a93e
Branch: refs/heads/maint-1.13.2
Commit: 2844a93e3f651865d0ad803d4ba1cfacf826de41
Parents: e5bbfe9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Nov 22 11:04:40 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Nov 22 11:04:40 2016 +0000
----------------------------------------------------------------------
.../resources/archetype-resources/application/translations.pot | 2 +-
.../java/domainapp/modules/simple/dom/impl/SimpleObject.java | 2 +-
.../archetype-resources/modules/module-simple/translations.pot | 2 +-
.../src/main/resources/archetype-resources/webapp/pom.xml | 6 +++---
.../src/test/resources/projects/basic/archetype.properties | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2844a93e/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
index 9a88ea0..b09ec02 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot
@@ -23,7 +23,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-11-21 10:13:09+\n"
+"POT-Creation-Date: 2016-11-22 11:01:18+\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
http://git-wip-us.apache.org/repos/asf/isis/blob/2844a93e/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
index 8aad448..3d05da7 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
@@ -203,7 +203,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
contributed = Contributed.AS_ACTION
)
public void ${symbol_dollar}${symbol_dollar}() {
- final String title = titleService.titleOf(this);
+ final String title = titleService.titleOf(simpleObject);
messageService.informUser(String.format("'%s' deleted", title));
repositoryService.remove(simpleObject);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/2844a93e/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
index e29c9ad..2f23d9c 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot
@@ -23,7 +23,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-11-21 10:13:03+\n"
+"POT-Creation-Date: 2016-11-22 11:01:11+\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
http://git-wip-us.apache.org/repos/asf/isis/blob/2844a93e/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 435301a..4fc9582 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
@@ -34,8 +34,8 @@
<properties>
<danhaywood-mavenmixin-isisswagger.appManifest>domainapp.application.manifest.DomainAppAppManifest</danhaywood-mavenmixin-isisswagger.appManifest>
- <danhaywood-mavenmixin-isisswagger.format>JSON</danhaywood-mavenmixin-isisswagger.format>
- <danhaywood-mavenmixin-jettywar.warName>simpleapp</danhaywood-mavenmixin-jettywar.warName>
+ <danhaywood-mavenmixin-isisswagger.dependency.artifactId>${project.parent.artifactId}-application</danhaywood-mavenmixin-isisswagger.dependency.artifactId>
+ <danhaywood-mavenmixin-jettywar.warName>${project.parent.artifactId}</danhaywood-mavenmixin-jettywar.warName>
</properties>
<build>
@@ -77,7 +77,7 @@
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
<artifactId>isisswagger</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</mixin>
<mixin>
<groupId>com.danhaywood.mavenmixin</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/2844a93e/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 e2b923e..5ee2f0f 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 @@
-#Mon Nov 21 13:58:08 GMT 2016
+#Tue Nov 22 11:04:35 GMT 2016
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it