From 5a3eed43e9032faa9e06358d0013b992a8b8875b Mon Sep 17 00:00:00 2001
From: “shentao” <shentao@chinamobile.com>
Date: Fri, 23 Sep 2016 13:12:04 +0800
Subject: modify frame pom files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I76438ea4f12c8acd4ccf9ec293e8757e5225bca3
Signed-off-by: “shentao” <shentao@chinamobile.com>
---
 openo-portal/portal-common/pom.xml                  |  4 +---
 .../portal-common/src/main/webapp/WEB-INF/web.xml   | 21 ---------------------
 openo-portal/portal-package/pom.xml                 |  4 +---
 .../portal-package/src/main/webapp/WEB-INF/web.xml  |  4 +---
 4 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 openo-portal/portal-common/src/main/webapp/WEB-INF/web.xml

diff --git a/openo-portal/portal-common/pom.xml b/openo-portal/portal-common/pom.xml
index d5444ed8..3d159212 100644
--- a/openo-portal/portal-common/pom.xml
+++ b/openo-portal/portal-common/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+    Copyright 2016, CMCC Technologies Co., Ltd.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,7 +13,6 @@
     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.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
diff --git a/openo-portal/portal-common/src/main/webapp/WEB-INF/web.xml b/openo-portal/portal-common/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7c099597..00000000
--- a/openo-portal/portal-common/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2015 CMCC, Inc. and others. All rights reserved. (CMCC)
-
-    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.
-
--->
-<web-app>
-  <display-name>OPEN-O Web Common Module</display-name>
-</web-app>
diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
index 125380e8..e94ecbc0 100644
--- a/openo-portal/portal-package/pom.xml
+++ b/openo-portal/portal-package/pom.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+    Copyright 2016, CMCC Technologies Co., Ltd.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,7 +13,6 @@
     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.
-
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
index e7cd792c..887f7dfd 100644
--- a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
+++ b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
-    Copyright (C) 2015 CMCC, Inc. and others. All rights reserved. (CMCC)
+    Copyright 2016, CMCC Technologies Co., Ltd.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,7 +13,6 @@
     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.
-
 -->
 <web-app>
   <display-name>OPEN-O Web Application</display-name>
-- 
cgit 1.2.3-korg