Remove useless register implementation part 2 (DLUX internal Modules)

Part two of the removal of register call in each module. This
part contain the modification for each internal module except
YangUI and YangVisualizer. Waiting for unit-test to be fix
before changing them.

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

diff --git a/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigma.directive.js b/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigma.directive.js
index 8ec6104b23b7ae09f52d8245bd03348963d60105..80c53d2bc85b347a1b1dff650877c4d34fc6396f 100644 (file)
--- a/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigma.directive.js
+++ b/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigma.directive.js
@@ -1,14 +1,14 @@
 var modules = [\r
   'common/sigmatopology/sigmatopology.module',\r
-  'sigma', \r
-  'sigma-parsers-gexf', \r
-  'sigma-forceAtlas2', \r
+  'sigma',\r
+  'sigma-parsers-gexf',\r
+  'sigma-forceAtlas2',\r
   'sigma-dragNodes',\r
   'sigma-customShapes'\r
 ];\r
 \r
 define(modules, function(topologyModule) {\r
-  topologyModule.register.directive('sigmaTopology', ['$timeout',function($timeout) {\r
+  topologyModule.directive('sigmaTopology', ['$timeout',function($timeout) {\r
     // constants\r
     return {\r
       restrict: 'E',\r
@@ -184,7 +184,6 @@ define(modules, function(topologyModule) {
               }\r
 \r
           });\r
-\r
       }\r
     };\r
   }]);\r

diff --git a/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigmatopology.module.js b/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigmatopology.module.js
index d6c303c76ec905d1ade2c75a4f9646bc8e247aef..aa7e590ba5f214c1768bc007cdacc511dd7d4a13 100644 (file)
--- a/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigmatopology.module.js
+++ b/modules/common-sigmatopology-resources/src/main/resources/sigmatopology/sigmatopology.module.js
@@ -1,16 +1,5 @@
 define(['angularAMD', 'Restangular', 'common/config/env.module'], function(ng) {
   var topology = angular.module('app.common.sigmatopology', ['restangular', 'config']);
-  topology.register = topology; // for unit testing (temporary)
-
-  topology.config(function($controllerProvider, $compileProvider, $filterProvider, $provide) {
-    topology.register = {
-      controller: $controllerProvider.register,
-      directive: $compileProvider.directive,
-      filter: $filterProvider.register,
-      factory: $provide.factory,
-      service: $provide.service
-    };
-  });
 
   return topology;
 });

diff --git a/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.controller.js b/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.controller.js
index f7a35d288c5dfdf403aae4b233abd96083ecc1d0..d5128fdd6b955bd589b5ba2fd2b5f158a670f44e 100644 (file)
--- a/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.controller.js
+++ b/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.controller.js
@@ -1,17 +1,17 @@
 define (['app/connection_manager/connection_manager.module', 'app/connection_manager/connection_manager.services'], function(connection_manager) {
 
-  connection_manager.register.controller('rootConnectionManagerCtrl', ['$rootScope', function($rootScope) {
+  connection_manager.controller('rootConnectionManagerCtrl', ['$rootScope', function($rootScope) {
     $rootScope['section_logo'] = 'logo_connection_manager';
   }]);
 
-  connection_manager.register.controller('ConnectionManagerCtrl',  ['$scope', 'ConnectionManagerSvc', function ($scope, ConnectionManagerSvc) {
+  connection_manager.controller('ConnectionManagerCtrl',  ['$scope', 'ConnectionManagerSvc', function ($scope, ConnectionManagerSvc) {
     $scope.svc = ConnectionManagerSvc;
     ConnectionManagerSvc.getAll(null).then(function(data) {
       $scope.data = data[0];
     });
   }]);
 
-  connection_manager.register.controller('ConnectionManagerDiscoveryCtrl', ['$scope', 'ConnectionManagerSvc', '$state', function ($scope, ConnectionManagerSvc, $state) {
+  connection_manager.controller('ConnectionManagerDiscoveryCtrl', ['$scope', 'ConnectionManagerSvc', '$state', function ($scope, ConnectionManagerSvc, $state) {
     $scope.nodePort = 6633;
     $scope.doDiscover = function () {
       ConnectionManagerSvc.discover($scope.nodeId, $scope.nodeAddress, $scope.nodePort).then(

diff --git a/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.module.js b/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.module.js
index cff272a41a7db211eacc7ee199eb84b0221f57f8..e6453de00bfa25d1673ee631a194a1d442f3feda 100644 (file)
--- a/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.module.js
+++ b/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.module.js
@@ -2,13 +2,7 @@ define(['angularAMD', 'app/routingConfig', 'app/core/core.services', 'Restangula
 
   var connection_manager = angular.module('app.connection_manager', ['app.core', 'ui.router.state', 'restangular', 'config' ]);
 
-  connection_manager.config(function ($stateProvider, $controllerProvider, $provide, $translateProvider, NavHelperProvider) {
-
-    connection_manager.register = {
-      controller : $controllerProvider.register,
-      factory : $provide.factory,
-      service : $provide.service
-    };
+  connection_manager.config(function ($stateProvider, $translateProvider, NavHelperProvider) {
 
     $translateProvider.useStaticFilesLoader({
       prefix: 'assets/data/locale-',

diff --git a/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.services.js b/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.services.js
index d0bb6f20423786b52eb8c2653be59fc54b2ff71f..3fce9cf8cfa68a20aee44d044ff20ba1277624a1 100644 (file)
--- a/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.services.js
+++ b/modules/connection_manager-resources/src/main/resources/connection_manager/connection_manager.services.js
@@ -1,12 +1,12 @@
 define(['app/connection_manager/connection_manager.module'], function(connection_manager) {
 
-  connection_manager.register.factory('ConnectionManagerRestangular', function(Restangular, ENV) {
+  connection_manager.factory('ConnectionManagerRestangular', function(Restangular, ENV) {
     return Restangular.withConfig(function(RestangularConfig) {
       RestangularConfig.setBaseUrl(ENV.getBaseURL("AD_SAL"));
     });
   });
 
-  connection_manager.register.factory('ConnectionManagerSvc', function (ConnectionManagerRestangular) {
+  connection_manager.factory('ConnectionManagerSvc', function (ConnectionManagerRestangular) {
     var svc = {
       base: function() {
         return ConnectionManagerRestangular.one('controller/nb/v2');

diff --git a/modules/container-resources/src/main/resources/container/container.controller.js b/modules/container-resources/src/main/resources/container/container.controller.js
index d8ec1f7c9f13d5565dda7461b1e32c74c1d70d90..59d8c97fec09dc19044402ecf8445d9ca7d13edc 100644 (file)
--- a/modules/container-resources/src/main/resources/container/container.controller.js
+++ b/modules/container-resources/src/main/resources/container/container.controller.js
@@ -1,13 +1,13 @@
 define(['app/container/container.module', 'jquery', 'footable', 'app/container/container.services', 'common/general/common.general.filters'], function(container, $) {
 
-  container.register.controller('rootContainerCtrl', ['$rootScope', '$scope', function($rootScope, $scope) {
+  container.controller('rootContainerCtrl', ['$rootScope', '$scope', function($rootScope, $scope) {
     $rootScope['section_logo'] = 'logo_container';
     $scope.getText = function(text) { // firefox use textContent while chrome use innerText.
       return text.innerText||text.textContent;
     };
   }]);
 
-  container.register.controller('ViewContainerCtrl', ['$scope', 'ContainerSvc', function ($scope, ContainerSvc) {
+  container.controller('ViewContainerCtrl', ['$scope', 'ContainerSvc', function ($scope, ContainerSvc) {
     $scope.svc = ContainerSvc;
     ContainerSvc.getAll().then(function(data) {
       $scope.data = data[0];
@@ -26,7 +26,7 @@ define(['app/container/container.module', 'jquery', 'footable', 'app/container/c
       });
   }]);
 
-  container.register.controller('ViewDetailContainerCtrl', ['$scope', 'ContainerSvc', '$stateParams', function ($scope, ContainerSvc, $stateParams) {
+  container.controller('ViewDetailContainerCtrl', ['$scope', 'ContainerSvc', '$stateParams', function ($scope, ContainerSvc, $stateParams) {
     ContainerSvc.containerUrl($stateParams.container).get().then(
       function (data) {
         $scope.data = data;
@@ -36,7 +36,7 @@ define(['app/container/container.module', 'jquery', 'footable', 'app/container/c
     );
   }]);
 
-  container.register.controller('EditContainerCtrl', ['$scope', 'ContainerSvc', '$stateParams', 'SwitchSvc', function ($scope, ContainerSvc, $stateParams, SwitchSvc) {
+  container.controller('EditContainerCtrl', ['$scope', 'ContainerSvc', '$stateParams', 'SwitchSvc', function ($scope, ContainerSvc, $stateParams, SwitchSvc) {
     $scope.submit = function () {
       ContainerSvc.containerUrl($stateParams.container).customPOST($scope.data).then(
         function () {
@@ -86,7 +86,7 @@ define(['app/container/container.module', 'jquery', 'footable', 'app/container/c
     });
   }]);
 
-  container.register.controller('CreateContainerCtrl', ['$scope', 'ContainerSvc', 'SwitchSvc' , '$state', function ($scope, ContainerSvc, SwitchSvc, $state) {
+  container.controller('CreateContainerCtrl', ['$scope', 'ContainerSvc', 'SwitchSvc' , '$state', function ($scope, ContainerSvc, SwitchSvc, $state) {
     // Build the request
     $scope.data = {};
 

diff --git a/modules/container-resources/src/main/resources/container/container.module.js b/modules/container-resources/src/main/resources/container/container.module.js
index f9813ab197675418258a5940c125deca0a487efd..2915d932f13ee8a7d715282f04a3cc7a7c9b0875 100644 (file)
--- a/modules/container-resources/src/main/resources/container/container.module.js
+++ b/modules/container-resources/src/main/resources/container/container.module.js
@@ -1,12 +1,7 @@
 define(['angularAMD', 'app/routingConfig','app/core/core.services', 'common/general/common.general.services', 'common/config/env.module'], function(ng) {
   var container = angular.module('app.container', ['app.core', 'app.common.general','ui.router.state', 'restangular', 'config']);
 
-  container.config(function ($stateProvider, $controllerProvider, $provide, $translateProvider, NavHelperProvider) {
-
-    container.register = {
-      controller : $controllerProvider.register,
-      factory : $provide.factory
-    };
+  container.config(function ($stateProvider, $translateProvider, NavHelperProvider) {
 
     $translateProvider.useStaticFilesLoader({
       prefix: 'assets/data/locale-',

diff --git a/modules/container-resources/src/main/resources/container/container.services.js b/modules/container-resources/src/main/resources/container/container.services.js
index 303ddebfa79db478bcf7e6c911e710d8627f4a1d..7758a8458647bcd0fea29de77e36abddb2942683 100644 (file)
--- a/modules/container-resources/src/main/resources/container/container.services.js
+++ b/modules/container-resources/src/main/resources/container/container.services.js
@@ -1,14 +1,14 @@
 define(['app/container/container.module', 'Restangular'], function(container) {
 
 
-  container.register.factory('ContainerRestangular', function(Restangular, ENV) {
+  container.factory('ContainerRestangular', function(Restangular, ENV) {
     return Restangular.withConfig(function(RestangularConfig) {
       RestangularConfig.setBaseUrl(ENV.getBaseURL("AD_SAL"));
     });
   });
 
 
-  container.register.factory('ContainerSvc', function(ContainerRestangular) {
+  container.factory('ContainerSvc', function(ContainerRestangular) {
     var svc = {
       base: function() {
         return ContainerRestangular.one('controller/nb/v2').one('containermanager');

diff --git a/modules/flow-resources/src/main/resources/flow/flows.controller.js b/modules/flow-resources/src/main/resources/flow/flows.controller.js
index abc5e2b4a3ea83deaed80e6216e32179775ac187..a2dcb4532274a4af0d006940d421b5ee7f293034 100644 (file)
--- a/modules/flow-resources/src/main/resources/flow/flows.controller.js
+++ b/modules/flow-resources/src/main/resources/flow/flows.controller.js
@@ -1,13 +1,13 @@
 define(['app/flow/flows.module', 'jquery', 'footable', 'app/flow/flows.services', 'common/general/common.general.filters'], function(flows, $) {
 
-  flows.register.controller('rootFlowCtrl', function($rootScope, $scope) {
+  flows.controller('rootFlowCtrl', function($rootScope, $scope) {
     $rootScope['section_logo'] = 'logo_flow';
     $scope.getText = function(text) { // firefox use textContent while chrome use innerText...
       return text.innerText||text.textContent;
     };
   });
 
-  flows.register.controller('ListAllFlowCtrl',  ['$scope', 'FlowSvc', function ($scope, FlowSvc) {
+  flows.controller('ListAllFlowCtrl',  ['$scope', 'FlowSvc', function ($scope, FlowSvc) {
 
     $scope.svc = FlowSvc;
     FlowSvc.getAll(null).then(function(data) {
@@ -31,7 +31,7 @@ define(['app/flow/flows.module', 'jquery', 'footable', 'app/flow/flows.services'
       });
   }]);
 
-  flows.register.controller('ListNodeFlowCtrl', ['$scope', 'FlowSvc', function ($scope, FlowSvc) {
+  flows.controller('ListNodeFlowCtrl', ['$scope', 'FlowSvc', function ($scope, FlowSvc) {
     FlowSvc.nodeflowUrl(null, $scope.$stateParams.nodeType, $scope.$stateParams.nodeId).getList().then(
       function (data) {
         $scope.flow = data.flowConfig;
@@ -39,7 +39,7 @@ define(['app/flow/flows.module', 'jquery', 'footable', 'app/flow/flows.services'
     );
   }]);
 
-  flows.register.controller('ShowDetailCtrl', ['$scope', 'FlowSvc', '$stateParams', function ($scope, FlowSvc, $stateParams) {
+  flows.controller('ShowDetailCtrl', ['$scope', 'FlowSvc', '$stateParams', function ($scope, FlowSvc, $stateParams) {
 
     FlowSvc.staticFlowUrl(null, $stateParams.nodeType, $stateParams.nodeId, $stateParams.flowName).get().then(
       function (data) {
@@ -49,7 +49,7 @@ define(['app/flow/flows.module', 'jquery', 'footable', 'app/flow/flows.services'
 
   }]);
 
-  flows.register.controller('EditStateCtrl', ['$scope', 'FlowSvc', '$stateParams', 'SwitchSvc', function ($scope, FlowSvc, $stateParams, SwitchSvc) {
+  flows.controller('EditStateCtrl', ['$scope', 'FlowSvc', '$stateParams', 'SwitchSvc', function ($scope, FlowSvc, $stateParams, SwitchSvc) {
 
             $scope.actionActive = []; //erase the data (does a prevent default behavior)
   $scope.chosedOptions = []; // use for everything
@@ -153,7 +153,7 @@ define(['app/flow/flows.module', 'jquery', 'footable', 'app/flow/flows.services'
   }]);
 
 
-  flows.register.controller('FlowCreateCtrl', function ($scope, $http, FlowSvc, SwitchSvc, $state) {
+  flows.controller('FlowCreateCtrl', function ($scope, $http, FlowSvc, SwitchSvc, $state) {
     // The current flow
     $scope.flow = {installInHw: true};
     // These are the available actions

diff --git a/modules/flow-resources/src/main/resources/flow/flows.module.js b/modules/flow-resources/src/main/resources/flow/flows.module.js
index a7592e32e346e92c78b551b1faba24e14b9ebb94..0a0a94209e96dd05bf02497e3471849b1c13094f 100644 (file)
--- a/modules/flow-resources/src/main/resources/flow/flows.module.js
+++ b/modules/flow-resources/src/main/resources/flow/flows.module.js
@@ -2,13 +2,7 @@ define(['angularAMD', 'Restangular', 'app/routingConfig', 'common/general/finish
     'common/general/common.general.services', 'common/config/env.module'], function (ng) {
   var flows = angular.module('app.flows', ['ui.router.state', 'app.core', 'restangular', 'app.common.finishRender','app.common.general', 'config']);
 
-  flows.config(function($controllerProvider, $compileProvider, $provide, $stateProvider, $translateProvider, NavHelperProvider) {
-    flows.register = {
-      controller : $controllerProvider.register,
-      directive : $compileProvider.directive,
-      service : $provide.service,
-      factory : $provide.factory
-    };
+  flows.config(function($stateProvider, $translateProvider, NavHelperProvider) {
 
     $translateProvider.useStaticFilesLoader({
       prefix: 'assets/data/locale-',

diff --git a/modules/flow-resources/src/main/resources/flow/flows.services.js b/modules/flow-resources/src/main/resources/flow/flows.services.js
index 47ef68cac5c467ccaaceb99a798688908d817e32..75f358725d5cf94d38eb552f8a3d76eee671d9a5 100644 (file)
--- a/modules/flow-resources/src/main/resources/flow/flows.services.js
+++ b/modules/flow-resources/src/main/resources/flow/flows.services.js
@@ -1,12 +1,12 @@
 define(['app/flow/flows.module'], function(flows) {
 
-  flows.register.factory('FlowRestangular', function(Restangular, ENV) {
+  flows.factory('FlowRestangular', function(Restangular, ENV) {
     return Restangular.withConfig(function(RestangularConfig) {
       RestangularConfig.setBaseUrl(ENV.getBaseURL("AD_SAL"));
     });
   });
 
-  flows.register.factory('FlowSvc', function (FlowRestangular) {
+  flows.factory('FlowSvc', function (FlowRestangular) {
     var svc = {
       base: function (container) {
         container = container || 'default';

diff --git a/modules/network-resources/src/main/resources/network/network.controller.js b/modules/network-resources/src/main/resources/network/network.controller.js
index e5f1f9e5e1b073bb277e68928c7cd0b12829d496..ea1ed01c95f0735a3b6a94146f822837f5a63506 100644 (file)
--- a/modules/network-resources/src/main/resources/network/network.controller.js
+++ b/modules/network-resources/src/main/resources/network/network.controller.js
@@ -1,6 +1,6 @@
 define(['app/network/network.module', 'jquery', 'footable', 'app/network/network.services'], function(network, $) {
 
-  network.register.controller('NetworkCtrl', function($rootScope, $scope, $state) {
+  network.controller('NetworkCtrl', function($rootScope, $scope, $state) {
     $rootScope['section_logo'] = 'logo_network';
     $scope.isState = function(name) {
       return $state.includes(name);
@@ -11,7 +11,7 @@ define(['app/network/network.module', 'jquery', 'footable', 'app/network/network
   });
 
 
-  network.register.controller('StaticRouteCtrl', ['$scope', 'StaticRouteSvc', function ($scope, StaticRouteSvc) {
+  network.controller('StaticRouteCtrl', ['$scope', 'StaticRouteSvc', function ($scope, StaticRouteSvc) {
     StaticRouteSvc.routesUrl(null).getList().then(
       function (data) {
         $scope.data = data;
@@ -33,7 +33,7 @@ define(['app/network/network.module', 'jquery', 'footable', 'app/network/network
 
   }]);
 
-  network.register.controller('StaticRouteCreateCtrl', ['$scope', 'StaticRouteSvc', '$state', function ($scope, StaticRouteSvc, $state) {
+  network.controller('StaticRouteCreateCtrl', ['$scope', 'StaticRouteSvc', '$state', function ($scope, StaticRouteSvc, $state) {
     $scope.submit = function () {
        StaticRouteSvc.routeUrl(null, $scope.data.name).customPUT($scope.data).then(
         function (data) {
@@ -45,7 +45,7 @@ define(['app/network/network.module', 'jquery', 'footable', 'app/network/network
     };
   }]);
 
-  network.register.controller('StaticRouteEditCtrl', ['$scope', 'StaticRouteSvc', '$state', '$stateParams', function ($scope, StaticRouteSvc, $state, $stateParams) {
+  network.controller('StaticRouteEditCtrl', ['$scope', 'StaticRouteSvc', '$state', '$stateParams', function ($scope, StaticRouteSvc, $state, $stateParams) {
     $scope.submit = function () {
       console.log(StaticRouteSvc.routeUrl(null, $scope.data.name));
       StaticRouteSvc.routeUrl(null, $scope.data.name).customPOST($scope.data).then(
@@ -63,7 +63,7 @@ define(['app/network/network.module', 'jquery', 'footable', 'app/network/network
     );
   }]);
 
-  network.register.controller('SubnetCtrl', ['$scope', 'SubnetSvc', function ($scope, SubnetSvc) {
+  network.controller('SubnetCtrl', ['$scope', 'SubnetSvc', function ($scope, SubnetSvc) {
     SubnetSvc.subnetsUrl(null).getList().then(
       function (data) {
         $scope.data = data;
@@ -83,7 +83,7 @@ define(['app/network/network.module', 'jquery', 'footable', 'app/network/network
     });
   }]);
 
- network.register.controller('SubnetCreateCtrl', ['$scope', 'SubnetSvc', '$state', function ($scope, SubnetSvc, $state) {
+ network.controller('SubnetCreateCtrl', ['$scope', 'SubnetSvc', '$state', function ($scope, SubnetSvc, $state) {
     $scope.submit = function () {
       SubnetSvc.subnetUrl(null, $scope.data.name).customPUT($scope.data).then(
         function(data) {
@@ -95,7 +95,7 @@ define(['app/network/network.module', 'jquery', 'footable', 'app/network/network
     };
   }]);
 
-  network.register.controller('SubnetEditCtrl', ['$scope', 'SubnetSvc', '$state', '$stateParams', function ($scope, SubnetSvc, $state, $stateParams) {
+  network.controller('SubnetEditCtrl', ['$scope', 'SubnetSvc', '$state', '$stateParams', function ($scope, SubnetSvc, $state, $stateParams) {
     SubnetSvc.subnetUrl(null, $stateParams.name).get().then(
       function(data) {
         $scope.data = data;

diff --git a/modules/network-resources/src/main/resources/network/network.module.js b/modules/network-resources/src/main/resources/network/network.module.js
index aec5842278c23dc8809f6988863f1c1c8fdaf512..50c2b54df549e41677ae7e3531caa0655b679814 100644 (file)
--- a/modules/network-resources/src/main/resources/network/network.module.js
+++ b/modules/network-resources/src/main/resources/network/network.module.js
@@ -1,19 +1,13 @@
 define(['angularAMD', 'app/routingConfig', 'app/core/core.services', 'Restangular', 'common/config/env.module'], function(ng) {
   var network = angular.module('app.networking', ['ui.router.state','app.core','restangular', 'config']);
 
-  network.config(function ($stateProvider, $controllerProvider, $provide, $translateProvider, NavHelperProvider) {
+  network.config(function ($stateProvider, $translateProvider, NavHelperProvider) {
 
     $translateProvider.useStaticFilesLoader({
       prefix: 'assets/data/locale-',
       suffix: '.json'
     });
 
-    network.register = {
-      controller : $controllerProvider.register,
-      factory : $provide.factory,
-      service : $provide.service
-    };
-
     NavHelperProvider.addControllerUrl('app/network/network.controller');
     NavHelperProvider.addToMenu('network', {
       "link": "#/network/staticroute",

diff --git a/modules/network-resources/src/main/resources/network/network.services.js b/modules/network-resources/src/main/resources/network/network.services.js
index 486a6100b89c982ca5f7e2fa566d098a98681add..2b41b000ed61eef023ae18596d3ffa508ee1a045 100644 (file)
--- a/modules/network-resources/src/main/resources/network/network.services.js
+++ b/modules/network-resources/src/main/resources/network/network.services.js
@@ -1,13 +1,13 @@
 define(['app/network/network.module'], function(network) {
 
-  network.register.factory('NetworkRestangular', function(Restangular, ENV) {
+  network.factory('NetworkRestangular', function(Restangular, ENV) {
     return Restangular.withConfig(function(RestangularConfig) {
       RestangularConfig.setBaseUrl(ENV.getBaseURL("AD_SAL"));
     });
   });
 
 
-  network.register.factory('StaticRouteSvc', function (NetworkRestangular) {
+  network.factory('StaticRouteSvc', function (NetworkRestangular) {
     var svc = {
       base: function (container) {
         container = container || 'default';
@@ -31,7 +31,7 @@ define(['app/network/network.module'], function(network) {
   });
 
 
-  network.register.factory('SubnetSvc', function (NetworkRestangular) {
+  network.factory('SubnetSvc', function (NetworkRestangular) {
     var svc = {
       base: function (container) {
         container = container || 'default';

diff --git a/modules/node-resources/src/main/resources/node/nodes.controller.js b/modules/node-resources/src/main/resources/node/nodes.controller.js
index e86397122d6886980ecf0bd7e3b20e59bc1d5c5e..5716289ffbc09bb1144c1fc8abbd5617ddca82fa 100644 (file)
--- a/modules/node-resources/src/main/resources/node/nodes.controller.js
+++ b/modules/node-resources/src/main/resources/node/nodes.controller.js
@@ -8,12 +8,12 @@
 \r
 define(['app/node/nodes.module','app/node/nodes.services'], function(node) {\r
 \r
-  node.register.controller('rootNodeCtrl', function($rootScope) {\r
+  node.controller('rootNodeCtrl', function($rootScope) {\r
     $rootScope['section_logo'] = 'assets/images/logo_node.gif';\r
    // $rootScope.$apply();\r
   });\r
 \r
-  node.register.controller('allNodesCtrl', function($scope, NodeInventorySvc, $timeout) {\r
+  node.controller('allNodesCtrl', function($scope, NodeInventorySvc, $timeout) {\r
     NodeInventorySvc.getAllNodes().then(function(data) {\r
       $scope.data = data[0].node;\r
     });\r
@@ -35,7 +35,7 @@ define(['app/node/nodes.module','app/node/nodes.services'], function(node) {
     });\r
   });\r
 \r
-  node.register.controller('nodeConnectorCtrl', function($scope, $stateParams, NodeInventorySvc, $timeout, nodeConnectorFactory) {\r
+  node.controller('nodeConnectorCtrl', function($scope, $stateParams, NodeInventorySvc, $timeout, nodeConnectorFactory) {\r
     var currentData = NodeInventorySvc.getCurrentData();\r
     if(currentData != null) {\r
       currentData.then(function(data) {\r

diff --git a/modules/node-resources/src/main/resources/node/nodes.module.js b/modules/node-resources/src/main/resources/node/nodes.module.js
index b51141f36f9317b4149b5419cd6d9744da496647..00d583fb4fa07943baa04acb621418c6511bcc83 100644 (file)
--- a/modules/node-resources/src/main/resources/node/nodes.module.js
+++ b/modules/node-resources/src/main/resources/node/nodes.module.js
@@ -8,16 +8,8 @@
 \r
 define(['angularAMD', 'app/routingConfig', 'Restangular', 'angular-translate', 'angular-translate-loader-static-files', 'app/core/core.services', 'common/config/env.module'], function(ng) {\r
   var nodes = angular.module('app.nodes', ['app.core', 'pascalprecht.translate', 'ui.router.state', 'restangular', 'config']);\r
-  nodes.register = nodes;// for unit test\r
 \r
-  nodes.config(function($stateProvider, $compileProvider, $controllerProvider, $provide, NavHelperProvider, $translateProvider) {\r
-    nodes.register = {\r
-      controller : $controllerProvider.register,\r
-      directive : $compileProvider.directive,\r
-      factory : $provide.factory,\r
-      service : $provide.service\r
-\r
-    };\r
+  nodes.config(function($stateProvider, NavHelperProvider, $translateProvider) {\r
 \r
     NavHelperProvider.addControllerUrl('app/node/nodes.controller');\r
     NavHelperProvider.addToMenu('nodes', {\r

diff --git a/modules/node-resources/src/main/resources/node/nodes.services.js b/modules/node-resources/src/main/resources/node/nodes.services.js
index f0441ca16968144ab8383777a31bd487d6d3d378..1aea2783e1c6fda98a4e5db6a905422cd0e6333d 100644 (file)
--- a/modules/node-resources/src/main/resources/node/nodes.services.js
+++ b/modules/node-resources/src/main/resources/node/nodes.services.js
@@ -8,7 +8,7 @@
 \r
 define(['app/node/nodes.module'],function(node) {\r
 \r
-  node.register.factory('nodeConnectorFactory', function() {\r
+  node.factory('nodeConnectorFactory', function() {\r
     var factory = {};\r
 \r
     factory.getActiveFlow = function(flowTable, index) {\r
@@ -20,13 +20,13 @@ define(['app/node/nodes.module'],function(node) {
     return factory;\r
   });\r
 \r
-  node.register.factory('NodeRestangular', function(Restangular, ENV) {\r
+  node.factory('NodeRestangular', function(Restangular, ENV) {\r
     return Restangular.withConfig(function(RestangularConfig) {\r
       RestangularConfig.setBaseUrl(ENV.getBaseURL("MD_SAL"));\r
     });\r
   });\r
 \r
-  node.register.factory('NodeInventorySvc', function(NodeRestangular) {\r
+  node.factory('NodeInventorySvc', function(NodeRestangular) {\r
     var svc = {\r
       base: function() {\r
         return NodeRestangular.one('restconf').one('operational').one('opendaylight-inventory:nodes');\r

diff --git a/modules/topology-resources/src/main/resources/topology/topology.controller.js b/modules/topology-resources/src/main/resources/topology/topology.controller.js
index 3d66d5addeb4d08a84f672403357009f3a5dd7b3..c1b38a17ffd85b9f5efca2c2f85f23059d13de0e 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.controller.js
+++ b/modules/topology-resources/src/main/resources/topology/topology.controller.js
@@ -1,6 +1,6 @@
 define(['app/topology/topology.module','app/topology/topology.services', 'app/topology/topology.directives'], function(topology, service) {
 
-  topology.register.controller('TopologyCtrl', ['$scope', '$rootScope', 'NetworkTopologySvc' ,  function ($scope, $rootScope, NetworkTopologySvc) {
+  topology.controller('TopologyCtrl', ['$scope', '$rootScope', 'NetworkTopologySvc' ,  function ($scope, $rootScope, NetworkTopologySvc) {
     $rootScope['section_logo'] = 'assets/images/logo_topology.gif';
     var graphRenderer = null;
     $scope.createTopology = function() {

diff --git a/modules/topology-resources/src/main/resources/topology/topology.directives.js b/modules/topology-resources/src/main/resources/topology/topology.directives.js
index 3d223e4cf50b9e0b4eb08eaeb5665e0b70401d93..af204f9a8ac5a7341a497041136adce7c1282971 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.directives.js
+++ b/modules/topology-resources/src/main/resources/topology/topology.directives.js
@@ -1,6 +1,6 @@
 define(['app/topology/topology.module', 'vis'], function(topology, vis) {
 
-  topology.register.directive('topologySimple', function() {
+  topology.directive('topologySimple', function() {
     // constants
     var width = 800,
       height = 800;

diff --git a/modules/topology-resources/src/main/resources/topology/topology.module.js b/modules/topology-resources/src/main/resources/topology/topology.module.js
index 5eb1ed93dd32ad4514b1360e51b4de362e6cbc2d..59a1635db392a87ff933002b16972299d654c9e2 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.module.js
+++ b/modules/topology-resources/src/main/resources/topology/topology.module.js
@@ -2,14 +2,7 @@ define(['angularAMD', 'app/routingConfig', 'app/core/core.services','Restangular
 
   var topology = angular.module('app.topology', ['ui.router.state','app.core','restangular', 'config']);
 
-  topology.config(function($stateProvider, $controllerProvider, $compileProvider, $provide, $translateProvider, NavHelperProvider) {
-
-    topology.register = {
-      controller : $controllerProvider.register,
-      directive : $compileProvider.directive,
-      service : $provide.service,
-      factory : $provide.factory
-    };
+  topology.config(function($stateProvider, $translateProvider, NavHelperProvider) {
 
     NavHelperProvider.addControllerUrl('app/topology/topology.controller');
     NavHelperProvider.addToMenu('topology', {

diff --git a/modules/topology-resources/src/main/resources/topology/topology.services.js b/modules/topology-resources/src/main/resources/topology/topology.services.js
index 5d56f9ac55605d9a822909aa0aaddb1389292b66..717e7d10a937c06c5d17cfe37425f8eca755ccd2 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.services.js
+++ b/modules/topology-resources/src/main/resources/topology/topology.services.js
@@ -1,12 +1,12 @@
 define(['app/topology/topology.module'], function(topology) {
 
-  topology.register.factory('TopologyRestangular', function(Restangular, ENV) {
+  topology.factory('TopologyRestangular', function(Restangular, ENV) {
     return Restangular.withConfig(function(RestangularConfig) {
       RestangularConfig.setBaseUrl(ENV.getBaseURL("MD_SAL"));
     });
   });
 
-  topology.register.factory('NetworkTopologySvc', function(TopologyRestangular) {
+  topology.factory('NetworkTopologySvc', function(TopologyRestangular) {
       var svc = {
           base: function() {
               return TopologyRestangular.one('restconf').one('operational').one('network-topology:network-topology');