ISIS-928: 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/9ad9cde8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9ad9cde8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9ad9cde8

Branch: refs/heads/prepare/isis-1.8.0
Commit: 9ad9cde8212051bec22d8ab02fdbec5eef9668c0
Parents: f099dc8
Author: Dan Haywood <[email protected]>
Authored: Fri Feb 20 20:40:31 2015 +0000
Committer: Dan Haywood <[email protected]>
Committed: Fri Feb 20 20:40:31 2015 +0000

----------------------------------------------------------------------
 example/archetype/simpleapp/pom.xml             |   2 +-
 .../main/resources/archetype-resources/pom.xml  |   8 +-
 .../main/webapp/WEB-INF/translations-en-GB.po   | 155 -------------------
 .../main/webapp/WEB-INF/translations-en_GB.po   | 155 +++++++++++++++++++
 .../projects/basic/archetype.properties         |   2 +-
 5 files changed, 162 insertions(+), 160 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/9ad9cde8/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml 
b/example/archetype/simpleapp/pom.xml
index 9c16524..befcd30 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -44,7 +44,7 @@
     <parent>
         <groupId>org.apache.isis.core</groupId>
         <artifactId>isis</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.0</version>
         <relativePath>../../../core/pom.xml</relativePath>
     </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/9ad9cde8/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 52d79f1..657d465 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,8 +32,7 @@
     </prerequisites>
 
     <properties>
-        <isis.version>1.8.0-SNAPSHOT</isis.version>
-        <isis-viewer-wicket.version>1.8.0-SNAPSHOT</isis-viewer-wicket.version>
+        <isis.version>1.8.0</isis.version>
 
         <!-- must be consistent with the versions defined by the JDO 
Objectstore -->
         
<datanucleus-accessplatform-jdo-rdbms.version>3.3.6</datanucleus-accessplatform-jdo-rdbms.version>
@@ -223,6 +222,9 @@
                             <exclude>**/*.json</exclude>
                             <exclude>**/*.min.js</exclude>
                             <exclude>**/*.js</exclude>
+
+                            <exclude>**/translations.pot</exclude>
+                            <exclude>**/translations*.po</exclude>
                         </excludes>
                         <licenses>
                             <license 
implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
@@ -319,7 +321,7 @@
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
                 <artifactId>isis-viewer-wicket</artifactId>
