Remove useless register implementation part 1 (DLUX Core)

With the update way of happending modules, the registration of
each individual module is no longer require. Started with the
dlux-core, the internal module will come later.

Change-Id: I7f918d55d3a9eb90b479d54df3b741f6ead4b1d3
Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>

diff --git a/modules/common-authentication-resources/src/main/resources/authentification/auth.module.js b/modules/common-authentication-resources/src/main/resources/authentification/auth.module.js
index ecbeea1499ee441d5bedc1fdcfa08256739d52ee..50be4dbf37b7f6b23b84bf799dc5f77f017c9889 100644 (file)
--- a/modules/common-authentication-resources/src/main/resources/authentification/auth.module.js
+++ b/modules/common-authentication-resources/src/main/resources/authentification/auth.module.js
@@ -9,15 +9,5 @@
 define(['angularAMD', 'common/config/env.module'], function(ng) {
   var auth = angular.module('app.common.auth', ['config']);
 
-  auth.config(function($compileProvider, $controllerProvider, $provide) {
-    auth.register = {
-      controller : $controllerProvider.register,
-      directive : $compileProvider.directive,
-      factory : $provide.factory,
-      service : $provide.service
-
-    };
-  });
-
   return auth;
 });

diff --git a/modules/common-general-resources/src/main/resources/general/common.general.filters.js b/modules/common-general-resources/src/main/resources/general/common.general.filters.js
index 3571e0ff8fde6dd6ac8847f5a6456e7b627ecf2c..519525c7d28eff020e6e99ee677241cf4994115c 100644 (file)
--- a/modules/common-general-resources/src/main/resources/general/common.general.filters.js
+++ b/modules/common-general-resources/src/main/resources/general/common.general.filters.js
@@ -1,7 +1,7 @@
 define(['common/general/common.general.module'], function(general) {
 
   // Filter to return only valid ports (like id != 0)
-  general.register.filter('noRootPorts', function () {
+  general.filter('noRootPorts', function () {
     return function (input) {
       if (!input) {
         return;

diff --git a/modules/common-general-resources/src/main/resources/general/common.general.module.js b/modules/common-general-resources/src/main/resources/general/common.general.module.js
index 75fa1642b0ef4a97afc95d8a7c50c4cd834c0fd8..68f7c68bef0352210489f7632b6088a444c931d2 100644 (file)
--- a/modules/common-general-resources/src/main/resources/general/common.general.module.js
+++ b/modules/common-general-resources/src/main/resources/general/common.general.module.js
@@ -1,15 +1,5 @@
 define(['angularAMD', 'Restangular', 'common/config/env.module'], function(ng) {
   var general = angular.module('app.common.general', ['restangular', 'config']);
 
-  general.config(function($controllerProvider, $compileProvider, $filterProvider, $provide) {
-    general.register = {
-      controller: $controllerProvider.register,
-      directive: $compileProvider.directive,
-      filter: $filterProvider.register,
-      factory: $provide.factory,
-      service: $provide.service
-    };
-  });
-
   return general;
 });

diff --git a/modules/common-general-resources/src/main/resources/general/common.navigation.module.js b/modules/common-general-resources/src/main/resources/general/common.navigation.module.js
index 8a16498a320775f30627745ce7ac8888f95d9aa0..0bd2e84869961f442283f800bc2485a7838b1882 100644 (file)
--- a/modules/common-general-resources/src/main/resources/general/common.navigation.module.js
+++ b/modules/common-general-resources/src/main/resources/general/common.navigation.module.js
@@ -2,13 +2,5 @@ define(['angularAMD'], function(ng) {
 
   var common_navigation = angular.module('app.common.navigation', []);
 
-  common_navigation.config(function($compileProvider, $provide) {
-    common_navigation.register = {
-      directive: $compileProvider.directive,
-      factory : $provide.factory
-    };
-  });
-
   return common_navigation;
 });
-

diff --git a/modules/common-layout-resources/src/main/resources/layout/layout.module.js b/modules/common-layout-resources/src/main/resources/layout/layout.module.js
index faef8bafe699ed8514237845351921ba7223731b..a12792e73766c6280a139d64d277ac39a1358b2c 100644 (file)
--- a/modules/common-layout-resources/src/main/resources/layout/layout.module.js
+++ b/modules/common-layout-resources/src/main/resources/layout/layout.module.js
@@ -3,7 +3,7 @@
 define(['angularAMD' ,'angular-ui-router', 'ocLazyLoad', 'common/general/common.general.directives', 'common/general/common.navigation.directives','app/core/core.services'], function(app) {
   var layout = angular.module('app.common.layout', ['ui.router.state', 'app.core', 'app.common.general', 'app.common.navigation']);
 
-  layout.config(function($stateProvider, $urlRouterProvider, $controllerProvider, $compileProvider, $provide, TopBarHelperProvider, NavHelperProvider, ContentHelperProvider) {
+  layout.config(function($stateProvider, $urlRouterProvider, TopBarHelperProvider, NavHelperProvider, ContentHelperProvider) {
     $urlRouterProvider.otherwise("/topology");
 
     $stateProvider.state('main', {
@@ -34,13 +34,6 @@ define(['angularAMD' ,'angular-ui-router', 'ocLazyLoad', 'common/general/common.
       }
     });
 
-    layout.register = {
-      controller: $controllerProvider.register,
-      directive: $compileProvider.directive,
-      factory : $provide.factory,
-      service : $provide.service
-    };
-
   });
 
   return layout;

diff --git a/modules/common-login-resources/src/main/resources/login/login.controller.js b/modules/common-login-resources/src/main/resources/login/login.controller.js
index 250d238010d8c8616b3ebb5fbe536f33d90d030a..750340d184b4faedb0b87a8e176837aa7238889a 100644 (file)
--- a/modules/common-login-resources/src/main/resources/login/login.controller.js
+++ b/modules/common-login-resources/src/main/resources/login/login.controller.js
@@ -8,7 +8,7 @@
 
 define(['common/login/login.module', 'common/authentification/auth.services'], function(login) {
 
-  login.register.controller('LoginCtrl', function ($scope, $http, $window, Auth, $location) {
+  login.controller('LoginCtrl', function ($scope, $http, $window, Auth, $location) {
         // default values
         $scope.login = {};
         $scope.login.username = "";
@@ -29,7 +29,7 @@ define(['common/login/login.module', 'common/authentification/auth.services'], f
         };
     });
 
-    login.register.controller('forgotPasswordCtrl', function ($scope, $http) {
+    login.controller('forgotPasswordCtrl', function ($scope, $http) {
         $scope.recover = {};
         $scope.recover.email = "";
         $scope.sendForgotPassword = function () {
@@ -45,7 +45,7 @@ define(['common/login/login.module', 'common/authentification/auth.services'], f
         };
     });
 
-   login.register.controller('registerCtrl', function ($scope, $http) {
+   login.controller('registerCtrl', function ($scope, $http) {
         $scope.register = {};
         $scope.register.email = "";
         $scope.register.username = "";

diff --git a/modules/common-login-resources/src/main/resources/login/login.module.js b/modules/common-login-resources/src/main/resources/login/login.module.js
index 06b65c17843e1e078f81d47e1f64087dec8cccf5..7819dce0bbca749d04420230b61d121832aa1fba 100644 (file)
--- a/modules/common-login-resources/src/main/resources/login/login.module.js
+++ b/modules/common-login-resources/src/main/resources/login/login.module.js
@@ -8,18 +8,8 @@
 
 define(['angularAMD', 'jquery', 'common/authentification/auth.services', 'ocLazyLoad'], function(ng, $) {
   var login = angular.module('app.common.login', ['app.common.auth', 'ui.router.state']);
-  login.register = login;
-
-  login.config(function($stateProvider, $compileProvider, $controllerProvider, $provide, $httpProvider) {
-
-    login.register = {
-      controller : $controllerProvider.register,
-      directive : $compileProvider.directive,
-      factory : $provide.factory,
-      service : $provide.service
-
-    };
 
+  login.config(function($stateProvider, $httpProvider) {
     $stateProvider
       .state('login', {
         url: '/login',

diff --git a/modules/common-navigation-resources/src/main/resources/navigation/navigation.controller.js b/modules/common-navigation-resources/src/main/resources/navigation/navigation.controller.js
index df94ab5592fb9149d3a381412bb1d396660d624d..057f4447a1e307b5a3a200df7138aefeee9f8ca4 100644 (file)
--- a/modules/common-navigation-resources/src/main/resources/navigation/navigation.controller.js
+++ b/modules/common-navigation-resources/src/main/resources/navigation/navigation.controller.js
@@ -1,9 +1,9 @@
 define(['common/navigation/navigation.module', 'app/core/core.services', 'common/navigation/navigation.services'], function(nav, services) {
-  nav.register.controller('NavCtrl', function($scope, NavHelper) {
+  nav.controller('NavCtrl', function($scope, NavHelper) {
     $scope.navList = NavHelper.getMenu();
   });
 
-  nav.register.controller('navItemCtrl', function($scope, NavHelper) {
+  nav.controller('navItemCtrl', function($scope, NavHelper) {
     $scope.display = 'none';
     $scope.isOpen = false;
 

diff --git a/modules/common-navigation-resources/src/main/resources/navigation/navigation.module.js b/modules/common-navigation-resources/src/main/resources/navigation/navigation.module.js
index 913f93e517c43199ebfcddd0928e29666605e8c7..ece1f42bfe9792e49a8358d107b6526240904301 100644 (file)
--- a/modules/common-navigation-resources/src/main/resources/navigation/navigation.module.js
+++ b/modules/common-navigation-resources/src/main/resources/navigation/navigation.module.js
@@ -1,20 +1,9 @@
 define(['angularAMD', 'app/core/core.module' ,'app/core/core.services','Restangular', 'common/config/env.module'], function (ng) {
   var nav = angular.module('app.common.nav', ['app.core','restangular', 'config']);
-  nav.register = nav;
-  nav.config( function($stateProvider, $controllerProvider,$compileProvider, $provide, NavHelperProvider) {
-
-    // use the register because the app is already bootstraped
-    nav.register = {
-      directive: $compileProvider.directive,
-      controller: $controllerProvider.register,
-      factory: $provide.factory,
-      service: $provide.service
-    };
 
+  nav.config( function($stateProvider, NavHelperProvider) {
     NavHelperProvider.addToView('src/common/navigation/navigation.tpl.html');
     NavHelperProvider.addControllerUrl('common/navigation/navigation.controller');
-
-
   });
 
   return nav;

diff --git a/modules/common-navigation-resources/src/main/resources/navigation/navigation.services.js b/modules/common-navigation-resources/src/main/resources/navigation/navigation.services.js
index 9df9aad349cf3d334665c3fcc9921caa91b71c5a..eb9bbd6efc925306e64624ec31e33d354e731a2a 100644 (file)
--- a/modules/common-navigation-resources/src/main/resources/navigation/navigation.services.js
+++ b/modules/common-navigation-resources/src/main/resources/navigation/navigation.services.js
@@ -1,9 +1,9 @@
 define(['common/navigation/navigation.module'], function(nav) {
 
-  nav.register.factory('MDSalRestangular', function(Restangular, ENV) {
-              return Restangular.withConfig(function(RestangularConfig) {
-                  RestangularConfig.setBaseUrl(ENV.getBaseURL("MD_SAL"));
-              });
-          });
+    nav.factory('MDSalRestangular', function(Restangular, ENV) {
+        return Restangular.withConfig(function(RestangularConfig) {
+            RestangularConfig.setBaseUrl(ENV.getBaseURL("MD_SAL"));
+        });
+    });
 
 });

diff --git a/modules/common-topbar-resources/src/main/resources/topbar/topbar.controller.js b/modules/common-topbar-resources/src/main/resources/topbar/topbar.controller.js
index 8a83baff640ef1efac648da01418413e3596c9ce..95ae0ee9cb9df864296fbe84e7d520f9dea21060 100644 (file)
--- a/modules/common-topbar-resources/src/main/resources/topbar/topbar.controller.js
+++ b/modules/common-topbar-resources/src/main/resources/topbar/topbar.controller.js
@@ -1,46 +1,44 @@
 define(['common/topbar/topbar.module'], function(topbar) {
 
-    topbar.register.controller('TopbarCtrl', function() {
+    topbar.controller('TopbarCtrl', function() {
         $('#toggleMenu').click(function(e) {
-          e.preventDefault();
-          $('#wrapper').toggleClass('toggled');
+            e.preventDefault();
+            $('#wrapper').toggleClass('toggled');
         });
     });
 
-    topbar.register.controller('topBarTasksCtrl',function ($scope, taskFactory) {
+    topbar.controller('topBarTasksCtrl', function($scope, taskFactory) {
         $scope.tasks = taskFactory.getTaskData();
     });
 
-    topbar.register.controller('topBarNotifsCtrl',function ($scope, notifsFactory) {
+    topbar.controller('topBarNotifsCtrl', function($scope, notifsFactory) {
         $scope.notifs = notifsFactory.getNotifsData();
-        $scope.isValid = function (value) {
+        $scope.isValid = function(value) {
             if (angular.isUndefined(value) || value === null) {
                 return false;
-            }
-            else {
+            } else {
                 return true;
             }
         };
     });
 
-    topbar.register.controller('topBarMessagesCtrl',function ($scope, messageFactory) {
+    topbar.controller('topBarMessagesCtrl', function($scope, messageFactory) {
         $scope.messages = messageFactory.getMessageData();
-        $scope.isValid = function (value) {
+        $scope.isValid = function(value) {
             if (angular.isUndefined(value) || value === null) {
                 return false;
-            }
-            else {
+            } else {
                 return true;
             }
         };
     });
 
     // the authorization module is not converted yet
-    topbar.register.controller('topBarUserMenuCtrl', function ($scope, $cookieStore, /* Auth,*/ $window) {
-        $scope.logOut = function () {
+    topbar.controller('topBarUserMenuCtrl', function($scope, $cookieStore, /* Auth,*/ $window) {
+        $scope.logOut = function() {
             /*Auth.logout(
             function(res) {
-                $window.location.href = 'login.html'; 
+                $window.location.href = 'login.html';
             });*/
 
         };

diff --git a/modules/common-topbar-resources/src/main/resources/topbar/topbar.directives.js b/modules/common-topbar-resources/src/main/resources/topbar/topbar.directives.js
index 6d2df52c16ffb1ce9937e1246cad2fce2ff5090b..e32e2e71e93a8da67aec13085b04c82d11f85e46 100644 (file)
--- a/modules/common-topbar-resources/src/main/resources/topbar/topbar.directives.js
+++ b/modules/common-topbar-resources/src/main/resources/topbar/topbar.directives.js
@@ -1,12 +1,12 @@
 define(['common/topbar/topbar.module'], function(topbar) {
-   topbar.register.directive('mcTopBar', function () {
+   topbar.directive('mcTopBar', function () {
         return {
             replace: true,
             templateUrl: 'topbar/topbar.tpl.html',
         };
     });
 
-    topbar.register.directive('mcTopBarTasks', function () {
+    topbar.directive('mcTopBarTasks', function () {
         return {
             replace: true,
             controller: 'topBarTasksCtrl',
@@ -14,7 +14,7 @@ define(['common/topbar/topbar.module'], function(topbar) {
         };
     });
 
-    topbar.register.directive('mcTopBarNotifications', function () {
+    topbar.directive('mcTopBarNotifications', function () {
         return {
             replace: true,
             controller: 'topBarNotifsCtrl',
@@ -22,7 +22,7 @@ define(['common/topbar/topbar.module'], function(topbar) {
         };
     });
 
-    topbar.register.directive('mcTopBarMessages', function () {
+    topbar.directive('mcTopBarMessages', function () {
         return {
             replace: true,
             controller: 'topBarMessagesCtrl',
@@ -30,11 +30,11 @@ define(['common/topbar/topbar.module'], function(topbar) {
         };
     });
 
-    topbar.register.directive('mcTopBarUserMenu', function () {
+    topbar.directive('mcTopBarUserMenu', function () {
         return {
             replace: true,
             controller: 'topBarUserMenuCtrl',
             templateUrl: 'topbar/user_menu.tpl.html'
         };
     });
-}); 
+});

diff --git a/modules/common-topbar-resources/src/main/resources/topbar/topbar.module.js b/modules/common-topbar-resources/src/main/resources/topbar/topbar.module.js
index fd7adc2168f31e7abbfba9ded2583c7f8942008a..5bb0ba92c7aadf2630a1a0bce6eb2d4a973ef23d 100644 (file)
--- a/modules/common-topbar-resources/src/main/resources/topbar/topbar.module.js
+++ b/modules/common-topbar-resources/src/main/resources/topbar/topbar.module.js
@@ -1,13 +1,7 @@
 define(['angularAMD', 'angular-cookies', 'app/core/core.services'], function(ng) {
   var topbar = angular.module('app.common.topbar', ['ngCookies', 'app.core']);
 
-  topbar.config(function($compileProvider, $controllerProvider, $provide, TopBarHelperProvider) {
-    topbar.register = {
-      controller : $controllerProvider.register,
-      directive : $compileProvider.directive,
-      factory : $provide.factory,
-      service : $provide.service
-    };
+  topbar.config(function($compileProvider, TopBarHelperProvider) {
 
     TopBarHelperProvider.addToView('src/common/topbar/topbar.tpl.html');
     TopBarHelperProvider.addControllerUrl('common/topbar/topbar.controller');

diff --git a/modules/common-topbar-resources/src/main/resources/topbar/topbar.services.js b/modules/common-topbar-resources/src/main/resources/topbar/topbar.services.js
index 9c49bcdb5d1008ebf3f13ac1aaeb1758d9198849..6a6ba8854ca4f2ac16d9e27165404f3b82dea5f4 100644 (file)
--- a/modules/common-topbar-resources/src/main/resources/topbar/topbar.services.js
+++ b/modules/common-topbar-resources/src/main/resources/topbar/topbar.services.js
@@ -1,5 +1,5 @@
 define(['common/topbar/topbar.module'], function(topbar) {
-    topbar.register.factory('taskFactory',function () {
+    topbar.factory('taskFactory',function () {
         var factory = {};
         factory.getTaskData = function () {
             return {
@@ -32,7 +32,7 @@ define(['common/topbar/topbar.module'], function(topbar) {
         return factory;
     });
 
-    topbar.register.factory('messageFactory', function () {
+    topbar.factory('messageFactory', function () {
         var factory = {};
         factory.getMessageData = function () {
             return {
@@ -62,7 +62,7 @@ define(['common/topbar/topbar.module'], function(topbar) {
         return factory;
     });
 
-    topbar.regiser.factory('notifsFactory', function () {
+    topbar.factory('notifsFactory', function () {
         var factory = {};
         factory.getNotifsData = function () {
             return {

diff --git a/modules/core-resources/src/main/resources/core/core.module.js b/modules/core-resources/src/main/resources/core/core.module.js
index ff27ad84131df729d4c6144b5573e7fdc6d2d167..9e4355ad0bb3194ec1abd28d22105dc89c851e34 100644 (file)
--- a/modules/core-resources/src/main/resources/core/core.module.js
+++ b/modules/core-resources/src/main/resources/core/core.module.js
@@ -1,15 +1,6 @@
 define(['angularAMD'], function() {
   var core = angular.module('app.core', []);
 
-  core.config(function($controllerProvider, $compileProvider, $provide) {
-    core.register = {
-      controller: $controllerProvider.register,
-      directive: $compileProvider.directive,
-      factory : $provide.factory,
-      service : $provide.service
-    };
-  });
-
   return core;
 
 });

diff --git a/modules/loader-resources/src/main/resources/app/app.module.js b/modules/loader-resources/src/main/resources/app/app.module.js
index 368bafcf2252bcd24a01bb88f5768fcecdbd0e02..ae13dca45bcad6634a26cab9e77a36f9e86f53e6 100644 (file)
--- a/modules/loader-resources/src/main/resources/app/app.module.js
+++ b/modules/loader-resources/src/main/resources/app/app.module.js
@@ -69,7 +69,7 @@ define(module, function(angular) {
   window.angular = dlux_angular; // backward compatibility
 
   // The overal config he is done here.
-  app.config(function ($urlRouterProvider,  $ocLazyLoadProvider, $translateProvider, $translatePartialLoaderProvider, $controllerProvider, $compileProvider, $provide, cssInjectorProvider) {
+  app.config(function ($urlRouterProvider,  $ocLazyLoadProvider, $translateProvider, $translatePartialLoaderProvider, $controllerProvider, $compileProvider, $provide, $filterProvider, cssInjectorProvider) {
 
     $urlRouterProvider.otherwise("/topology"); // set the default route
 
@@ -94,6 +94,7 @@ define(module, function(angular) {
         controller : $controllerProvider.register,
         directive : $compileProvider.directive,
         factory : $provide.factory,
+        filter: $filterProvider.register,
         service : $provide.service
     };
 
@@ -101,7 +102,7 @@ define(module, function(angular) {
     angular.extend(app.register, register);
   });
 
-  /* --- define vs require war --- 
+  /* --- define vs require war ---
    * From my understanding, we use require when
    * we want to load a dependency and run it. Define
    * is only to define the dependency for a module.