diff options
| author |   Li Zi <li.zi30@zte.com.cn> | 2017-10-12 09:22:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-12 09:22:19 +0000 |
| commit | 2c3965859fcd35ce0f61e6ea2296acda2884df63 (patch) | |
| tree | 786a223d52c6f74604214038cfc9b2b61cb95b8b | |
| parent | 5600ac4b2a8acd966dbc8763b7b652fb8f0ba2c3 (diff) | |
| parent | 02e266a4c4948bce1765179ed3fcb4e8ce46e656 (diff) | |
Merge "Add a function to add esr-gui to webapp."
| -rw-r--r-- | integration/pom.xml | 66 | ||||
| -rw-r--r-- | integration/src/main/webapp/WEB-INF/web.xml | 19 | ||||
| -rw-r--r-- | pom.xml | 1 |
3 files changed, 86 insertions, 0 deletions
diff --git a/integration/pom.xml b/integration/pom.xml new file mode 100644 index 0000000..802676c --- /dev/null +++ b/integration/pom.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2017 ZTE Corporation. + + 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.onap.aai.esr-gui</groupId> + <artifactId>aai-esr-gui</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>integration</artifactId> + <packaging>war</packaging> + <name>esr-gui/integration</name> + + <dependencies> + <dependency> + <groupId>org.onap.aai.esr-gui</groupId> + <artifactId>common</artifactId> + <version>1.0.0-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.onap.aai.esr-gui</groupId> + <artifactId>portal</artifactId> + <version>1.0.0-SNAPSHOT</version> + <type>war</type> + </dependency> + </dependencies> + + <build> + <finalName>esr-gui</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.onap.aai.esr-gui</groupId> + <artifactId>common</artifactId> + </overlay> + <overlay> + <groupId>org.onap.aai.esr-gui</groupId> + <artifactId>portal</artifactId> + </overlay> + </overlays> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/integration/src/main/webapp/WEB-INF/web.xml b/integration/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..52dafec --- /dev/null +++ b/integration/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2016-2017, China Mobile 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. +--> +<web-app> + +</web-app> @@ -33,6 +33,7 @@ <modules> <module>common</module> <module>portal</module> + <module>integration</module> <module>distribution</module> </modules> |