Merge "add package module"

6 files changed, 203 insertions, 124 deletions

diff --git a/openo-portal/pom.xml b/openo-portal/pom.xml
index 1152b1d4..20585b1b 100644
--- a/openo-portal/pom.xml
+++ b/openo-portal/pom.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-

-    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)

-

-    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.

--->

-

-<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>

-      <groupId>org.openo.gso.gui</groupId>

-      <artifactId>gso-gui</artifactId>

-      <version>1.0.0-SNAPSHOT</version>

-      <relativePath>..</relativePath>

-    </parent>

-    <modelVersion>4.0.0</modelVersion>

-    <artifactId>openo-portal</artifactId>

-    <packaging>pom</packaging>

-    <name>portal</name>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+    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.
+-->
+
+<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>
+      <groupId>org.openo.gso.gui</groupId>
+      <artifactId>gso-gui</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <relativePath>..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>openo-portal</artifactId>
+    <packaging>pom</packaging>
+    <name>portal</name>
+</project>
diff --git a/openo-portal/portal-common/pom.xml b/openo-portal/portal-common/pom.xml
index 5be89d20..81092077 100644
--- a/openo-portal/portal-common/pom.xml
+++ b/openo-portal/portal-common/pom.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-

-    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)

-

-    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.

-

--->

-<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>

-

-    <artifactId>common</artifactId>

-	<version>1.0.0-SNAPSHOT</version>

-    <packaging>pom</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+    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.
+
+-->
+<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>
+
+    <artifactId>common</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+</project>
diff --git a/openo-portal/portal-extsys/pom.xml b/openo-portal/portal-extsys/pom.xml
index 703434d2..ded01b8d 100644
--- a/openo-portal/portal-extsys/pom.xml
+++ b/openo-portal/portal-extsys/pom.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-

-    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)

-

-    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.

-

--->

-<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>openo-portal</groupId>

-      <artifactId>openo-portal</artifactId>

-      <version>1.0.0-SNAPSHOT</version>

-      <relativePath/>

-    </parent>

-

-    <groupId>openo-portal.module.extsys</groupId>

-    <artifactId>module-extsys</artifactId>

-	<version>1.0.0-SNAPSHOT</version>

-    <packaging>pom</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+    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.
+
+-->
+<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>openo-portal</groupId>
+      <artifactId>openo-portal</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <relativePath/>
+    </parent>
+
+    <groupId>openo-portal.module.extsys</groupId>
+    <artifactId>module-extsys</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+</project>
diff --git a/openo-portal/portal-lifecyclemgr/pom.xml b/openo-portal/portal-lifecyclemgr/pom.xml
index 5fe24ac7..634020f3 100644
--- a/openo-portal/portal-lifecyclemgr/pom.xml
+++ b/openo-portal/portal-lifecyclemgr/pom.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-

-    Copyright 2016, Huawei 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.

-    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.

-

--->

-<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>

-

-    <artifactId>module-lifecyclemgr</artifactId>

-	<version>1.0.0-SNAPSHOT</version>

-    <packaging>pom</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2016, Huawei 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.
+    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.
+
+-->
+<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>
+
+    <artifactId>module-lifecyclemgr</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+</project>
diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
new file mode 100644
index 00000000..125380e8
--- /dev/null
+++ b/openo-portal/portal-package/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015 ZTE, Inc. and others. All rights reserved. (ZTE)
+
+    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.
+
+-->
+<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">
+  <parent>
+    <groupId>org.openo.gso.gui</groupId>
+    <artifactId>openo-portal</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>portal-package</artifactId>
+  <packaging>war</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.openo.gso.gui</groupId>
+      <artifactId>portal-common</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>open-portal</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
+          <overlays>
+            <overlay>
+              <groupId>org.openo.gso.gui</groupId>
+              <artifactId>portal-common</artifactId>
+            </overlay>
+          </overlays>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
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
new file mode 100644
index 00000000..e7cd792c
--- /dev/null
+++ b/openo-portal/portal-package/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 Application</display-name>
+</web-app>