From 2501584fe36ddfff7609201cebc2b8e443245178 Mon Sep 17 00:00:00 2001
From: luxin <luxin7@huawei.com>
Date: Wed, 4 Apr 2018 16:21:34 +0800
Subject: Modify expose port for multivimproxy

Change-Id: I3a43e86c8a4579066b187dafc5aca13f1a8c035e
Issue-ID: VFC-644
Signed-off-by: luxin <luxin7@huawei.com>
---
 deployment/src/main/release/conf/server.xml        | 27 +++++++++++-----------
 .../main/release/etc/adapterInfo/adapterinfo.json  | 22 ++++++++++--------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/deployment/src/main/release/conf/server.xml b/deployment/src/main/release/conf/server.xml
index f29dae3..aec465c 100644
--- a/deployment/src/main/release/conf/server.xml
+++ b/deployment/src/main/release/conf/server.xml
@@ -19,28 +19,29 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
-<Server port="9486" shutdown="SHUTDOWN">
-    <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-    <Listener SSLEngine="on" className="org.apache.catalina.core.AprLifecycleListener" />
-    <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-    <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-    <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+<Server port="9481" shutdown="SHUTDOWN">
+    <Listener className="org.apache.catalina.startup.VersionLoggerListener"/>
+    <Listener SSLEngine="on" className="org.apache.catalina.core.AprLifecycleListener"/>
+    <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
+    <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+    <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
     <GlobalNamingResources>
-        <Resource auth="Container" description="User database that can be updated and saved" factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-            name="UserDatabase" pathname="conf/tomcat-users.xml" type="org.apache.catalina.UserDatabase" />
+        <Resource auth="Container" description="User database that can be updated and saved"
+                  factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+                  name="UserDatabase" pathname="conf/tomcat-users.xml" type="org.apache.catalina.UserDatabase"/>
     </GlobalNamingResources>
     <Service name="Catalina">
-        <Connector connectionTimeout="20000" port="8486" protocol="HTTP/1.1" redirectPort="8443" />
-        <Connector port="8821" protocol="AJP/1.3" redirectPort="8443" />
+        <Connector connectionTimeout="20000" port="8481" protocol="HTTP/1.1" redirectPort="8443"/>
+        <Connector port="8821" protocol="AJP/1.3" redirectPort="8443"/>
         <Engine defaultHost="localhost" name="Catalina">
             <Realm className="org.apache.catalina.realm.LockOutRealm">
-                <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" />
+                <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/>
             </Realm>
 
             <Host appBase="webapps" autoDeploy="true" name="localhost" unpackWARs="true">
                 <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-                    pattern="%h %l %u %t &quot;%r&quot; %s %b" prefix="localhost_access_log" suffix=".txt" />
-                <Context docBase="ROOT" path="" reloadable="true" />
+                       pattern="%h %l %u %t &quot;%r&quot; %s %b" prefix="localhost_access_log" suffix=".txt"/>
+                <Context docBase="ROOT" path="" reloadable="true"/>
             </Host>
         </Engine>
     </Service>
diff --git a/deployment/src/main/release/etc/adapterInfo/adapterinfo.json b/deployment/src/main/release/etc/adapterInfo/adapterinfo.json
index 26d07c3..833197a 100644
--- a/deployment/src/main/release/etc/adapterInfo/adapterinfo.json
+++ b/deployment/src/main/release/etc/adapterInfo/adapterinfo.json
@@ -1,12 +1,14 @@
 {
-    "serviceName": "multivimproxy",
-    "version": "v1",
-    "url": "/api/multivimproxy/v1",
-    "protocol": "REST",
-    "visualRange": "1",
-    "nodes": [{
-        "ip": "127.0.0.1",
-        "port": "8486",
-        "ttl": 0
-    }]
+  "serviceName": "multivimproxy",
+  "version": "v1",
+  "url": "/api/multivimproxy/v1",
+  "protocol": "REST",
+  "visualRange": "1",
+  "nodes": [
+    {
+      "ip": "127.0.0.1",
+      "port": "8481",
+      "ttl": 0
+    }
+  ]
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg