Clone Tools
  • last updated 17 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
ISIS-2141 renaming /example/application -> /examples/apps

    • binary
    ./src/main/jettyconsole/isis-banner.pdn
    • binary
    ./src/main/jettyconsole/isis-banner.png
    • -26
    • +0
    ./src/main/resources/docker/Dockerfile
    • -136
    • +0
    ./src/main/webapp/WEB-INF/isis.properties
    • -249
    • +0
    ./src/main/webapp/WEB-INF/logging.properties
    • -93
    • +0
    ./src/main/webapp/WEB-INF/shiro.ini
    • -674
    • +0
    ./src/main/webapp/WEB-INF/translations-en.po
    • -673
    • +0
    ./src/main/webapp/WEB-INF/translations-es.po
    • -674
    • +0
    ./src/main/webapp/WEB-INF/translations-nl.po
    • -673
    • +0
    ./src/main/webapp/WEB-INF/translations.po
    • binary
    ./src/main/webapp/about/images/isis-logo.png
    • -120
    • +0
    ./src/main/webapp/about/index.html
    • -19
    • +0
    ./src/main/webapp/css/application.css
  1. … 775 more files in changeset.
ISIS-1811: recreating simpleapp archetype

    • binary
    ./src/main/jettyconsole/isis-banner.pdn
    • binary
    ./src/main/jettyconsole/isis-banner.png
    • -0
    • +136
    ./src/main/webapp/WEB-INF/isis.properties
    • -0
    • +249
    ./src/main/webapp/WEB-INF/logging.properties
    • -0
    • +93
    ./src/main/webapp/WEB-INF/shiro.ini
    • -0
    • +674
    ./src/main/webapp/WEB-INF/translations-en.po
    • -0
    • +673
    ./src/main/webapp/WEB-INF/translations-es.po
    • -0
    • +674
    ./src/main/webapp/WEB-INF/translations-nl.po
    • -0
    • +673
    ./src/main/webapp/WEB-INF/translations.po
    • binary
    ./src/main/webapp/about/images/isis-logo.png
    • -0
    • +120
    ./src/main/webapp/about/index.html
    • -0
    • +19
    ./src/main/webapp/css/application.css
  1. … 74 more files in changeset.
ISIS-1811: recreating simpleapp archetype

    • binary
    ./src/main/jettyconsole/isis-banner.pdn
    • binary
    ./src/main/jettyconsole/isis-banner.png
    • -127
    • +0
    ./src/main/webapp/WEB-INF/isis.properties
    • -251
    • +0
    ./src/main/webapp/WEB-INF/logging.properties
    • -93
    • +0
    ./src/main/webapp/WEB-INF/shiro.ini
    • -674
    • +0
    ./src/main/webapp/WEB-INF/translations-en.po
    • -673
    • +0
    ./src/main/webapp/WEB-INF/translations-es.po
    • -674
    • +0
    ./src/main/webapp/WEB-INF/translations-nl.po
    • -673
    • +0
    ./src/main/webapp/WEB-INF/translations.po
    • -358
    • +0
    ./src/main/webapp/WEB-INF/web.xml
    • binary
    ./src/main/webapp/about/images/isis-logo.png
    • -120
    • +0
    ./src/main/webapp/about/index.html
    • -19
    • +0
    ./src/main/webapp/css/application.css
  1. … 71 more files in changeset.
Merge branch 'release-1.17.0-RC3' into v2

# Conflicts:

# adocs/documentation/src/main/asciidoc/__versions.adoc

# adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_MetamodelService.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc

# adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_ui-hints_names-and-descriptions.adoc

# adocs/documentation/src/main/asciidoc/guides/ugvw/_ugvw_configuration-properties.adoc

# core/.m2/settings.xml

# core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java

# core/applib/src/test/java/org/apache/isis/schema/utils/CommonDtoUtils_setValueOn_Test.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigProperty.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyAbstract.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyBoolean.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyEnum.java

# core/config/src/main/java/org/apache/isis/config/property/ConfigPropertyString.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java

# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java

# example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties

# example/application/helloworld/src/main/webapp/WEB-INF/web.xml

# example/application/simpleapp/application/src/test/java/domainapp/application/integtests/tests/mml/MetaModelService_IntegTest.exports.approved.xml

# example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml

# example/archetype/helloworld/pom.xml

# example/archetype/helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml

# example/archetype/helloworld/src/main/resources/archetype-resources/pom.xml

# example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/application/isis-non-changing.properties

# example/archetype/helloworld/src/main/resources/archetype-resources/src/main/java/domainapp/dom/impl/HelloWorldObjects.java

# example/archetype/helloworld/src/test/resources/projects/basic/archetype.properties

# example/archetype/simpleapp/pom.xml

# example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties

# example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties

# recreate_archetype_RELEASE.sh

# recreate_archetype_SNAPSHOT.sh

# scripts/updateGeneratedArchetypeSources.groovy

# scripts/verify-isis-release.sh

  1. … 45 more files in changeset.
ISIS-1899: recreating simpleapp archetype

  1. … 25 more files in changeset.
ISIS-2023: removes DomainApplication subclass for simpleapp archetype

also:

- general tidy-up of documentation about the archetypes.

- tidies up comments in viewer_wicket.properties

- removes DomainApplication.properties (i8n file no longer required)

- removes welcome.html (unused, in wrong location anyway)

  1. … 9 more files in changeset.
