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 2019/12/07 12:02:07 UTC
[isis-app-simpleapp] branch master updated (eaa78fd -> f31a90b)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git.
from eaa78fd update after ISIS-2213 ... changed package
new 9a6a351 ISIS-2215: updates to packages
new 550aab1 small improvement to index.html
new 37d0bd7 formatting is all
new 6eac5a8 fixture's Module renamed to ModuleWithFixtures
new f31a90b fixes property for fa icons (remove trailing '\' when in yml)
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../domainapp/modules/simple/SimpleModule.java | 10 +--
.../integtests/SimpleModuleIntegTestAbstract.java | 16 ++--
.../src/main/java/domainapp/webapp/SimpleApp.java | 31 +++----
.../webapp/application/ApplicationModule.java | 9 +--
.../services/homepage/HomePageService.java | 3 +-
webapp/src/main/resources/application.yml | 94 +++++++++++-----------
webapp/src/main/resources/shiro.ini | 4 +-
webapp/src/main/resources/static/index.html | 2 +-
.../integtests/ApplicationIntegTestAbstract.java | 16 ++--
9 files changed, 90 insertions(+), 95 deletions(-)
[isis-app-simpleapp] 05/05: fixes property for fa icons (remove
trailing '\' when in yml)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit f31a90ba900473a7e2dd480a8dc455a5da0f8b3a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 12:01:29 2019 +0000
fixes property for fa icons (remove trailing '\' when in yml)
---
webapp/src/main/resources/application.yml | 94 +++++++++++++++----------------
1 file changed, 47 insertions(+), 47 deletions(-)
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 9c055d4..2529dae 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -17,57 +17,57 @@ isis:
facet:
css-class-fa:
patterns:
- new.*:fa-plus,\
- add.*:fa-plus-square,\
- create.*:fa-plus,\
- update.*:fa-edit,\
- delete.*:fa-trash,\
- save.*:fa-floppy-o,\
- change.*:fa-edit,\
- edit.*:fa-pencil-square-o,\
- maintain.*:fa-edit,\
- remove.*:fa-minus-square,\
- copy.*:fa-copy,\
- move.*:fa-exchange,\
- first.*:fa-star,\
- find.*:fa-search,\
- lookup.*:fa-search,\
- search.*:fa-search,\
- view.*:fa-search,\
- clear.*:fa-remove,\
- previous.*:fa-step-backward,\
- next.*:fa-step-forward,\
- list.*:fa-list, \
- all.*:fa-list, \
- download.*:fa-download, \
- upload.*:fa-upload, \
- export.*:fa-download,\
- switch.*:fa-exchange,\
- import.*:fa-upload,\
- execute.*:fa-bolt, \
- run.*:fa-bolt, \
- calculate.*:fa-calculator, \
- verify.*:fa-check-circle, \
- refresh.*:fa-refresh, \
- install.*:fa-wrench,\
- stop.*:fa-stop,\
- terminate.*:fa-stop,\
- cancel.*:fa-stop,\
- discard.*:fa-trash-o,\
- pause.*:fa-pause,\
- suspend.*:fa-pause,\
- resume.*:fa-play,\
- renew.*:fa-repeat,\
- reset.*:fa-repeat,\
- categorise.*:fa-folder-open-o,\
- assign.*:fa-hand-o-right,\
- approve.*:fa-thumbs-o-up,\
+ new.*:fa-plus,
+ add.*:fa-plus-square,
+ create.*:fa-plus,
+ update.*:fa-edit,
+ delete.*:fa-trash,
+ save.*:fa-floppy-o,
+ change.*:fa-edit,
+ edit.*:fa-pencil-square-o,
+ maintain.*:fa-edit,
+ remove.*:fa-minus-square,
+ copy.*:fa-copy,
+ move.*:fa-exchange,
+ first.*:fa-star,
+ find.*:fa-search,
+ lookup.*:fa-search,
+ search.*:fa-search,
+ view.*:fa-search,
+ clear.*:fa-remove,
+ previous.*:fa-step-backward,
+ next.*:fa-step-forward,
+ list.*:fa-list,
+ all.*:fa-list,
+ download.*:fa-download,
+ upload.*:fa-upload,
+ export.*:fa-download,
+ switch.*:fa-exchange,
+ import.*:fa-upload,
+ execute.*:fa-bolt,
+ run.*:fa-bolt,
+ calculate.*:fa-calculator,
+ verify.*:fa-check-circle,
+ refresh.*:fa-refresh,
+ install.*:fa-wrench,
+ stop.*:fa-stop,
+ terminate.*:fa-stop,
+ cancel.*:fa-stop,
+ discard.*:fa-trash-o,
+ pause.*:fa-pause,
+ suspend.*:fa-pause,
+ resume.*:fa-play,
+ renew.*:fa-repeat,
+ reset.*:fa-repeat,
+ categorise.*:fa-folder-open-o,
+ assign.*:fa-hand-o-right,
+ approve.*:fa-thumbs-o-up,
decline.*:fa-thumbs-o-down
css-class:
patterns:
- delete.*:btn-danger,\
- discard.*:btn-warning,\
+ delete.*:btn-danger,
+ discard.*:btn-warning,
remove.*:btn-warning
[isis-app-simpleapp] 01/05: ISIS-2215: updates to packages
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 9a6a3516a04df2d5b71890185374c3cf54003553
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 6 07:05:29 2019 +0000
ISIS-2215: updates to packages
---
.../domainapp/modules/simple/SimpleModule.java | 3 +--
.../integtests/SimpleModuleIntegTestAbstract.java | 16 +++++------
.../src/main/java/domainapp/webapp/SimpleApp.java | 31 +++++++++++-----------
.../webapp/application/ApplicationModule.java | 3 +--
webapp/src/main/resources/shiro.ini | 4 +--
.../integtests/ApplicationIntegTestAbstract.java | 16 +++++------
6 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 8315be4..fd99bd3 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -9,8 +9,7 @@ import org.apache.isis.extensions.fixtures.modules.Module;
import domainapp.modules.simple.dom.impl.SimpleObject;
-@Configuration
-@ComponentScan
+@org.apache.isis.applib.annotation.Module
public class SimpleModule implements Module {
@Override
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 04d48bf..849ec7d 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -3,11 +3,11 @@ package domainapp.modules.simple.integtests;
import domainapp.modules.simple.SimpleModule;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
import org.apache.isis.extensions.fixtures.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -27,10 +27,10 @@ public abstract class SimpleModuleIntegTestAbstract extends IsisIntegrationTestA
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- IsisExtFixturesModule.class,
+ IsisModuleSpringBoot.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleExtFixtures.class,
SimpleModule.class
})
public static class AppManifest {
diff --git a/webapp/src/main/java/domainapp/webapp/SimpleApp.java b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
index 817206a..a107752 100644
--- a/webapp/src/main/java/domainapp/webapp/SimpleApp.java
+++ b/webapp/src/main/java/domainapp/webapp/SimpleApp.java
@@ -3,13 +3,13 @@ package domainapp.webapp;
import domainapp.webapp.application.ApplicationModule;
import domainapp.webapp.application.fixture.scenarios.DomainAppDemo;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
-import org.apache.isis.extensions.h2console.dom.IsisExtH2ConsoleModule;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.shiro.IsisBootSecurityShiro;
-import org.apache.isis.viewer.restfulobjects.viewer.IsisBootViewerRestfulObjects;
-import org.apache.isis.viewer.wicket.viewer.IsisBootViewerWicket;
+import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
+import org.apache.isis.extensions.h2console.dom.IsisModuleExtH2Console;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
+import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
+import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -30,16 +30,17 @@ public class SimpleApp extends SpringBootServletInitializer {
@PropertySources({
@PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
+ @PropertySource(IsisPresets.DebugDiscovery),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityShiro.class,
- IsisBootDataNucleus.class,
- IsisBootViewerRestfulObjects.class,
- IsisBootViewerWicket.class,
-
- IsisExtFixturesModule.class,
- IsisExtH2ConsoleModule.class,
+ IsisModuleSpringBoot.class,
+ IsisModuleSecurityShiro.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleRestfulObjectsViewer.class,
+ IsisModuleWicketViewer.class,
+
+ IsisModuleExtFixtures.class,
+ IsisModuleExtH2Console.class,
ApplicationModule.class,
DomainAppDemo.class // register this fixture
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index d5c0535..b68faef 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -7,9 +7,8 @@ import org.springframework.context.annotation.Import;
import domainapp.modules.simple.SimpleModule;
-@Configuration
+@org.apache.isis.applib.annotation.Module
@Import(SimpleModule.class)
-@ComponentScan
public class ApplicationModule implements Module {
}
diff --git a/webapp/src/main/resources/shiro.ini b/webapp/src/main/resources/shiro.ini
index 22ff9e9..7588caa 100644
--- a/webapp/src/main/resources/shiro.ini
+++ b/webapp/src/main/resources/shiro.ini
@@ -1,14 +1,14 @@
[main]
-contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory
+contextFactory = org.apache.isis.security.shiro.realm.ldap.IsisLdapContextFactory
contextFactory.url = ldap://localhost:10389
contextFactory.authenticationMechanism = CRAM-MD5
contextFactory.systemAuthenticationMechanism = simple
contextFactory.systemUsername = uid=admin,ou=system
contextFactory.systemPassword = secret
-ldapRealm = org.apache.isis.security.shiro.IsisLdapRealm
+ldapRealm = org.apache.isis.security.shiro.realm.ldap.IsisLdapRealm
ldapRealm.contextFactory = $contextFactory
ldapRealm.searchBase = ou=groups,o=mojo
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
index 06db9ea..d7b1c22 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/ApplicationIntegTestAbstract.java
@@ -3,11 +3,11 @@ package domainapp.webapp.integtests;
import domainapp.webapp.application.ApplicationModule;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.extensions.fixtures.IsisModuleExtFixtures;
import org.apache.isis.integtestsupport.IsisIntegrationTestAbstract;
-import org.apache.isis.persistence.jdo.datanucleus5.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -28,10 +28,10 @@ public abstract class ApplicationIntegTestAbstract extends IsisIntegrationTestAb
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootDataNucleus.class,
- IsisBootSecurityBypass.class,
- IsisExtFixturesModule.class,
+ IsisModuleSpringBoot.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleExtFixtures.class,
ApplicationModule.class
})
public static class AppManifest {
[isis-app-simpleapp] 04/05: fixture's Module renamed to
ModuleWithFixtures
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 6eac5a85571f1bffa1755b24dccd0b8228bbfb10
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 12:00:57 2019 +0000
fixture's Module renamed to ModuleWithFixtures
---
.../src/main/java/domainapp/modules/simple/SimpleModule.java | 7 ++-----
.../main/java/domainapp/webapp/application/ApplicationModule.java | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index fd99bd3..98c562a 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -1,16 +1,13 @@
package domainapp.modules.simple;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
import org.apache.isis.extensions.fixtures.fixturescripts.FixtureScript;
import org.apache.isis.extensions.fixtures.legacy.teardown.TeardownFixtureAbstract2;
-import org.apache.isis.extensions.fixtures.modules.Module;
+import org.apache.isis.extensions.fixtures.modules.ModuleWithFixtures;
import domainapp.modules.simple.dom.impl.SimpleObject;
@org.apache.isis.applib.annotation.Module
-public class SimpleModule implements Module {
+public class SimpleModule implements ModuleWithFixtures {
@Override
public FixtureScript getTeardownFixture() {
diff --git a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
index b68faef..2169ddb 100644
--- a/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
+++ b/webapp/src/main/java/domainapp/webapp/application/ApplicationModule.java
@@ -1,14 +1,12 @@
package domainapp.webapp.application;
-import org.apache.isis.extensions.fixtures.modules.Module;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.apache.isis.extensions.fixtures.modules.ModuleWithFixtures;
import org.springframework.context.annotation.Import;
import domainapp.modules.simple.SimpleModule;
@org.apache.isis.applib.annotation.Module
@Import(SimpleModule.class)
-public class ApplicationModule implements Module {
+public class ApplicationModule implements ModuleWithFixtures {
}
[isis-app-simpleapp] 03/05: formatting is all
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 37d0bd77fefe7014da19d4ab931bdaa65a53f1a2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 12:00:24 2019 +0000
formatting is all
---
.../webapp/application/services/homepage/HomePageService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
index 4bc23a5..6162fef 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageService.java
@@ -10,7 +10,8 @@ import org.apache.isis.applib.annotation.HomePage;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.factory.FactoryService;
-@Service @Named("homepage.HomePageService")
+@Service
+@Named("domainapp.HomePageService")
public class HomePageService {
@Action(semantics = SemanticsOf.SAFE)
[isis-app-simpleapp] 02/05: small improvement to index.html
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 550aab12740b9b2678965d89152c80f48eed3dd5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Dec 7 12:00:09 2019 +0000
small improvement to index.html
---
webapp/src/main/resources/static/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapp/src/main/resources/static/index.html b/webapp/src/main/resources/static/index.html
index 95dcd58..7181038 100644
--- a/webapp/src/main/resources/static/index.html
+++ b/webapp/src/main/resources/static/index.html
@@ -48,7 +48,7 @@ th, td {
<ul>
<li>
<p>
- <b><a href="wicket/">wicket/</a></b>
+ <b><a href="wicket/">Generic UI (Wicket)</a></b>
</p>
<p>
provides access to a generic UI for end-users, Apache Isis'