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 2017/08/03 15:44:30 UTC
[5/9] isis git commit: ISIS-1521: tiny tweaks to simpleapp archetype
ISIS-1521: tiny tweaks to simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2f746200
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2f746200
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2f746200
Branch: refs/heads/master
Commit: 2f746200241e592e74e22c35247c7a57cf9b1ef0
Parents: 650c285
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Aug 3 14:37:41 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Aug 3 14:37:41 2017 +0100
----------------------------------------------------------------------
.../application/services/homepage/HomePageViewModel.java | 2 +-
.../src/main/java/domainapp/webapp/DomainApplication.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2f746200/example/application/simpleapp/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java b/example/application/simpleapp/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
index 4bf5563..89f11f8 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/services/homepage/HomePageViewModel.java
@@ -29,7 +29,7 @@ import domainapp.modules.simple.dom.impl.SimpleObjectRepository;
@DomainObject(
nature = Nature.VIEW_MODEL,
- objectType = "homepage.HomePageViewModel"
+ objectType = "domainapp.application.services.homepage.HomePageViewModel"
)
public class HomePageViewModel {
http://git-wip-us.apache.org/repos/asf/isis/blob/2f746200/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/DomainApplication.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/DomainApplication.java b/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/DomainApplication.java
index df5edfa..b921249 100644
--- a/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/DomainApplication.java
+++ b/example/application/simpleapp/webapp/src/main/java/domainapp/webapp/DomainApplication.java
@@ -62,6 +62,8 @@ public class DomainApplication extends IsisWicketApplication {
settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly));
}
+ private static final String APP_NAME = "Simple App";
+
@Override
protected Module newIsisWicketModule() {
final Module isisDefaults = super.newIsisWicketModule();
@@ -69,11 +71,11 @@ public class DomainApplication extends IsisWicketApplication {
final Module overrides = new AbstractModule() {
@Override
protected void configure() {
- bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Simple App");
+ bind(String.class).annotatedWith(Names.named("applicationName")).toInstance(APP_NAME);
bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css");
bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js");
bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines(getClass(), "welcome.html", "This is a simple app"));
- bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("Simple App");
+ bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance(APP_NAME);
bind(InputStream.class).annotatedWith(Names.named("metaInfManifest")).toProvider(
Providers.of(getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")));
// if uncommented, then overrides isis.appManifest in config file.