modify common module

Change-Id: Id2553bbffe2a3aea2e944c0a8fcec771b5ccf277
Signed-off-by: “shentao” <shentao@chinamobile.com>

3 files changed, 48 insertions, 10 deletions

diff --git a/openo-portal/pom.xml b/openo-portal/pom.xml
index 20585b1b..e6dbf7b3 100644
--- a/openo-portal/pom.xml
+++ b/openo-portal/pom.xml
@@ -27,4 +27,9 @@
     <artifactId>openo-portal</artifactId>
     <packaging>pom</packaging>
     <name>portal</name>
+
+    <modules>
+      <module>portal-package</module>
+      <module>portal-common</module>
+    </modules>
 </project>
diff --git a/openo-portal/portal-common/pom.xml b/openo-portal/portal-common/pom.xml
index 81092077..ba32aaad 100644
--- a/openo-portal/portal-common/pom.xml
+++ b/openo-portal/portal-common/pom.xml
@@ -17,15 +17,27 @@
 
 -->
 <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">
-    <modelVersion>4.0.0</modelVersion> 
-    <parent>
-      <groupId>org.openo.gso.gui</groupId>
-      <artifactId>openo-portal</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <relativePath/>
-    </parent>
+  <parent>
+    <groupId>org.openo.gso.gui</groupId>
+    <artifactId>openo-portal</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath></relativePath>
+  </parent>
 
-    <artifactId>common</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>portal-common</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
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
new file mode 100644
index 00000000..7c099597
--- /dev/null
+++ b/openo-portal/portal-common/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,21 @@
+<?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>