latest ui code fixes merged in opnfv repo

Change-Id: Ib6d7f81e4a85286b7b30d332c757f7eb1bb519f3
Signed-off-by: Koren Lev <korenlev@gmail.com>

6 files changed, 2 insertions, 34 deletions

diff --git a/ui/imports/api/environments/configuration-groups/amqp-configuration.js b/ui/imports/api/environments/configuration-groups/amqp-configuration.js
index 83a15cf..7b7ddaf 100644
--- a/ui/imports/api/environments/configuration-groups/amqp-configuration.js
+++ b/ui/imports/api/environments/configuration-groups/amqp-configuration.js
@@ -25,5 +25,5 @@ export const AMQPSchema = new SimpleSchema({
     type: String, 
     defaultValue: 'rabbitmquser'
   },
-  password: { type: String },
+  pwd: { type: String },
 });
diff --git a/ui/imports/api/environments/configuration-groups/mysql-configuration.js b/ui/imports/api/environments/configuration-groups/mysql-configuration.js
index 1921432..97eab29 100644
--- a/ui/imports/api/environments/configuration-groups/mysql-configuration.js
+++ b/ui/imports/api/environments/configuration-groups/mysql-configuration.js
@@ -19,7 +19,7 @@ export const MysqlSchema = new SimpleSchema({
     regEx: SimpleSchema.RegEx.IP,
     defaultValue: '10.0.0.1'
   },
-  password: { type: String },
+  pwd: { type: String },
   port: { 
     type: String,
     regEx: portRegEx,
diff --git a/ui/imports/api/scheduled-scans/methods.js b/ui/imports/api/scheduled-scans/methods.js
index 22f8110..06cdea7 100644
--- a/ui/imports/api/scheduled-scans/methods.js
+++ b/ui/imports/api/scheduled-scans/methods.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import * as R from 'ramda';
 
diff --git a/ui/imports/api/scheduled-scans/scheduled-scans.js b/ui/imports/api/scheduled-scans/scheduled-scans.js
index 66ae5d1..54d4565 100644
--- a/ui/imports/api/scheduled-scans/scheduled-scans.js
+++ b/ui/imports/api/scheduled-scans/scheduled-scans.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Mongo } from 'meteor/mongo';
 import { SimpleSchema } from 'meteor/aldeed:simple-schema';
 import { Constants } from '/imports/api/constants/constants';
diff --git a/ui/imports/api/scheduled-scans/server/methods.js b/ui/imports/api/scheduled-scans/server/methods.js
index 17ed990..4a6c508 100644
--- a/ui/imports/api/scheduled-scans/server/methods.js
+++ b/ui/imports/api/scheduled-scans/server/methods.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { check } from 'meteor/check';
 import * as R from 'ramda';
 import { ScheduledScans } from '../scheduled-scans';
diff --git a/ui/imports/api/scheduled-scans/server/publications.js b/ui/imports/api/scheduled-scans/server/publications.js
index 97acc21..9359c20 100644
--- a/ui/imports/api/scheduled-scans/server/publications.js
+++ b/ui/imports/api/scheduled-scans/server/publications.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Meteor } from 'meteor/meteor';
 import * as R from 'ramda';
 import { Counts } from 'meteor/tmeasday:publish-counts';