-                <version>${isis-viewer-wicket.version}</version>
+                <version>${isis.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

http://git-wip-us.apache.org/repos/asf/isis/blob/9ad9cde8/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en-GB.po
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en-GB.po
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en-GB.po
deleted file mode 100644
index 8f25fa7..0000000
--- 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en-GB.po
+++ /dev/null
@@ -1,155 +0,0 @@
-##############################################################################
-#
-# .pot file
-#
-# Translate this file to each required language and place in WEB-INF, eg:
-#
-#     /WEB-INF/translations-en_US.po
-#     /WEB-INF/translations-en.po
-#     /WEB-INF/translations-fr_FR.po
-#     /WEB-INF/translations-fr.po
-#     /WEB-INF/translations.po
-#
-##############################################################################
-
-#: 
org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations(java.lang.String)
-msgid ".pot file name"
-msgstr ""
-
-
-#: 
org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache()
-msgid "Clear translation cache"
-msgstr "Reload .po files"
-
-
-#: domainapp.dom.modules.simple.SimpleObjects#create()
-msgid "Create"
-msgstr ""
-
-
-#: 
org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations()
-msgid "Download Translations"
-msgstr "Download .pot file"
-
-
-#: domainapp.dom.modules.simple.SimpleObject#updateName()
-msgid "Exclamation mark is not allowed"
-msgstr "No exclamation marks, chum!"
-
-
-#: domainapp.dom.modules.simple.SimpleObjects#findByName()
-msgid "Find By Name"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#fixtureScriptClassName
-msgid "Fixture script"
-msgstr ""
-
-
-#: domainapp.dom.app.homepage.HomePageService#homePage()
-msgid "Home Page"
-msgstr ""
-
-
-#: domainapp.dom.modules.simple.SimpleObjects#listAll()
-msgid "List All"
-msgstr ""
-
-
-#: domainapp.fixture.scenarios.RecreateSimpleObjects#lookup()
-#: org.apache.isis.applib.fixturescripts.FixtureScript#lookup()
-#: 
org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions#lookup()
-msgid "Lookup"
-msgstr ""
-
-
-#: domainapp.dom.modules.simple.SimpleObjects#create(java.lang.String)
-#: domainapp.dom.modules.simple.SimpleObjects#findByName(java.lang.String)
-msgid "Name"
-msgstr ""
-
-
-#: domainapp.dom.modules.simple.SimpleObject#updateName(java.lang.String)
-msgid "New name"
-msgstr ""
-
-
-#: 
org.apache.isis.applib.services.bookmark.BookmarkHolderAssociationContributions#object()
-msgid "Object"
-msgstr ""
-
-
-#: domainapp.dom.modules.simple.SimpleObject#title()
-msgid "Object: {name}"
-msgstr ""
-
-
-#: 
domainapp.fixture.DomainAppFixturesService#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: 
org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-msgid "Parameters"
-msgstr ""
-
-
-#: domainapp.fixture.DomainAppFixturesService
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu
-msgid "Prototyping"
-msgstr ""
-
-
-#: domainapp.fixture.DomainAppFixturesService#recreateObjectsAndReturnFirst()
-msgid "Recreate Objects And Return First"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#object
-msgid "Result"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#className
-msgid "Result class"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#key
-msgid "Result key"
-msgstr ""
-
-
-#: domainapp.fixture.DomainAppFixturesService#runFixtureScript()
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript()
-msgid "Run Fixture Script"
-msgstr ""
-
-
-#: domainapp.fixture.scenarios.RecreateSimpleObjects
-#: org.apache.isis.applib.fixturescripts.FixtureScript
-msgid "Script"
-msgstr ""
-
-
-#: 
domainapp.fixture.DomainAppFixturesService#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: 
org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-msgid "Script-specific parameters (if any).  The format depends on the script 
implementation (eg key=value, CSV, JSON, XML etc)"
-msgstr ""
-
-
-#: domainapp.dom.modules.simple.SimpleObject#updateName()
-msgid "Update Name"
-msgstr ""
-
-
-#: domainapp.fixture.scenarios.RecreateSimpleObjects#withDiscoverability()
-#: org.apache.isis.applib.fixturescripts.FixtureScript#withDiscoverability()
-msgid "With Discoverability"
-msgstr ""
-
-
-
-
-
-##############################################################################
-# end of .pot file
-##############################################################################
-

http://git-wip-us.apache.org/repos/asf/isis/blob/9ad9cde8/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en_GB.po
----------------------------------------------------------------------
diff --git 
a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en_GB.po
 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en_GB.po
new file mode 100644
index 0000000..4e2c823
--- /dev/null
+++ 
b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/translations-en_GB.po
@@ -0,0 +1,155 @@
+##############################################################################
+#
+# .pot file
+#
+# Translate this file to each required language and place in WEB-INF, eg:
+#
+#     /WEB-INF/translations_en-US.po
+#     /WEB-INF/translations_en.po
+#     /WEB-INF/translations_fr-FR.po
+#     /WEB-INF/translations_fr.po
+#     /WEB-INF/translations.po
+#
+##############################################################################
+
+#: 
org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations(java.lang.String)
+msgid ".pot file name"
+msgstr ""
+
+
+#: 
org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache()
+msgid "Clear translation cache"
+msgstr "Reload .po files"
+
+
+#: domainapp.dom.modules.simple.SimpleObjects#create()
+msgid "Create"
+msgstr ""
+
+
+#: 
org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations()
+msgid "Download Translations"
+msgstr "Download .pot file"
+
+
+#: domainapp.dom.modules.simple.SimpleObject#updateName()
+msgid "Exclamation mark is not allowed"
+msgstr "No exclamation marks, chum!"
+
+
+#: domainapp.dom.modules.simple.SimpleObjects#findByName()
+msgid "Find By Name"
+msgstr ""
+
+
+#: org.apache.isis.applib.fixturescripts.FixtureResult#fixtureScriptClassName
+msgid "Fixture script"
+msgstr ""
+
+
+#: domainapp.dom.app.homepage.HomePageService#homePage()
+msgid "Home Page"
+msgstr ""
+
+
+#: domainapp.dom.modules.simple.SimpleObjects#listAll()
+msgid "List All"
+msgstr ""
+
+
+#: domainapp.fixture.scenarios.RecreateSimpleObjects#lookup()
+#: org.apache.isis.applib.fixturescripts.FixtureScript#lookup()
+#: 
org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions#lookup()
+msgid "Lookup"
+msgstr ""
+
+
+#: domainapp.dom.modules.simple.SimpleObjects#create(java.lang.String)
+#: domainapp.dom.modules.simple.SimpleObjects#findByName(java.lang.String)
+msgid "Name"
+msgstr ""
+
+
+#: domainapp.dom.modules.simple.SimpleObject#updateName(java.lang.String)
+msgid "New name"
+msgstr ""
+
+
+#: 
org.apache.isis.applib.services.bookmark.BookmarkHolderAssociationContributions#object()
+msgid "Object"
+msgstr ""
+
+
+#: domainapp.dom.modules.simple.SimpleObject#title()
+msgid "Object: {name}"
+msgstr ""
+
+
+#: 
domainapp.fixture.DomainAppFixturesService#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
+#: 
org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
+msgid "Parameters"
+msgstr ""
+
+
+#: domainapp.fixture.DomainAppFixturesService
+#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu
+msgid "Prototyping"
+msgstr ""
+
+
+#: domainapp.fixture.DomainAppFixturesService#recreateObjectsAndReturnFirst()
+msgid "Recreate Objects And Return First"
+msgstr ""
+
+
+#: org.apache.isis.applib.fixturescripts.FixtureResult#object
+msgid "Result"
+msgstr ""
+
+
+#: org.apache.isis.applib.fixturescripts.FixtureResult#className
+msgid "Result class"
+msgstr ""
+
+
+#: org.apache.isis.applib.fixturescripts.FixtureResult#key
+msgid "Result key"
+msgstr ""
+
+
+#: domainapp.fixture.DomainAppFixturesService#runFixtureScript()
+#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript()
+msgid "Run Fixture Script"
+msgstr ""
+
+
+#: domainapp.fixture.scenarios.RecreateSimpleObjects
+#: org.apache.isis.applib.fixturescripts.FixtureScript
+msgid "Script"
+msgstr ""
+
+
+#: 
domainapp.fixture.DomainAppFixturesService#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
+#: 
org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
+msgid "Script-specific parameters (if any).  The format depends on the script 
implementation (eg key=value, CSV, JSON, XML etc)"
+msgstr ""
+
+
+#: domainapp.dom.modules.simple.SimpleObject#updateName()
+msgid "Update Name"
+msgstr ""
+
+
+#: domainapp.fixture.scenarios.RecreateSimpleObjects#withDiscoverability()
+#: org.apache.isis.applib.fixturescripts.FixtureScript#withDiscoverability()
+msgid "With Discoverability"
+msgstr ""
+
+
+
+
+
+##############################################################################
+# end of .pot file
+##############################################################################
+

http://git-wip-us.apache.org/repos/asf/isis/blob/9ad9cde8/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 24a2240..8a3f01b 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 @@
-#Thu Feb 19 12:39:35 GMT 2015
+#Fri Feb 20 20:40:24 GMT 2015
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it

Reply via email to