From e2aefda183de4f1c1256d97f7ce09f8bee5477db Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Tue, 9 May 2017 14:24:20 -0400 Subject: [ONAP-rebase] Rebase as 1.1.0-SNAPSHOT Consolidate into a single maven project; no more separate model and client jars. Change-Id: Ibbba982250b74c0dfd09ee1c65c0fb6c158dd632 Signed-off-by: Christopher Lott Signed-off-by: Christopher Lott (cl778h) --- .../webapp/app/dbcapp/home/dbc-home-controller.js | 66 ---------- .../webapp/app/dbcapp/home/dbc-spa-controller.js | 50 -------- .../src/main/webapp/app/dbcapp/home/dbc-style.css | 77 ------------ .../main/webapp/app/dbcapp/home/dbc-yn-filter.js | 26 ---- .../main/webapp/app/dbcapp/home/dbc_home_body.html | 51 -------- .../app/dbcapp/home/dbc_popup_templates.html | 73 ----------- .../src/main/webapp/app/dbcapp/home/dbc_spa.html | 139 --------------------- .../webapp/app/dbcapp/home/manifest-service.js | 43 ------- 8 files changed, 525 deletions(-) delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-home-controller.js delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-spa-controller.js delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-style.css delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-yn-filter.js delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_home_body.html delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_popup_templates.html delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_spa.html delete mode 100644 dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/manifest-service.js (limited to 'dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home') diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-home-controller.js b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-home-controller.js deleted file mode 100644 index 5b9dbca..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-home-controller.js +++ /dev/null @@ -1,66 +0,0 @@ -/*- - * ================================================================================ - * DCAE DMaaP Bus Controller Web Application - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.controller('dbcHomeCtrl', function($scope, $log, DmaapAccessService, ManifestService) { - // Loads info to show on the welcome page. - - // this object holds all app data and functions - $scope.dbcapp = {}; - $scope.dbcapp.selectedDmaapAccess=null; - $scope.dbcapp.isDataLoading = true; - $scope.dbcapp.isRequestFailed = false; - $scope.dbcapp.errMsg = null; - $scope.dbcapp.manifest=null; - - DmaapAccessService.getSelectedDmaapAccess() - .then(function(jsonObj) { - // must match keys in java controller's method - if (jsonObj.error) { - $scope.dbcapp.isRequestFailed = true; - $scope.dbcapp.errMsg = jsonObj.error; - } - else { - $scope.dbcapp.isRequestFailed = false; - $scope.dbcapp.errMsg = null; - $scope.dbcapp.selectedDmaapAccess=jsonObj.data; - - // Next get the manifest - ManifestService.getManifest() - .then(function(jsonObj) { - // $log.debug("dbcHomeCtrl: getManifest returned " + JSON.stringify(jsonObj)); - if (jsonObj.error) { - $scope.dbcapp.isRequestFailed = true; - $scope.dbcapp.errMsg = jsonObj.error; - } - else { - $scope.dbcapp.manifest=jsonObj.manifest; - } - },function(error){ - $log.error("dbcHomeCtrl getManifest failed: " + error); - }); - - } - $scope.dbcapp.isDataLoading=false; - },function(error){ - $log.error("dbcHomeCtrl: getSelectdDmaapAccess failed: " + error); - $scope.dbcapp.isDataLoading=false; - }); - - -}); diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-spa-controller.js b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-spa-controller.js deleted file mode 100644 index 1be3ffc..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-spa-controller.js +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ================================================================================ - * DCAE DMaaP Bus Controller Web Application - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.config(function($routeProvider) { - $routeProvider - .when('/dmaap', { - templateUrl: 'app/dbcapp/dmaapaccess/dmaap_access_list.html', - controller : 'dmaapAccessListCtrl' - }) - .when('/dr_feed', { - templateUrl: 'app/dbcapp/datarouter/dr_feed_list.html', - controller : 'drFeedListCtrl' - }) - .when('/dr_pub', { - templateUrl: 'app/dbcapp/datarouter/dr_pub_list.html', - controller: 'drPubListCtrl' - }) - .when('/dr_sub', { - templateUrl: 'app/dbcapp/datarouter/dr_sub_list.html', - controller: 'drSubListCtrl' - }) - .when('/mr_topic', { - templateUrl: 'app/dbcapp/messagerouter/mr_topic_list.html', - controller : "mrTopicListCtrl" - }) - .when('/mr_client', { - templateUrl: 'app/dbcapp/messagerouter/mr_client_list.html', - controller: 'mrClientListCtrl' - }) - .otherwise({ - templateUrl: 'app/dbcapp/home/dbc_home_body.html', - controller: 'dbcHomeCtrl' - }); -}); diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-style.css b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-style.css deleted file mode 100644 index 86944fb..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-style.css +++ /dev/null @@ -1,77 +0,0 @@ -/*- - * ================================================================================ - * DCAE DMaaP Bus Controller Web Application - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ - -/* Tweak height and width of password as set fn-ebz.css */ -input[type="password"].fn-ebz-text.dbcpassword { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - height: 40px; - width: 210px; - border: 1px solid gray; - font-size: .875rem; - padding-left: 10px; - margin-top: 0px; /* override */ - margin-right: 20px; -} - -input[type="text"].fn-ebz-text.dbcpagenum { - width: 85px; - height: 30px; - margin-right: 10px; -} - -/* Adjusts height and width to be narrow */ -select.fn-ebz-select.dbcpageselect { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - height: 30px; - width: 85px; - padding-left: 10px; - padding-right: 10px; - background-color: white; - color: black; - margin-top: 8px; - margin-right: 10px; - font-size: 12px; - appearance: none; /* not supported in IE */ - -webkit-appearance: none; /* not supported in IE */ - -moz-appearance: none; /* not supported in IE */ -} - -/* Adjusts height, width and top margin to match text fields */ -select.fn-ebz-select.dbcselect { - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - height: 40px; - width: 210px; - padding-left: 10px; - padding-right: 10px; - background-color: white; - color: black; - margin-top: 0px; - margin-right: 10px; - font-size: 12px; - appearance: none; /* not supported in IE */ - -webkit-appearance: none; /* not supported in IE */ - -moz-appearance: none; /* not supported in IE */ -} diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-yn-filter.js b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-yn-filter.js deleted file mode 100644 index 79eb99d..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc-yn-filter.js +++ /dev/null @@ -1,26 +0,0 @@ -/*- - * ================================================================================ - * DCAE DMaaP Bus Controller Web Application - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.filter('dbcYesNoFilter', - function() { - return function(input) { - return input ? 'Y' : 'N'; - } - } -); diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_home_body.html b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_home_body.html deleted file mode 100644 index 9aa56d4..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_home_body.html +++ /dev/null @@ -1,51 +0,0 @@ - - -

DMaaP Bus Controller

- -

Welcome to the DMaaP Bus Controller web application.

- -
-
-
- -
- -
- {{dbcapp.errMsg}} -
- -
- Selected DMaaP access profile: -
    -
  • Name: {{dbcapp.selectedDmaapAccess.name}}
    • -
  • URL: {{dbcapp.selectedDmaapAccess.dmaapUrl}}
    • -
- - Manifest - information: -
    -
  • Build-Number: {{dbcapp.manifest['Build-Number']}}
    • -
  • Build-Time: {{dbcapp.manifest['Build-Time']}}
    • -
- -
- -
diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_popup_templates.html b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_popup_templates.html deleted file mode 100644 index cf2b77d..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_popup_templates.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_spa.html b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_spa.html deleted file mode 100644 index d9d2546..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/dbc_spa.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - diff --git a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/manifest-service.js b/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/manifest-service.js deleted file mode 100644 index 03f143a..0000000 --- a/dcae_dmaapbc_webapp/src/main/webapp/app/dbcapp/home/manifest-service.js +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * ================================================================================ - * DCAE DMaaP Bus Controller Web Application - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.factory('ManifestService', function ($http, $q, $log) { - return { - // Gets and returns the manifest for the webapp. - getManifest: function() { - // cache control for IE - var cc = "?cc=" + new Date().getTime().toString(); - return $http({ - method: 'GET', - url: 'manifest' + cc, - cache: false, - responseType: 'json'}) - .then(function(response) { - // $log.debug("ManifestService.getManifest: " + JSON.stringify(response)); - if (response.data == null || typeof response.data != 'object') - return $q.reject('ManifestService.getManifest: response.data null or not object'); - else - return response.data; - }, function(error) { - $log.error('ManifestService.getManifest failed: ' + error.data); - return $q.reject(error.data); - }); - } - }; -}); -- cgit 1.2.3-korg