summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Zi <li.zi30@zte.com.cn>2017-10-10 07:06:36 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-10 07:06:36 +0000
commita8bcbe8b7e4683a81caa38e76d5d56c6b42c925b (patch)
treeb3921894f4037e082d7801318c1a7c0b047c5623
parent6f7a5d318b94ff5da74aa65cfe58da0857eb519e (diff)
parentfbca92eca2c35f2de13a03243cbb261e0aa03355 (diff)
Merge "remove the integration catalog."
-rw-r--r--integration/pom.xml124
-rw-r--r--integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java100
-rw-r--r--integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java48
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java27
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/Constants.java20
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/RegisterService.java147
-rw-r--r--integration/src/main/java/org/onap/aai/esr/system/SystemListener.java39
-rw-r--r--integration/src/main/resources/logback.xml102
-rw-r--r--integration/src/main/resources/portalConfig/msb_register.xml36
-rw-r--r--integration/src/main/webapp/WEB-INF/web.xml25
-rw-r--r--pom.xml1
11 files changed, 0 insertions, 669 deletions
diff --git a/integration/pom.xml b/integration/pom.xml
deleted file mode 100644
index 868311c..0000000
--- a/integration/pom.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>integration</artifactId>
- <packaging>war</packaging>
- <name>esr-gui/integration</name>
-
- <properties>
- <packagename>esr-gui</packagename>
- <version.logback>1.1.2</version.logback>
- <version.slf4j>1.7.6</version.slf4j>
- <linux64id>linux64</linux64id>
- <win64id>win64</win64id>
- <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
- <win64outputdir>target/assembly/${win64id}</win64outputdir>
- <version.output>target/version</version.output>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>${version.logback}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${version.logback}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-access</artifactId>
- <version>${version.logback}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${version.slf4j}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- <version>2.5</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.1</version>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.5</version>
- </dependency>
- <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/java/org/onap/aai/esr/bean/MsbRegisterBean.java b/integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java
deleted file mode 100644
index 4d60b02..0000000
--- a/integration/src/main/java/org/onap/aai/esr/bean/MsbRegisterBean.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * 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.
- */
-package org.onap.aai.esr.bean;
-
-import java.util.List;
-
-public class MsbRegisterBean {
- private String serviceName = "";
-
- private String version = "";
-
- private String lb_policy = "";
-
- private String url = "";
-
- private String path = "";
-
- private String protocol = "";
-
- private String visualRange = "";
-
- private List<ServiceNodeBean> nodes;
-
- public String getServiceName() {
- return serviceName;
- }
-
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- public String getLb_policy() {
- return lb_policy;
- }
-
- public void setLb_policy(String lb_policy) {
- this.lb_policy = lb_policy;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getProtocol() {
- return protocol;
- }
-
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
-
- public String getVisualRange() {
- return visualRange;
- }
-
- public void setVisualRange(String visualRange) {
- this.visualRange = visualRange;
- }
-
- public List<ServiceNodeBean> getNodes() {
- return nodes;
- }
-
- public void setNodes(List<ServiceNodeBean> nodes) {
- this.nodes = nodes;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-}
diff --git a/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java b/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java
deleted file mode 100644
index ce056ca..0000000
--- a/integration/src/main/java/org/onap/aai/esr/bean/ServiceNodeBean.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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.
- */
-package org.onap.aai.esr.bean;
-
-public class ServiceNodeBean {
- private String ip = "";
-
- private String port = "";
-
- private int ttl = 0;
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public String getPort() {
- return port;
- }
-
- public void setPort(String port) {
- this.port = port;
- }
-
- public int getTtl() {
- return ttl;
- }
-
- public void setTtl(int ttl) {
- this.ttl = ttl;
- }
-}
diff --git a/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java b/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java
deleted file mode 100644
index 2dd9315..0000000
--- a/integration/src/main/java/org/onap/aai/esr/system/CommonUtil.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 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.
- */
-package org.onap.aai.esr.system;
-
-public class CommonUtil {
-
- public static boolean isEmpty(String str) {
- if (null == str || "".equals(str.trim())) {
- return true;
- } else {
- return false;
- }
- }
-}
diff --git a/integration/src/main/java/org/onap/aai/esr/system/Constants.java b/integration/src/main/java/org/onap/aai/esr/system/Constants.java
deleted file mode 100644
index 720c1f8..0000000
--- a/integration/src/main/java/org/onap/aai/esr/system/Constants.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * 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.
- */
-package org.onap.aai.esr.system;
-
-public class Constants {
- public final static String MARK_COLON = ":";
-}
diff --git a/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java b/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java
deleted file mode 100644
index 94d5c42..0000000
--- a/integration/src/main/java/org/onap/aai/esr/system/RegisterService.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * 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.
- */
-package org.onap.aai.esr.system;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import net.sf.json.JSONObject;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.apache.commons.httpclient.HttpStatus;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.onap.aai.esr.bean.MsbRegisterBean;
-import org.onap.aai.esr.bean.ServiceNodeBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class RegisterService {
-
- private final static Logger logger = LoggerFactory.getLogger(RegisterService.class);
-
- public static HashMap<String, String> msbHostMap = new HashMap<String, String>();
- public static List<HashMap<String, String>> registerList = new ArrayList<HashMap<String, String>>();
-
- public static void registerMsb(String configPath) {
- File inputXml = new File(configPath);
- SAXReader saxReader = new SAXReader();
-
- try {
- Document document = saxReader.read(inputXml);
- Element rootNode = document.getRootElement();
- getMsbHostInfo(rootNode);
- getRegisterList(rootNode);
-
- String url = msbHostMap.get("hostIp") + Constants.MARK_COLON + msbHostMap.get("hostPort") + msbHostMap.get("msbApiRootDomain");
- for (int i = 0; i < registerList.size(); i++) {
- HashMap<String, String> registerInfo = registerList.get(i);
-
- ServiceNodeBean serviceNode = new ServiceNodeBean();
- serviceNode.setIp(registerInfo.get("ip"));
- serviceNode.setPort(registerInfo.get("port"));
- serviceNode.setTtl(Integer.valueOf(registerInfo.get("ttl")));
- List<ServiceNodeBean> nodeList = new ArrayList<ServiceNodeBean>();
- nodeList.add(serviceNode);
-
- MsbRegisterBean registerBean = new MsbRegisterBean();
- registerBean.setNodes(nodeList);
- registerBean.setServiceName(registerInfo.get("serviceName"));
- registerBean.setUrl(registerInfo.get("url"));
- registerBean.setPath(registerInfo.get("path"));
- registerBean.setProtocol(registerInfo.get("protocol"));
- registerBean.setVisualRange(registerInfo.get("visualRange"));
- registerBean.setLb_policy(registerInfo.get("lb_policy"));
-
- JSONObject registerObj = JSONObject.fromObject(registerBean);
- String registerResponse = registerPortalService(registerBean.getServiceName(), url, registerObj, "");
- }
- logger.info("open-o portal register task succeeded.");
- } catch (Exception e){
- logger.error("open-o portal register task failed.");
- logger.error(e.getMessage());
- }
- }
-
- private static void getMsbHostInfo(Element rootNode) {
- Element msbHostNode = rootNode.element("msbHost");
- Iterator iter = msbHostNode.elementIterator();
-
- while (iter.hasNext()) {
- Element element = (Element) iter.next();
- msbHostMap.put(element.getName(), element.getText());
- }
- }
-
- private static void getRegisterList(Element rootNode) {
- Element registerListNode = rootNode.element("registerList");
- Iterator iRegisterList = registerListNode.elementIterator();
-
- while (iRegisterList.hasNext()) {
- HashMap<String, String> registerMap = new HashMap<String, String>();
- Element registerInfo = (Element) iRegisterList.next();
- Iterator iRegisterInfo = registerInfo.elementIterator();
-
- while (iRegisterInfo.hasNext()) {
- Element element = (Element) iRegisterInfo.next();
- registerMap.put(element.getName(), element.getText());
- }
- registerList.add(registerMap);
- }
- }
-
- private static String registerPortalService(String serviceName, String url, JSONObject json, String token) {
- DefaultHttpClient client = new DefaultHttpClient();
- HttpPost post = new HttpPost(url);
- String response = null;
-
- try {
- if (null != json) {
- StringEntity s = new StringEntity(json.toString());
- s.setContentEncoding("UTF-8");
- s.setContentType("application/json");
- post.setEntity(s);
- }
- if (!CommonUtil.isEmpty(token)) {
- post.addHeader("X-Auth-Token", token);
- }
- HttpResponse res = client.execute(post);
- if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK
- || res.getStatusLine().getStatusCode() == HttpStatus.SC_CREATED) {
- String result = EntityUtils.toString(res.getEntity());
- if (!CommonUtil.isEmpty(result)) {
- response = result;
- } else {
- response = null;
- }
- }
- logger.info("register task [" + serviceName + "] completed successfully.");
- } catch (Exception e) {
- logger.error("register task [" + serviceName + "] failed because of errors.");
- logger.error(e.getMessage());
- }
-
- return response;
- }
-}
diff --git a/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java b/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java
deleted file mode 100644
index 9bc220c..0000000
--- a/integration/src/main/java/org/onap/aai/esr/system/SystemListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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.
- */
-package org.onap.aai.esr.system;
-
-import java.io.File;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class SystemListener implements ServletContextListener {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- public void contextDestroyed(ServletContextEvent sce) {
- }
-
- public void contextInitialized(ServletContextEvent servletContextEvent) {
- logger.info("onap esr gui register task begin.");
- String registerFilePath = SystemListener.class.getClassLoader().getResource("").getPath() + "portalConfig" + File.separator + "msb_register.xml";
- RegisterService.registerMsb(registerFilePath);
- logger.info("onap esr gui register task ended.");
- }
-}
diff --git a/integration/src/main/resources/logback.xml b/integration/src/main/resources/logback.xml
deleted file mode 100644
index 31e6339..0000000
--- a/integration/src/main/resources/logback.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration debug="false" scan="true" scanPeriod="30 seconds">
- <property name="projectName" value="onapui"/>
- <property name="logDir" value="../webapps/onapui/onapui_log"/>
- <property name="maxHistory" value="30"/>
- <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
-
- <appender name="consoleAppender" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n
- </pattern>
- </encoder>
- </appender>
-
- <appender name="errorAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDir}/error/error.%d{yyyy-MM}.log</fileNamePattern>
- <maxHistory>${maxHistory}</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>
- %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n
- </pattern>
- </encoder>
- </appender>
-
- <appender name="warnAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>WARN</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDir}/warn/warn.%d{yyyy-MM}.log</fileNamePattern>
- <maxHistory>${maxHistory}</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="infoAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>INFO</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDir}/info/info.%d{yyyy-MM}.log</fileNamePattern>
- <maxHistory>${maxHistory}</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="debugAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>DEBUG</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDir}/debug/debug.%d{yyyy-MM}.log</fileNamePattern>
- <maxHistory>${maxHistory}</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="traceAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>TRACE</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${logDir}/trace/trace.%d{yyyy-MM}.log</fileNamePattern>
- <maxHistory>${maxHistory}</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="info"/>
- <appender-ref ref="consoleAppender"/>
- <appender-ref ref="errorAppender"/>
- <appender-ref ref="warnAppender"/>
- <appender-ref ref="infoAppender"/>
- <appender-ref ref="debugAppender"/>
- <appender-ref ref="traceAppender"/>
- </root>
-</configuration>
diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml
deleted file mode 100644
index df44754..0000000
--- a/integration/src/main/resources/portalConfig/msb_register.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2016-2017, 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.
- 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.
--->
-<msbRegister>
- <msbHost>
- <hostIp>http://127.0.0.1</hostIp>
- <hostPort>80</hostPort>
- <msbApiRootDomain>/api/microservices/v1/services</msbApiRootDomain>
- </msbHost>
- <registerList>
- <registerInfo>
- <ip>127.0.0.1</ip>
- <port>8080</port>
- <url>/esr-gui</url>
- <path>/iui/aai-esr-gui</path>
- <serviceName>aai-esr-gui</serviceName>
- <protocol>UI</protocol>
- <visualRange>1</visualRange>
- <lb_policy>hash</lb_policy>
- <ttl>0</ttl>
- </registerInfo>
- </registerList>
-</msbRegister>
diff --git a/integration/src/main/webapp/WEB-INF/web.xml b/integration/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b4ddd68..0000000
--- a/integration/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>
- <display-name>ONAP Web Application</display-name>
- <welcome-file-list>
- <welcome-file>login/index.html</welcome-file>
- </welcome-file-list>
- <listener>
- <listener-class>org.onap.aai.esr.system.SystemListener</listener-class>
- </listener>
-</web-app>
diff --git a/pom.xml b/pom.xml
index 275d273..5affbcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
<modules>
<module>common</module>
<module>portal</module>
- <module>integration</module>
<module>distribution</module>
</modules>