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/11 16:49:08 UTC
[isis-app-simpleapp] branch master updated (f31a90b -> 8effe27)
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 f31a90b fixes property for fa icons (remove trailing '\' when in yml)
new c6d0e3a ISIS-2198: removes welcome.file config for smoketests.
new e2faf24 converts HealthCheckService into a @Service, pass exception on error
new 8effe27 removes ldap configuration from shiro.ini, just configure to use iniRealm
The 3 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:
.../services/health/HealthCheckServiceImpl.java | 23 +++++++++-----
webapp/src/main/resources/application.yml | 2 --
webapp/src/main/resources/shiro.ini | 36 +---------------------
3 files changed, 16 insertions(+), 45 deletions(-)
[isis-app-simpleapp] 01/03: ISIS-2198: removes welcome.file config
for smoketests.
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 c6d0e3a9cb934b10314b2ffd70245dabbcadf094
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 9 08:27:48 2019 +0000
ISIS-2198: removes welcome.file config for smoketests.
---
webapp/src/main/resources/application.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 2529dae..80aa306 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -102,8 +102,6 @@ isis:
css: css/application.css
js: scripts/application.js
about: Simple App
- welcome:
- file: welcome.html
credit[0]:
image: /images/apache-isis/logo-48x48.png
[isis-app-simpleapp] 02/03: converts HealthCheckService into a
@Service, pass exception on error
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 e2faf242346bff983777c85fb58ea2ae54215c00
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 9 08:29:58 2019 +0000
converts HealthCheckService into a @Service, pass exception on error
---
.../services/health/HealthCheckServiceImpl.java | 23 ++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index 4a42b21..feaede6 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -1,29 +1,36 @@
package domainapp.webapp.application.services.health;
import javax.inject.Inject;
+import javax.inject.Named;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.health.Health;
import org.apache.isis.applib.services.health.HealthCheckService;
+import org.springframework.stereotype.Service;
import domainapp.modules.simple.dom.impl.SimpleObjects;
+import domainapp.modules.simple.dom.types.Name;
+import lombok.extern.log4j.Log4j2;
-@DomainService(nature = NatureOfService.DOMAIN)
+@Service
+@Named("domainapp.HealthCheckServiceImpl")
+@Log4j2
public class HealthCheckServiceImpl implements HealthCheckService {
+ private final SimpleObjects simpleObjects;
+
+ @Inject
+ public HealthCheckServiceImpl(SimpleObjects simpleObjects) {
+ this.simpleObjects = simpleObjects;
+ }
+
@Override
public Health check() {
-
try {
simpleObjects.ping();
return Health.ok();
} catch (Exception ex) {
- return Health.error(ex.getMessage());
+ return Health.error(ex);
}
}
-
- @Inject
- SimpleObjects simpleObjects;
}
[isis-app-simpleapp] 03/03: removes ldap configuration from
shiro.ini, just configure to use iniRealm
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 8effe2791a6e47ea81dea7ccab5655246b4aa7f4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Dec 9 08:30:28 2019 +0000
removes ldap configuration from shiro.ini, just configure to use iniRealm
---
webapp/src/main/resources/shiro.ini | 36 +-----------------------------------
1 file changed, 1 insertion(+), 35 deletions(-)
diff --git a/webapp/src/main/resources/shiro.ini b/webapp/src/main/resources/shiro.ini
index 7588caa..6820eb9 100644
--- a/webapp/src/main/resources/shiro.ini
+++ b/webapp/src/main/resources/shiro.ini
@@ -1,39 +1,5 @@
-
[main]
-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.realm.ldap.IsisLdapRealm
-ldapRealm.contextFactory = $contextFactory
-
-ldapRealm.searchBase = ou=groups,o=mojo
-ldapRealm.groupObjectClass = groupOfUniqueNames
-ldapRealm.uniqueMemberAttribute = uniqueMember
-ldapRealm.uniqueMemberAttributeValueTemplate = uid={0}
-
-# optional mapping from physical groups to logical application roles
-#ldapRealm.rolesByGroup = \
-# LDN_USERS: user_role,\
-# NYK_USERS: user_role,\
-# HKG_USERS: user_role,\
-# GLOBAL_ADMIN: admin_role,\
-# DEMOS: self-install_role
-
-ldapRealm.permissionsByRole=\
- user_role = *:SimpleObjectMenu:*:*,\
- *:SimpleObject:*:*; \
- self-install_role = *:FixtureScriptsDefault:*:* ; \
- admin_role = *
-
-# to use ldap...
-# (see docs for details of how to setup users/groups in Apache Directory Studio).
-#securityManager.realms = $ldapRealm
-
# to use .ini file
securityManager.realms = $iniRealm
@@ -71,5 +37,5 @@ guest = guest, user_role
user_role = *:SimpleObjectMenu:*:*,\
*:SimpleObject:*:*
-self-install_role = *:FixtureScriptsDefault:*:*
+self-install_role = *:FixtureScripts:*:*
admin_role = *