TOSCA-74 Modify the license and the third party component path of external system

Change-Id: Id98de06d6eb30c6b22173ca7943b9379ae6f4819
Issue-id: TOSCA-74
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>

diff --git a/openo-portal/portal-extsys/pom.xml b/openo-portal/portal-extsys/pom.xml
index 4c68273..8832e0d 100644 (file)
--- a/openo-portal/portal-extsys/pom.xml
+++ b/openo-portal/portal-extsys/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    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-extsys/src/main/webapp/extsys/vim/css/bootstrap.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css
index 0193ce7..6e70054 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/bootstrap.css
@@ -1,11 +1,11 @@
 /**\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css
index 092c7be..f188265 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/skill.css
@@ -1,11 +1,11 @@
 /**\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css
index 72de455..ab7b875 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vim.css
@@ -1,11 +1,11 @@
 /**\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css
index 842ff48..0af68c5 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/css/vimChart.css
@@ -1,3 +1,18 @@
+/**\r
+ * Copyright 2016 [ZTE] and others.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 body {\r
   color: #333;\r
   font-family: "Microsoft yahei", Verdana, Arial, Helvetica, sans-serif !important;\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
index 4f18870..5549e5b 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
@@ -1,11 +1,11 @@
-*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+/*\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
index 35cdb63..8a7e637 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
@@ -1,5 +1,5 @@
 #\r
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+# Copyright 2016 [ZTE] and others.\r
 #\r
 # Licensed under the Apache License, Version 2.0 (the "License");\r
 # you may not use this file except in compliance with the License.\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
index eeba672..d2c5e9f 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
@@ -1,5 +1,5 @@
 #\r
-# Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+# Copyright 2016 [ZTE] and others.\r
 #\r
 # Licensed under the Apache License, Version 2.0 (the "License");\r
 # you may not use this file except in compliance with the License.\r
@@ -14,6 +14,7 @@
 # limitations under the License.\r
 #\r
 \r
+\r
 ############## vimView.html i18n ##############\r
 com_zte_ums_eco_roc_vim_checking_status=vim连接状态检查中...\r
 com_zte_ums_eco_roc_vim_name=名称\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js
index 660cd6f..5f9a5dc 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/client-cometd.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
index e590a09..d57e07d 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js
index 5e3c9c9..0ffa6d3 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vim-validate.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
index 259f83d..284c143 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
index 1e9126b..417815d 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
index ccade47..e854a61 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js
index bab4f3b..103482f 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimUtil.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html
index 1bb1373..e94066f 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimChart.html
@@ -1,31 +1,31 @@
 <!DOCTYPE html>\r
 <!--\r
 \r
-Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+    Copyright 2016 [ZTE] and others.\r
 \r
-Licensed under the Apache License, Version 2.0 (the "License");\r
-you may not use this file except in compliance with the License.\r
-You may obtain a copy of the License at\r
+    Licensed under the Apache License, Version 2.0 (the "License");\r
+    you may not use this file except in compliance with the License.\r
+    You may obtain a copy of the License at\r
 \r
-    http://www.apache.org/licenses/LICENSE-2.0\r
+            http://www.apache.org/licenses/LICENSE-2.0\r
 \r
-Unless required by applicable law or agreed to in writing, software\r
-distributed under the License is distributed on an "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-See the License for the specific language governing permissions and\r
-limitations under the License.\r
+    Unless required by applicable law or agreed to in writing, software\r
+    distributed under the License is distributed on an "AS IS" BASIS,\r
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+    See the License for the specific language governing permissions and\r
+    limitations under the License.\r
 \r
 -->\r
 <html>\r
 <head lang="en">\r
 <meta charset="UTF-8">\r
 <title></title>\r
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>\r
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>\r
-<link href="../framework/css/ngict-component.css" rel="stylesheet" type="text/css">\r
-<link href="../component/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">\r
-<link href="../vendor/animate/animate.min.css" rel="stylesheet" type="text/css" />\r
-<link href="./css/vimChart.css" rel="stylesheet" type="text/css"/>\r
+<link href="../../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>\r
+<link href="../../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>\r
+<link href="../../common/css/ngict-component.css" rel="stylesheet" type="text/css">\r
+<link href="../../common/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">\r
+<link href="../../common/thirdparty/animate/animate.min.css" rel="stylesheet" type="text/css" />\r
+<link href="css/vimChart.css" rel="stylesheet" type="text/css"/>\r
 <style>\r
 .ms-controller {\r
        visibility: hidden\r
@@ -97,17 +97,17 @@ var id,name,tenant;
 \r
 </div>\r
 \r
-<script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
-<script type="text/javascript" src="../framework/js/tools.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
-<script src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
+<script type="text/javascript" src="../../common/js/tools.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
+<script src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>\r
 <script type="text/javascript" src="./i18n/loadi18nApp.js"></script> \r
-<script src="../vendor/echarts/echarts-all.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js"></script>\r
-<script src="../vendor/avalon/avalon.js"></script>\r
-<script type="text/javascript" src="./js/vimChart.js"></script>\r
-<script type="text/javascript" src="./js/vimChartController.js"></script>\r
-<script type="text/javascript" src="../framework/js/core/hk.min.js" ></script>\r
+<script src="../../common/thirdparty/echarts/echarts-all.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>\r
+<script src="../../common/thirdparty/avalon/avalon.js"></script>\r
+<script type="text/javascript" src="js/vimChart.js"></script>\r
+<script type="text/javascript" src="js/vimChartController.js"></script>\r
+<script type="text/javascript" src="../../common/js/core/hk.min.js" ></script>\r
 </body>\r
 </html>
\ No newline at end of file

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
index b638cac..858d6d5 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
@@ -1,33 +1,33 @@
 <!DOCTYPE html>\r
 <!--\r
 \r
-Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+    Copyright 2016 [ZTE] and others.\r
 \r
-Licensed under the Apache License, Version 2.0 (the "License");\r
-you may not use this file except in compliance with the License.\r
-You may obtain a copy of the License at\r
+    Licensed under the Apache License, Version 2.0 (the "License");\r
+    you may not use this file except in compliance with the License.\r
+    You may obtain a copy of the License at\r
 \r
-    http://www.apache.org/licenses/LICENSE-2.0\r
+            http://www.apache.org/licenses/LICENSE-2.0\r
 \r
-Unless required by applicable law or agreed to in writing, software\r
-distributed under the License is distributed on an "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-See the License for the specific language governing permissions and\r
-limitations under the License.\r
+    Unless required by applicable law or agreed to in writing, software\r
+    distributed under the License is distributed on an "AS IS" BASIS,\r
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+    See the License for the specific language governing permissions and\r
+    limitations under the License.\r
 \r
 -->\r
 <html>\r
 <head lang="en">\r
 <meta charset="UTF-8">\r
 <title></title>\r
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>\r
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>\r
-<link href="../component/thirdparty/uniform/css/uniform.default.css" rel="stylesheet"/>\r
-<link href="../framework/css/ngict-component.css" rel="stylesheet" type="text/css">\r
-<link href="../component/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">\r
-<link href="./css/vim.css" rel="stylesheet" type="text/css"/>\r
-<link href="./css/skill.css" rel="stylesheet" type="text/css"/>\r
-<link href="../vendor/animate/animate.min.css" rel="stylesheet" type="text/css"/>\r
+<link href="../../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>\r
+<link href="../../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>\r
+<link href="../../common/thirdparty/uniform/css/uniform.default.css" rel="stylesheet"/>\r
+<link href="../../common/css/ngict-component.css" rel="stylesheet" type="text/css">\r
+<link href="../../common/css/ZteIctIcons/style.css" rel="stylesheet" type="text/css">\r
+<link href="css/vim.css" rel="stylesheet" type="text/css"/>\r
+<link href="css/skill.css" rel="stylesheet" type="text/css"/>\r
+<link href="../../common/thirdparty/animate/animate.min.css" rel="stylesheet" type="text/css"/>\r
 \r
 \r
 <style>\r
@@ -220,14 +220,14 @@ limitations under the License.
        </div>\r
                \r
        </div>\r
-<script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
-<script type="text/javascript" src="../framework/js/tools.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
-<script type="text/javascript" src="../framework/js/json2.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/jquery-validation/js/jquery.validate.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/jquery-validation/js/additional-methods.min.js"></script>\r
-<script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
+<script type="text/javascript" src="../../common/js/tools.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
+<script type="text/javascript" src="../../common/js/json2.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/jquery.validate.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/additional-methods.min.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>\r
 <!--<script type="text/javascript" src="../component/thirdparty/cometd/cometd.js"></script>-->\r
 <!--<script type="text/javascript" src="../component/thirdparty/cometd/jquery/jquery.cometd.js"></script>-->\r
 <script type="text/javascript" src="js/loadi18nApp.js"></script> \r
@@ -236,7 +236,7 @@ limitations under the License.
 <script src="../vendor/avalon/avalon.js"></script>\r
 <script type="text/javascript" src="js/vimUtil.js"></script>\r
 <script type="text/javascript" src="js/vimController.js"></script>\r
-<script src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>\r
-<script type="text/javascript" src="../framework/js/core/hk.min.js" ></script>\r
+<script src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>\r
+<script type="text/javascript" src="../../common/js/core/hk.min.js" ></script>\r
 </body>\r
 </html>
\ No newline at end of file

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css
index b007c1b..b1a752a 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/animate.min.css
@@ -1,11 +1,11 @@
 /**\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css
index c4b588b..14254aa 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/css/vnfm.css
@@ -1,11 +1,11 @@
 /**\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
index 6a1f354..aed3e34 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -1,5 +1,5 @@
 #
-# 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.

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
index 39ed473..e98df6e 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
@@ -1,5 +1,5 @@
 #
-# 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.

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js
index abc4cd6..2e3dffd 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/commonUtil.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
index c809aa2..198960c 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
@@ -1,3 +1,18 @@
+/*\r
+ * Copyright 2016 [ZTE] and others.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 function loadPropertiesSideMenu(lang, fileNamePrefix, filePath){\r
        jQuery.i18n.properties({\r
            language:lang,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
index ff99b9d..0412101 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
@@ -1,3 +1,18 @@
+/*\r
+ * Copyright 2016 [ZTE] and others.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 $(function(){\r
        var form = $('#vnfm_form');\r
        var error = $('.alert-danger', form);\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js
index 8e1f8ac..fcc95a6 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmController.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
index fc3fe17..7438cf1 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
@@ -1,11 +1,11 @@
 /*\r
- * Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+ * Copyright 2016 [ZTE] and others.\r
  *\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
index 75bb025..6256a8d 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
@@ -1,6 +1,6 @@
 <!--\r
 \r
-    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+    Copyright 2016 [ZTE] and others.\r
 \r
     Licensed under the Apache License, Version 2.0 (the "License");\r
     you may not use this file except in compliance with the License.\r
@@ -20,11 +20,11 @@
 <head lang="en">\r
 <meta charset="UTF-8">\r
 <title></title>\r
-<link href="../component/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" />\r
-<link href="../component/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" />\r
-<link href="../component/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet" />\r
-<link href="../component/css/ZteIctIcons/style.css" rel="stylesheet"/>\r
-<link href="../framework/css/ngict-component.css" rel="stylesheet"/>\r
+<link href="../../common/thirdparty/font-awesome/css/font-awesome.min.css" rel="stylesheet" />\r
+<link href="../../common/thirdparty/bootstrap/css/bootstrap.min.css" rel="stylesheet" />\r
+<link href="../../common/thirdparty/uniform/css/uniform.default.min.css" rel="stylesheet" />\r
+<link href="../../common/css/ZteIctIcons/style.css" rel="stylesheet"/>\r
+<link href="../../common/css/ngict-component.css" rel="stylesheet"/>\r
 <link href="css/animate.min.css" rel="stylesheet"/>\r
 <link href="css/vnfm.css" rel="stylesheet" />\r
 <style>\r
@@ -198,19 +198,19 @@
         </div>  \r
        </div>\r
        </div>\r
-       <script type="text/javascript" src="../component/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
-       <script type="text/javascript" src="../component/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
-       <script type="text/javascript" src="../component/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
-       <script type="text/javascript" src="../component/thirdparty/bootbox/bootbox.min.js"></script>\r
-       <script type="text/javascript" src="../component/thirdparty/jquery-validation/js/jquery.validate.min.js"></script>\r
-       <script type="text/javascript" src="../component/thirdparty/jquery-validation/js/additional-methods.min.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/jquery.validate.min.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/additional-methods.min.js"></script>\r
        \r
-       <script type="text/javascript" src="../vendor/bootstrap-growl/bootstrap-growl.min.js"></script>\r
-       <script type="text/javascript" src="../vendor/cometd/cometd.js"></script>\r
-       <script type="text/javascript" src="../vendor/cometd/jquery.cometd.js"></script>\r
-       <script type="text/javascript" src="../vendor/avalon/avalon.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/cometd/cometd.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/cometd/jquery.cometd.js"></script>\r
+       <script type="text/javascript" src="../../common/thirdparty/avalon/avalon.js"></script>\r
 \r
-       <script type="text/javascript" src="../framework/js/tools.js"></script>\r
+       <script type="text/javascript" src="../../common/js/tools.js"></script>\r
        \r
        <script type="text/javascript" src="js/commonUtil.js"></script>\r
        <script type="text/javascript" src="js/loadi18n_nsoc.js"></script>\r