[2/2] 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/acb5c8b2 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/acb5c8b2 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/acb5c8b2 Branch: refs/heads/maint-1.13.2 Commit: acb5c8b2d91988609967cef266f157743000c91c Parents: 2447b1f Author: Dan Haywood Authored: Sat Dec 10 12:25:18 2016 + Committer: Dan Haywood Committed: Sat Dec 10 12:25:18 2016 + -- .../application/translations.pot| 27 +--- .../module-simple/translations.pot | 2 +- .../webapp/WEB-INF/viewer_wicket.properties | 23 - .../projects/basic/archetype.properties | 2 +- 4 files changed, 25 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/acb5c8b2/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 e97d6d2..09d9f87 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-12-01 10:14:01+\n" +"POT-Creation-Date: 2016-12-10 10:53:28+\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -101,21 +101,6 @@ msgid "Current Overrides If Any" msgstr "" -#: domainapp.modules.simple.dom.impl.SimpleObject#delete() -msgid "Delete" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#downloadJdoMetadata() -msgid "Download Jdo Metadata" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#downloadLayoutXml() -msgid "Download Layout Xml" -msgstr "" - - #: org.apache.isis.applib.services.layout.LayoutServiceMenu#downloadLayouts() msgid "Download Layouts (XML)" msgstr "" @@ -337,11 +322,6 @@ msgid "Public" msgstr "" -#: domainapp.modules.simple.dom.impl.SimpleObject#rebuildMetamodel() -msgid "Rebuild Metamodel" -msgstr "" - - #: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#recreateObjectsAndReturnFirst() msgid "Recreate Objects And Return First" msgstr "" @@ -411,11 +391,6 @@ msgid "Switch To Writing Translations" msgstr "" -#: domainapp.modules.simple.dom.impl.SimpleObject#updateName() -msgid "Update Name" -msgstr "" - - #: org.apache.isis.core.metamodel.services.user.UserServiceDefault$UserAndRoleOverrides#user msgid "User" msgstr "" http://git-wip-us.apache.org/repos/asf/isis/blob/acb5c8b2/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot index 1723c57..42f6074 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2016-12-01 10:14:55+\n" +"POT-Creation-Date: 2016-12-10 12:24:20+\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/acb5c8b2/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties index 2e56399..05deaeb 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties @@ -34,13 +34,34 @@ ${symbol_pound} isis.viewer.wicket.maxTitleLengthInStandaloneTables=0 isis.viewer.wicket.maxTitleLengthInParentedTables=0 + +${symbol_pound} +${symbol_pound} in Firefox and more rec
[2/2] 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/fa36da4a Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fa36da4a Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fa36da4a Branch: refs/heads/maint-1.13.2 Commit: fa36da4a486d24c72b78c5a3ee812d9c228156ac Parents: 147f4c5 Author: Dan Haywood Authored: Thu Dec 1 10:20:19 2016 + Committer: Dan Haywood Committed: Thu Dec 1 10:20:19 2016 + -- example/archetype/simpleapp/pom.xml | 5 + .../resources/archetype-resources/README.adoc | 6 +- .../archetype-resources/application/pom.xml | 10 +- .../application/integtests/Smoke_IntegTest.java | 6 +- .../application/translations.pot| 50 - .../archetype-resources/module-simple/pom.xml | 28 ++- .../modules/simple/dom/impl/SimpleObject.java | 20 +- .../dom/impl/SimpleObjectRepository_Test.java | 128 +++ .../impl/SimpleObjectRepository_UnitTest.java | 129 --- .../simple/dom/impl/SimpleObject_Test.java | 52 + .../simple/dom/impl/SimpleObject_UnitTest.java | 52 - .../tests/SimpleObject_IntegTest.java | 4 +- .../module-simple/translations.pot | 27 ++- .../main/resources/archetype-resources/pom.xml | 221 ++- .../archetype-resources/webapp/pom.xml | 24 +- .../projects/basic/archetype.properties | 2 +- 16 files changed, 520 insertions(+), 244 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/fa36da4a/example/archetype/simpleapp/pom.xml -- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index aec93cf..bb22f53 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -41,6 +41,11 @@ + + scm:git:g...@github.com:danhaywood/java-mavenmixin-standard.git + scm:git:g...@github.com:danhaywood/java-mavenmixin-standard.git +g...@github.com:danhaywood/java-mavenmixin-standard.git + org.apache.isis.core isis http://git-wip-us.apache.org/repos/asf/isis/blob/fa36da4a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc index bd1f923..df457bb 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/README.adoc @@ -77,7 +77,7 @@ mvn -f pom-jdo-enhance-all.xml datanucleus:enhance + [source,bash] -mvn package -Ddanhaywood-mavenmixin-jettyconsole +mvn package -Dmavenmixin-jettyconsole + This can then be run using: + @@ -94,7 +94,7 @@ Add additional flags, eg ``--headless`` or ``--port ``, if required. + [source,bash] -mvn clean package -Ddanhaywood-mavenmixin-sourceandjavadoc +mvn clean package -Dmavenmixin-sourceandjavadoc + [NOTE] @@ -106,7 +106,7 @@ This is configured only for the `module-simple` module. + [source,bash] -mvn -pl module-simple site -Ddanhaywood-mavenmixin-sourceandjavadoc -Ddanhaywood-mavenmixin-staticanalysis +mvn -pl module-simple site -Dmavenmixin-sourceandjavadoc -Dmavenmixin-staticanalysis + [NOTE] http://git-wip-us.apache.org/repos/asf/isis/blob/fa36da4a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml index 09f1fe8..bf5d0a0 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml @@ -72,22 +72,22 @@ com.danhaywood.mavenmixin standard - ${danhaywood-mavenmixin-standard.version} +${mavenmixin-standard.version} com.danhaywood.mavenmixin enforcerrelaxed - ${danhaywood-mavenmixin-enforcerelaxed.version} + ${mavenmixin-enforcerrelaxed.version}
[2/2] 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/506babfc Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/506babfc Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/506babfc Branch: refs/heads/maint-1.13.2 Commit: 506babfc7447ccbe5ef3bc8cb54093bae31bab3d Parents: a79127e Author: Dan Haywood Authored: Tue Nov 29 17:02:39 2016 + Committer: Dan Haywood Committed: Tue Nov 29 17:02:39 2016 + -- .../archetype-resources/application/pom.xml | 8 .../application/translations.pot | 2 +- .../archetype-resources/module-simple/pom.xml | 18 -- .../module-simple/translations.pot| 2 +- .../main/resources/archetype-resources/pom.xml| 12 .../resources/archetype-resources/webapp/pom.xml | 10 +- .../resources/projects/basic/archetype.properties | 2 +- 7 files changed, 32 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml index ae0cbee..09f1fe8 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml @@ -72,22 +72,22 @@ com.danhaywood.mavenmixin standard -0.0.1 + ${danhaywood-mavenmixin-standard.version} com.danhaywood.mavenmixin enforcerrelaxed -0.0.1 + ${danhaywood-mavenmixin-enforcerelaxed.version} com.danhaywood.mavenmixin surefire -0.0.2 + ${danhaywood-mavenmixin-surefire.version} com.danhaywood.mavenmixin cucumberreporting -0.0.1 + ${danhaywood-mavenmixin-cucumberreporting.version} http://git-wip-us.apache.org/repos/asf/isis/blob/506babfc/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 ea72a21..4b9de22 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-28 10:03:12+\n" +"POT-Creation-Date: 2016-11-29 17:02:03+\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/506babfc/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml -- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml index e53a5a1..c24dea8 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml @@ -68,37 +68,37 @@ com.danhaywood.mavenmixin standard -0.0.1 + ${danhaywood-mavenmixin-standard.version} com.danhaywood.mavenmixin enforcerrelaxed -0.0.1-SNAPSHOT + ${danhaywood-mavenmixin-enforcerelaxed.version}