ISIS-1899: recreating simpleapp archetype

    • -20
    • +17
    ./src/main/webapp/WEB-INF/isis.properties
    • -6
    • +19
    ./src/main/webapp/WEB-INF/logging.properties
    • binary
    ./src/main/webapp/images/apache-isis/logo-48x48.png
    • binary
    ./src/main/webapp/images/spinning-icon.gif
  1. … 40 more files in changeset.
ISIS-1810: recreating simpleapp archetype

    • -4
    • +26
    ./src/main/resources/docker/Dockerfile
  1. … 3 more files in changeset.
ISIS-1810: recreating simpleapp archetype

  1. … 25 more files in changeset.
ISIS-1916: recreating simpleapp archetype

    • -0
    • +4
    ./src/main/resources/docker/Dockerfile
  1. … 18 more files in changeset.
ISIS-1881 remove swagger-ui from simpleapp/helloworld and artifacts

(swagger-ui is now bundled with metamodel)

    • -5
    • +0
    ./src/main/webapp/swagger-ui/00-README.md
    • -1
    • +0
    ./src/main/webapp/swagger-ui/css/print.css
    • -1
    • +0
    ./src/main/webapp/swagger-ui/css/reset.css
    • -1
    • +0
    ./src/main/webapp/swagger-ui/css/style.css
  1. … 201 more files in changeset.
ISIS-1465: recreating simpleapp archetype

    • -12
    • +13
    ./src/main/webapp/WEB-INF/isis.properties
    • -11
    • +17
    ./src/main/webapp/WEB-INF/logging.properties
    • -3
    • +3
    ./src/main/webapp/swagger-ui/index.html
  1. … 49 more files in changeset.
ISIS-1712: recreating simpleapp archetype

  1. … 12 more files in changeset.
ISIS-1521: recreates simpleapp archetype

    • binary
    ./src/main/jettyconsole/isis-banner.pdn
    • binary
    ./src/main/jettyconsole/isis-banner.png
    • -0
    • +129
    ./src/main/webapp/WEB-INF/isis.properties
    • -0
    • +232
    ./src/main/webapp/WEB-INF/logging.properties
    • -0
    • +93
    ./src/main/webapp/WEB-INF/shiro.ini
    • -0
    • +674
    ./src/main/webapp/WEB-INF/translations-en.po
    • -0
    • +673
    ./src/main/webapp/WEB-INF/translations-es.po
    • -0
    • +674
    ./src/main/webapp/WEB-INF/translations-nl.po
    • -0
    • +673
    ./src/main/webapp/WEB-INF/translations.po
    • -0
    • +357
    ./src/main/webapp/WEB-INF/web.xml
  1. … 126 more files in changeset.
ISIS-1521: recreates simpleapp archetype

    • binary
    ./src/main/jettyconsole/isis-banner.pdn
    • binary
    ./src/main/jettyconsole/isis-banner.png
    • -39
    • +0
    ./src/main/webapp/WEB-INF/isis.properties
    • -225
    • +0
    ./src/main/webapp/WEB-INF/logging.properties
    • -116
    • +0
    ./src/main/webapp/WEB-INF/persistor.properties
    • -93
    • +0
    ./src/main/webapp/WEB-INF/shiro.ini
    • -674
    • +0
    ./src/main/webapp/WEB-INF/translations-en.po
    • -673
    • +0
    ./src/main/webapp/WEB-INF/translations-es.po
    • -674
    • +0
    ./src/main/webapp/WEB-INF/translations-nl.po
  1. … 73 more files in changeset.
ISIS-1640, ISIS-1641, ISIS-1642: lets breadcrumb and bookmark panels optionally be hidden, and removes memory leak in Breadcrumbs.

    • -1
    • +1
    ./src/main/webapp/WEB-INF/translations.po
  1. … 17 more files in changeset.
ISIS-1607: fixes links oin swagger-ui.html

    • -1
    • +1
    ./src/main/webapp/swagger-ui/index.html
  1. … 1 more file in changeset.
Merge branch 'release-1.14.0-RC1'

  1. … 4 more files in changeset.
ISIS-1561: recreating simpleapp archetype

    • -263
    • +3
    ./src/main/webapp/WEB-INF/isis.properties
    • -15
    • +0
    ./src/main/webapp/WEB-INF/persistor.properties
  1. … 20 more files in changeset.
Merge branch 'release-1.13.2.1-RC1'

  1. … 3 more files in changeset.
ISIS-1560: recreating simpleapp archetype

    • -1
    • +1
    ./src/main/webapp/WEB-INF/translations.po
  1. … 26 more files in changeset.
ISIS-1540: recreating simpleapp archetype

    • -10
    • +12
    ./src/main/webapp/about/index.html
  1. … 10 more files in changeset.
ISIS-1538: recreating simpleapp archetype

  1. … 3 more files in changeset.
Merge branch 'maint-1.13.2'

# Conflicts:

# example/application/simpleapp/webapp/pom.xml

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml

# example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties

  1. … 3 more files in changeset.
ISIS-1538: recreating simpleapp archetype

  1. … 15 more files in changeset.
ISIS-1538: recreating simpleapp archetype

    • -1
    • +1
    ./src/main/webapp/WEB-INF/isis.properties
  1. … 3 more files in changeset.
ISIS-1538: recreating simpleapp archetype

  1. … 3 more files in changeset.
Merge branch 'maint-1.13.2'

  1. … 1 more file in changeset.
ISIS-1538: recreating simpleapp archetype

  1. … 6 more files in changeset.
Merge branch 'maint-1.13.2'

# Conflicts:

# example/archetype/simpleapp/src/main/resources/archetype-resources/application/translations.pot

# example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/translations.pot

# example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties

  1. … 1 more file in changeset.