From 61c0002155c619336d87f712873aedc56a498af7 Mon Sep 17 00:00:00 2001
From: nancylizi
Date: Thu, 22 Sep 2016 18:07:47 +0800
Subject: Modify license. Issue-id:TOSCA-73
Change-Id: I9e5684153ded6299fc9d3b775aad6e955c532e8b
Signed-off-by: nancylizi
---
openo-portal/portal-catalog/pom.xml | 3 ++-
.../src/main/webapp/catalog/csarPackage.html | 2 +-
.../src/main/webapp/catalog/css/datatable-sort.css | 5 +++--
.../src/main/webapp/catalog/css/fileupload.css | 5 +++--
.../src/main/webapp/catalog/css/hostMirror.css | 5 +++--
.../src/main/webapp/catalog/css/package.css | 5 +++--
.../src/main/webapp/catalog/css/platform/animate.min.css | 5 +++--
.../src/main/webapp/catalog/css/platform/skill.css | 5 +++--
.../src/main/webapp/catalog/css/software.css | 5 +++--
.../src/main/webapp/catalog/css/template.css | 5 +++--
.../src/main/webapp/catalog/css/templateDetail.css | 5 +++--
.../src/main/webapp/catalog/css/topology.css | 5 +++--
.../src/main/webapp/catalog/css/virtualApplication.css | 5 +++--
.../portal-catalog/src/main/webapp/catalog/css/vnfm.css | 5 +++--
.../catalog/i18n/nfv-nso-iui-i18n-en-US.properties | 2 +-
.../catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties | 2 +-
.../main/webapp/catalog/js/component/loadi18n_nsoc.js | 16 ++++++++++++++++
.../main/webapp/catalog/js/component/serverPageTable.js | 7 ++++---
.../src/main/webapp/catalog/js/package/pmController.js | 6 +++---
.../src/main/webapp/catalog/js/package/pmUtil.js | 7 ++++---
.../src/main/webapp/catalog/js/template/tmController.js | 7 ++++---
.../webapp/catalog/js/template/tmDetailController.js | 6 +++---
.../src/main/webapp/catalog/js/template/tmDetailUtil.js | 7 ++++---
.../main/webapp/catalog/js/template/tmNodesController.js | 6 +++---
.../main/webapp/catalog/js/template/tmNodesDetailUtil.js | 7 ++++---
.../main/webapp/catalog/js/template/tmTopoController.js | 6 +++---
.../src/main/webapp/catalog/js/template/tmUtil.js | 7 ++++---
.../src/main/webapp/catalog/js/template/topoUtil.js | 7 ++++---
.../src/main/webapp/catalog/nodesDetail.html | 2 +-
.../portal-catalog/src/main/webapp/catalog/template.html | 3 ++-
.../src/main/webapp/catalog/templateDetail.html | 3 ++-
.../portal-catalog/src/main/webapp/catalog/topology.html | 2 +-
.../src/main/webapp/catalog/topologyDetail.html | 3 ++-
33 files changed, 105 insertions(+), 66 deletions(-)
(limited to 'openo-portal/portal-catalog')
diff --git a/openo-portal/portal-catalog/pom.xml b/openo-portal/portal-catalog/pom.xml
index c49813b0..6a647b03 100644
--- a/openo-portal/portal-catalog/pom.xml
+++ b/openo-portal/portal-catalog/pom.xml
@@ -1,7 +1,7 @@
+
4.0.0
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
index 501b9126..7f1a44f7 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html
@@ -1,6 +1,6 @@
"]
});
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
index 0d04e7cc..834562a6 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js
index 40980c05..8e54ef3a 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var tmDetailUtil = {};
tmDetailUtil.timer = null;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js
index a25b10cd..d717c780 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js
index b5f7dab3..ca71ce44 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesDetailUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var tmNodesDetailUtil = {};
tmNodesDetailUtil.timer = null;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js
index bcae3abf..8395b715 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js
index b0137b0c..d15db04d 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var tmUtil = {};
tmUtil.nameRender = function(obj) {
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
index 8e0b850b..a531278a 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
@@ -1,11 +1,11 @@
-/*
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+/**
+ * Copyright 2016 [ZTE] and others.
*
* 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
+ * 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,
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
var topoUtil = {};
topoUtil.topoDatas=[];
topoUtil.svgOffsetWidth = 0;
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html
index dfb771c8..9ef2e428 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html
@@ -1,6 +1,6 @@
+
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html
index 856a3bb4..d5563541 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/templateDetail.html
@@ -1,6 +1,6 @@
+
diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html b/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html
index 661ae238..ceff55bf 100644
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/topology.html
@@ -1,6 +1,6 @@
+
--
cgit 1.2.3-korg