ISIS-1540: 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/cf9cb153 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cf9cb153 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cf9cb153 Branch: refs/heads/master Commit: cf9cb153394c07886fcdf931473d533553ae21df Parents: 084c3a7 Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sat Dec 10 18:18:06 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Sat Dec 10 18:18:06 2016 +0000 ---------------------------------------------------------------------- example/archetype/simpleapp/pom.xml | 6 +- .../META-INF/maven/archetype-metadata.xml | 19 + .../archetype-resources/.gitattributes | 51 +++ .../resources/archetype-resources/.gitignore | 41 ++ .../application/lib/.gitignore | 5 + .../application/translations.pot | 421 ------------------ .../module-simple/.gitignore | 5 + .../module-simple/translations.pot | 435 ------------------- .../main/resources/archetype-resources/pom.xml | 6 +- .../archetype-resources/webapp/lib/.gitignore | 5 + .../webapp/src/main/webapp/about/index.html | 22 +- .../projects/basic/archetype.properties | 2 +- 12 files changed, 145 insertions(+), 873 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index bb22f53..2c971a4 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -29,14 +29,14 @@ <extension> <groupId>org.apache.maven.archetype</groupId> <artifactId>archetype-packaging</artifactId> - <version>2.4</version> + <version>2.2</version> </extension> </extensions> <pluginManagement> <plugins> <plugin> <artifactId>maven-archetype-plugin</artifactId> - <version>2.4</version> + <version>2.2</version> </plugin> </plugins> </pluginManagement> @@ -49,7 +49,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>1.14.0-SNAPSHOT</version> + <version>1.13.2</version> <relativePath>../../../core/pom.xml</relativePath> </parent> <properties> http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml index 4939f89..7779836 100644 --- a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -26,6 +26,25 @@ </includes> </fileSet> <fileSet filtered="true" encoding="UTF-8"> + <directory>modules/module-simple</directory> + <includes> + <include>**/*.txt</include> + <include>**/*.java</include> + <include>**/*.xml</include> + <include>**/*.properties</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>modules/module-simple</directory> + <includes> + <include>**/*.pot</include> + <include>**/*.png</include> + <include>**/*.jar</include> + <include>**/*.lst</include> + <include>**/*.class</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> <directory/> <includes> <include>pom-jdo-enhance-all.xml</include> http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes new file mode 100644 index 0000000..b1eafb6 --- /dev/null +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes @@ -0,0 +1,51 @@ +# +# +# text files are normalized (convert crlf => lf) +# binary files are not normalized (binary is a macro for -text -diff) +# +# + + +# Unless otherwise stated, assume text + +* text=auto + + +*.java text diff=java +*.html text diff=html +*.xhtml text diff=html +*.xml text +*.txt text + + +*.jar binary +*.so binary +*.dll binary + +# images +*.jpg binary +*.jpeg binary +*.png binary +*.pdn binary +*.pdn binary + + +*.cs text diff=csharp + +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain + http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore new file mode 100644 index 0000000..e859485 --- /dev/null +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore @@ -0,0 +1,41 @@ +*~ +*.swp +*.class +bin/ +target/ +target-ide/ +logs/ +.settings/ +.project +.classpath +.idea +*.iml + +build/ + +JArchitectOut/ +*.jdproj + +neo4j_DB/ + +# log files +datanucleus.log +isis.log +i18n-po.log +hs_err_pid*.log + +# Package Files # +*.war +*.ear + +dependency-reduced-pom.xml +pom.xml.tag +pom.xml.next +pom.xml.releaseBackup +pom.xml.versionsBackup + +.clover/ + + +rebel.xml +translations.pot http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/src/main/resources/archetype-resources/application/lib/.gitignore ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/lib/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/lib/.gitignore new file mode 100644 index 0000000..70eee7e --- /dev/null +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/lib/.gitignore @@ -0,0 +1,5 @@ +# +# explicitly ignoring Microsoft JDBC4 jar +# (cannot redistribute, licensing) +# +sqljdbc4.jar http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/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 deleted file mode 100644 index 09d9f87..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot +++ /dev/null @@ -1,421 +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 -# -# If the app uses TranslatableString (eg for internationalized validation -# messages), or if the app calls the TranslationService directly, then ensure -# that all text to be translated has been captured by running a full -# integration test suite that exercises all relevant behaviour -# -############################################################################## - -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: \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" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - - -#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel(java.lang.String) -msgid ".csv file name" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata#$$(java.lang.String) -msgid ".jdo file name" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations(java.lang.String) -msgid ".pot file name" -msgstr "" - - -#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#ACTION -msgid "Action" -msgstr "" - - -#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder -msgid "Are you sure?" -msgstr "" - - -#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder -msgid "Cancel" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache() -msgid "Clear translation cache" -msgstr "" - - -#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#COLLECTION -msgid "Collection" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#COMPLETE -msgid "Complete" -msgstr "" - - -#: org.apache.isis.applib.services.config.ConfigurationServiceMenu#configuration() -msgid "Configuration" -msgstr "" - - -#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder -msgid "Confirm" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#create() -#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#create() -msgid "Create" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#CURRENT -msgid "Current" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.user.UserServiceDefault#currentOverridesIfAny() -msgid "Current Overrides If Any" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutServiceMenu#downloadLayouts() -msgid "Download Layouts (XML)" -msgstr "" - - -#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel() -msgid "Download Meta Model (CSV)" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec() -msgid "Download Swagger Spec" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations() -msgid "Download Translations" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject$delete#exec() -#: domainapp.modules.simple.dom.impl.SimpleObject$updateName#exec() -msgid "Exec" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternalNoop#executeWithinTransaction() -#: org.apache.isis.core.runtime.services.persistsession.PersistenceSessionServiceInternalDefault#executeWithinTransaction() -msgid "Execute Within Transaction" -msgstr "" - - -#: org.apache.isis.applib.services.dto.Dto_downloadXml#$$(java.lang.String) -#: org.apache.isis.applib.services.dto.Dto_downloadXsd#$$(java.lang.String,org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas) -#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml#$$(java.lang.String,org.apache.isis.applib.services.layout.LayoutService$Style) -msgid "File name" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec(java.lang.String,org.apache.isis.applib.services.swagger.SwaggerService$Visibility,org.apache.isis.applib.services.swagger.SwaggerService$Format) -msgid "Filename" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#findByName() -#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#findByName() -msgid "Find By Name" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureResult#fixtureScriptClassName -msgid "Fixture script" -msgstr "" - - -#: org.apache.isis.applib.services.queryresultscache.QueryResultsCache$Control#fixturesInstalling -msgid "Fixtures Installing" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScript#friendlyName -msgid "Friendly Name" -msgstr "" - - -#: domainapp.application.services.dbmanager.HsqlDbManagerMenu#hsqlDbManager() -msgid "HSQL DB Manager" -msgstr "" - - -#: domainapp.application.services.homepage.HomePageService#homePage() -msgid "Home Page" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong#$$() -msgid "Id" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT -msgid "Idempotent" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT_ARE_YOU_SURE -msgid "Idempotent Are You Sure" -msgstr "" - - -#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#IGNORE -msgid "Ignore" -msgstr "" - - -#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#INCLUDE -msgid "Include" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Format#JSON -msgid "Json" -msgstr "" - - -#: org.apache.isis.applib.services.config.ConfigurationProperty#key -msgid "Key" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#listAll() -#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#listAll() -msgid "List All" -msgstr "" - - -#: org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions#lookup() -msgid "Lookup" -msgstr "" - - -#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml -#: org.apache.isis.applib.services.layout.Object_rebuildMetamodel -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata -msgid "Metadata" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#MINIMAL -msgid "Minimal" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#name -#: domainapp.modules.simple.dom.impl.SimpleObject$updateName#exec(java.lang.String) -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#create(java.lang.String) -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#findByName(java.lang.String) -msgid "Name" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureFactory#newApplicationFeature() -msgid "New Application Feature" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT -msgid "Non Idempotent" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT_ARE_YOU_SURE -msgid "Non Idempotent Are You Sure" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#NORMALIZED -msgid "Normalized" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#notes -msgid "Notes" -msgstr "" - - -#: org.apache.isis.applib.services.bookmark.BookmarkHolderAssociationContributions#object() -msgid "Object" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#title() -msgid "Object: {name}" -msgstr "" - - -#: domainapp.application.services.homepage.HomePageViewModel#objects -msgid "Objects" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -msgid "Parameters" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE -msgid "Private" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE_WITH_PROTOTYPING -msgid "Private With Prototyping" -msgstr "" - - -#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#PROPERTY -msgid "Property" -msgstr "" - - -#: domainapp.application.services.dbmanager.HsqlDbManagerMenu -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault -#: org.apache.isis.applib.services.layout.LayoutServiceMenu -#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu -#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu -msgid "Prototyping" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PUBLIC -msgid "Public" -msgstr "" - - -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#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 "" - - -#: org.apache.isis.core.metamodel.services.user.UserServiceDefault$UserAndRoleOverrides#roles -msgid "Roles" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript() -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript() -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete() -msgid "Run Fixture Script" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#SAFE -msgid "Safe" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#SAFE_AND_REQUEST_CACHEABLE -msgid "Safe And Request Cacheable" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScript -msgid "Script" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(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.modules.simple.dom.impl.SimpleObjectMenu -msgid "Simple Objects" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToReadingTranslations() -msgid "Switch To Reading Translations" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToWritingTranslations() -msgid "Switch To Writing Translations" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.user.UserServiceDefault$UserAndRoleOverrides#user -msgid "User" -msgstr "" - - -#: org.apache.isis.applib.services.config.ConfigurationProperty#value -msgid "Value" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong#$$() -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp#$$() -msgid "Version" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Format#YAML -msgid "Yaml" -msgstr "" - - - - - -############################################################################## -# end of .pot file -############################################################################## - http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/.gitignore ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/.gitignore new file mode 100644 index 0000000..7371415 --- /dev/null +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/.gitignore @@ -0,0 +1,5 @@ +.gradle +translations.pot +*.jar +gradle/wrapper +!gradle-wrapper.jar \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/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 deleted file mode 100644 index 42f6074..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot +++ /dev/null @@ -1,435 +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 -# -# If the app uses TranslatableString (eg for internationalized validation -# messages), or if the app calls the TranslationService directly, then ensure -# that all text to be translated has been captured by running a full -# integration test suite that exercises all relevant behaviour -# -############################################################################## - -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: \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" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - - -#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel(java.lang.String) -msgid ".csv file name" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata#$$(java.lang.String) -msgid ".jdo file name" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations(java.lang.String) -msgid ".pot file name" -msgstr "" - - -#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#ACTION -msgid "Action" -msgstr "" - - -#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder -msgid "Are you sure?" -msgstr "" - - -#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder -msgid "Cancel" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache() -msgid "Clear translation cache" -msgstr "" - - -#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#COLLECTION -msgid "Collection" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#COMPLETE -msgid "Complete" -msgstr "" - - -#: org.apache.isis.applib.services.config.ConfigurationServiceMenu#configuration() -msgid "Configuration" -msgstr "" - - -#: org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder -msgid "Confirm" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#create() -#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#create() -msgid "Create" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#CURRENT -msgid "Current" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.user.UserServiceDefault#currentOverridesIfAny() -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 "" - - -#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel() -msgid "Download Meta Model (CSV)" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec() -msgid "Download Swagger Spec" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations() -msgid "Download Translations" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject$updateName#exec(java.lang.String) -msgid "Exclamation mark is not allowed" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject$delete#exec() -#: domainapp.modules.simple.dom.impl.SimpleObject$updateName#exec() -msgid "Exec" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternalNoop#executeWithinTransaction() -#: org.apache.isis.core.runtime.services.persistsession.PersistenceSessionServiceInternalDefault#executeWithinTransaction() -msgid "Execute Within Transaction" -msgstr "" - - -#: org.apache.isis.applib.services.dto.Dto_downloadXml#$$(java.lang.String) -#: org.apache.isis.applib.services.dto.Dto_downloadXsd#$$(java.lang.String,org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas) -#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml#$$(java.lang.String,org.apache.isis.applib.services.layout.LayoutService$Style) -msgid "File name" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec(java.lang.String,org.apache.isis.applib.services.swagger.SwaggerService$Visibility,org.apache.isis.applib.services.swagger.SwaggerService$Format) -msgid "Filename" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#findByName() -#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#findByName() -msgid "Find By Name" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureResult#fixtureScriptClassName -msgid "Fixture script" -msgstr "" - - -#: org.apache.isis.applib.services.queryresultscache.QueryResultsCache$Control#fixturesInstalling -msgid "Fixtures Installing" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScript#friendlyName -msgid "Friendly Name" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong#$$() -msgid "Id" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT -msgid "Idempotent" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT_ARE_YOU_SURE -msgid "Idempotent Are You Sure" -msgstr "" - - -#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#IGNORE -msgid "Ignore" -msgstr "" - - -#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#INCLUDE -msgid "Include" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Format#JSON -msgid "Json" -msgstr "" - - -#: org.apache.isis.applib.services.config.ConfigurationProperty#key -msgid "Key" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#listAll() -#: domainapp.modules.simple.dom.impl.SimpleObjectRepository#listAll() -msgid "List All" -msgstr "" - - -#: org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions#lookup() -msgid "Lookup" -msgstr "" - - -#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml -#: org.apache.isis.applib.services.layout.Object_rebuildMetamodel -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata -msgid "Metadata" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#MINIMAL -msgid "Minimal" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#name -#: domainapp.modules.simple.dom.impl.SimpleObject$updateName#exec(java.lang.String) -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#create(java.lang.String) -#: domainapp.modules.simple.dom.impl.SimpleObjectMenu#findByName(java.lang.String) -msgid "Name" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureFactory#newApplicationFeature() -msgid "New Application Feature" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT -msgid "Non Idempotent" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT_ARE_YOU_SURE -msgid "Non Idempotent Are You Sure" -msgstr "" - - -#: org.apache.isis.applib.services.layout.LayoutService$Style#NORMALIZED -msgid "Normalized" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#notes -msgid "Notes" -msgstr "" - - -#: org.apache.isis.applib.services.bookmark.BookmarkHolderAssociationContributions#object() -msgid "Object" -msgstr "" - - -#: domainapp.modules.simple.dom.impl.SimpleObject#title() -msgid "Object: {name}" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -msgid "Parameters" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE -msgid "Private" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE_WITH_PROTOTYPING -msgid "Private With Prototyping" -msgstr "" - - -#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#PROPERTY -msgid "Property" -msgstr "" - - -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault -#: org.apache.isis.applib.services.layout.LayoutServiceMenu -#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu -#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu -msgid "Prototyping" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PUBLIC -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 "" - - -#: 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 "" - - -#: org.apache.isis.core.metamodel.services.user.UserServiceDefault$UserAndRoleOverrides#roles -msgid "Roles" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript() -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript() -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete() -msgid "Run Fixture Script" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#SAFE -msgid "Safe" -msgstr "" - - -#: org.apache.isis.applib.annotation.SemanticsOf#SAFE_AND_REQUEST_CACHEABLE -msgid "Safe And Request Cacheable" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScript -msgid "Script" -msgstr "" - - -#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String) -#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(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.modules.simple.dom.impl.SimpleObjectMenu -msgid "Simple Objects" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToReadingTranslations() -msgid "Switch To Reading Translations" -msgstr "" - - -#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToWritingTranslations() -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 "" - - -#: org.apache.isis.applib.services.config.ConfigurationProperty#value -msgid "Value" -msgstr "" - - -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong#$$() -#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp#$$() -msgid "Version" -msgstr "" - - -#: org.apache.isis.applib.services.swagger.SwaggerService$Format#YAML -msgid "Yaml" -msgstr "" - - - - - -############################################################################## -# end of .pot file -############################################################################## - http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/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 2cfc4be..092fa90 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -32,10 +32,10 @@ </prerequisites> <properties> - <isis.version>1.14.0-SNAPSHOT</isis.version> + <isis.version>1.13.2</isis.version> <lombok.version>1.16.10</lombok.version> - <assertj-core.version>3.6.0</assertj-core.version> + <assertj-core.version>3.6.1</assertj-core.version> <mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.version> <maven-cucumber-reporting.dependency.log4j.version>2.7</maven-cucumber-reporting.dependency.log4j.version> @@ -51,7 +51,7 @@ <mavenmixin-isisswagger.version>0.0.3</mavenmixin-isisswagger.version> <mavenmixin-isisvalidate.version>0.0.2</mavenmixin-isisvalidate.version> - <isis-maven-plugin.version>1.13.1</isis-maven-plugin.version> + <isis-maven-plugin.version>${isis.version}</isis-maven-plugin.version> <mavenmixin-jettyconsole.version>0.0.2</mavenmixin-jettyconsole.version> <jetty-console-maven-plugin.version>1.59</jetty-console-maven-plugin.version> http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore new file mode 100644 index 0000000..70eee7e --- /dev/null +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore @@ -0,0 +1,5 @@ +# +# explicitly ignoring Microsoft JDBC4 jar +# (cannot redistribute, licensing) +# +sqljdbc4.jar http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/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 d62153d..3bc480e 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 @@ -61,17 +61,17 @@ ${symbol_pound}wrapper { <p> 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, + <a href="http://isis.apache.org/guides/ugfun.html${symbol_pound}_ugfun_getting-started_simple%61pp-archetype"; target="_blank">SimpleApp</a> archetype, to create a purposefully minimal application that nevertheless includes fixture data, integration tests and BDD specs. <br/> <br/> - The application's business logic resides in a single (maven) module, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple"; target="_blank"><code>module-simple</code></a>, that in turn contains a single domain entity, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java"; target="_blank"><code>SimpleObject</code></a>. The module has its own <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple/src/main/java/domainapp/modules/simple/fixture"; target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl"; target="_blank">unit tests</a> and <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules /module-simple/src/test/java/domainapp/modules/simple/integtests" target="_blank">integration tests</a>. New modules can be created by copying this first simple module. + The application's business logic resides in a single (maven) module, <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple"; target="_blank">module-simple</a>, that in turn contains a single domain entity, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java"; target="_blank">SimpleObject</a>. The module has its own <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple/src/main/java/domainapp/modules/simple/fixture"; target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple/src/test/java/domainapp/modules/simple/dom/impl"; target="_blank">unit tests</a> and <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/module-simple/src/test/java/domainapp/modules/simple/integtests/t ests" target="_blank">integration tests</a>. New modules can be created by copying this first simple module. <br/> <br/> - The app also defines the <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application"; target="_blank"><code>application</code></a> (maven) module; this holds <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/fixture"; target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/integtests"; target="_blank">integration/smoke tests</a> and <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/bdd"; target="_blank">BDD specs</a> to exercise the entire application. It also holds the <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java"; target="_blank"><code>AppManifes t</code></a> used to bootstrap the entire application, as well as application-scoped <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/services"; target="_blank">domain services</a> (eg a home page service). + The app also defines the <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/application"; target="_blank">application</a> (maven) module; this holds <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/application/src/main/java/domainapp/application/fixture"; target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/integtests"; target="_blank">integration/smoke tests</a> and <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/bdd"; target="_blank">BDD specs</a> to exercise the entire application. It also holds the <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java"; target="_blank">AppManifest</a> used to boots trap the entire application, as well as application-scoped <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/services"; target="_blank">domain services</a> (eg a home page service). <br/> <br/> - The app's <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/webapp"; target="_blank"><code>webapp</code></a> (maven) module is used to assemble the application into a WAR file. + The app's <a href="https://github.com/apache/isis/tree/master/example/application/simple%61pp/webapp"; target="_blank">webapp</a> (maven) module is used to assemble the application into a WAR file. </p> <p>To access the app:</p> @@ -82,7 +82,7 @@ ${symbol_pound}wrapper { </p> <p> provides access to a generic UI for end-users, - Isis' <a href="http://isis.apache.org/components/viewers/wicket/about.html"; target="_blank">Wicket Viewer</a>. + Isis' <a href="http://isis.apache.org/guides/ugvw.html"; target="_blank">Wicket Viewer</a>. As its name suggests, this viewer is built on top of <a href="http://wicket.apache.org"; target="_blank">Apache Wicket</a>™. </p> </li> @@ -94,15 +94,17 @@ ${symbol_pound}wrapper { </p> <p> provides access to a Swagger UI which uses a subset of the framework's automatically - generated <a href="restful/">RESTful API</a>. There are three versions of the Swagger - spec files (that drive the UI): <a href="restful/swagger/public">public</a> (for use by - "third-party" apps), <a href="restful/swagger/private">private</a> (for use by internal apps), - and <a href="restful/swagger/prototyping">prototyping</a> (an extended version of the private + generated <a href="restful/">RESTful API</a> (provided by the + <a href="http://isis.apache.org/guides/ugvro.html"; target="_blank">Restful Objects viewer</a>). There are + three versions of the Swagger spec files (that drive the UI): + <a href="restful/swagger/public">public</a> (for use by "third-party" apps), + <a href="restful/swagger/private">private</a> (for use by internal apps), and + <a href="restful/swagger/prototyping">prototyping</a> (an extended version of the private API). The Swagger spec files are themselves dynamically generated and can be used to generate client-side stubs. </p> <p>The RESTful API can return both simple representations and also richer hypermedia representations - that are conformant with the <a href="http://restfulobjects.org";>Restful Objects</a> spec. + that are conformant with the <a href="http://restfulobjects.org"; target="_blank">Restful Objects</a> spec. The HTTP <code>Accept</code> header is used to select which representation should be generated. </p> </li> http://git-wip-us.apache.org/repos/asf/isis/blob/cf9cb153/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 e6d6158..e7afa59 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 @@ -#Sat Dec 10 12:25:12 GMT 2016 +#Sat Dec 10 18:17:52 GMT 2016 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it
