[Observe-commits] 01/01: -mimprove static mapping

6 Sep 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 8381388fbd623072dbc321e78764139f84710b35
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Sep 6 19:53:54 2016 +0200

    -mimprove static mapping
---
 .../web/controller/v1/ConfigurationController.java |  6 ++---
 application-web/src/main/webmotion/mapping         | 30 +++++++++++++---------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java
index 353e7e8..b95aaa2 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ConfigurationController.java
@@ -79,7 +79,7 @@ public class ConfigurationController extends ObserveWebMotionController {
                          "\n~~~ Configuration         ~~~\n" + configuration().getContent() +
                          "\n~~~ Databases             ~~~\n" + databases().getContent() +
                          "\n~~~ Users                 ~~~\n" + users().getContent() +
-                         "\n~~~ AuthenticationTokens  ~~~\n" + showAuthenticationTokens().getContent();
+                         "\n~~~ AuthenticationTokens  ~~~\n" + authenticationTokens().getContent();
 
         return toTextPlain(content);
 
@@ -126,7 +126,7 @@ public class ConfigurationController extends ObserveWebMotionController {
 
     }
 
-    public RenderContent showAuthenticationTokens() {
+    public RenderContent authenticationTokens() {
 
         ObserveWebSecurityApplicationContext securityApplicationContext = getSecurityApplicationContext();
 
@@ -161,7 +161,7 @@ public class ConfigurationController extends ObserveWebMotionController {
 
     }
 
-    public RenderContent reload() throws IOException, InvalidObserveWebUserPermissionException, InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException, InvalidObserveWebUsersException, InvalidObserveWebUserException {
+    public RenderContent reloadConfiguration() throws IOException, InvalidObserveWebUserPermissionException, InvalidObserveWebDatabaseException, InvalidObserveWebDatabasesException, InvalidObserveWebDatabaseRoleException, InvalidObserveWebUsersException, InvalidObserveWebUserException {
 
         // Reset all connexions
 
diff --git a/application-web/src/main/webmotion/mapping b/application-web/src/main/webmotion/mapping
index b88acfe..5bbfb48 100644
--- a/application-web/src/main/webmotion/mapping
+++ b/application-web/src/main/webmotion/mapping
@@ -37,28 +37,34 @@ server.listener.class=fr.ird.observe.application.web.ObserveWebApplicationListen
 default.render=fr.ird.observe.application.web.ObserveWebMotionRender
 
 [filters]
-*      /*                                           ObserveWebMotionFilter.inject
+*      /*                                                        ObserveWebMotionFilter.inject
 
 [errors]
-*                                                       ObserveWebErrorController.error
+*                                                                ObserveWebErrorController.error
 
 [actions]
 
-GET              /admin/configuration/{method}                      ConfigurationController.{method}
+# →→→ Static mapping
 
-# →→→ Legacy
-#GET,POST,DELETE  /api/v1/{service}/{method}                         {service}Controller.{method}
-#GET,POST,DELETE  /api/v1/{package}/{service}/{method}               {package}.{service}Controller.{method}
-#GET,POST,DELETE  /api/v1/{package1}/{package2}/{service}/{method}   {package1}.{package2}.{service}Controller.{method}
-#GET,POST,DELETE  /api/v1/{package1}/{package2}/{package3}/{service}/{method}   {package1}.{package2}.{package3}.{service}Controller.{method}
-#GET,POST,DELETE  /api/v1/{package1}/{package2}/{package3}/{package4}/{service}/{method}   {package1}.{package2}.{package3}.{package4}.{service}Controller.{method}
-# ←←← Legacy
+GET              /admin/configuration/authenticationTokens       ConfigurationController.authenticationTokens
+GET              /admin/configuration/configuration              ConfigurationController.configuration
+GET              /admin/configuration/databases                  ConfigurationController.databases
+GET              /admin/configuration/home                       ConfigurationController.home
+GET              /admin/configuration/mapping                    ConfigurationController.mapping
+GET              /admin/configuration/reloadConfiguration        ConfigurationController.reloadConfiguration
+GET              /admin/configuration/resetAuthenticationTokens  ConfigurationController.resetAuthenticationTokens
+GET              /admin/configuration/users                      ConfigurationController.users
 
-# →→→ Generated mapping
+# ←←← Static mapping
+
+# →→→ Generated dynamic mapping
 
 @ACTIONS@
 
-# ←←← Generated mapping
+# ←←← Generated dynamic mapping
+
+
+
 
 
 

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 01/01: -mimprove static mapping

codelutin.com scm