From 70ad2089b0db72d08159aec51b1d5c82b7edf166 Mon Sep 17 00:00:00 2001
From: sunqi310 <sun.qi310@zte.com.cn>
Date: Wed, 21 Sep 2016 17:24:18 +0800
Subject: TOSCA-69 Modify the default port of http server

Change-Id: Ibbe9f1ee1e6b2ade52c75ee01c9facad0aa4df58
Issue-id: TOSCA-69
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
---
 .../catalog-standalone/src/main/assembly/conf/catalog.yml             | 2 +-
 catalog-core/httpserver/pom.xml                                       | 4 +++-
 catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml      | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'catalog-core')

diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
index 97ec352f..f077c2de 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml
@@ -20,7 +20,7 @@ defaultName: ${DW_DEFAULT_NAME:-Stranger}
 
 msbServerAddr: http://127.0.0.1:80
 
-httpServerAddr: http://127.0.0.1:8080
+httpServerAddr: http://127.0.0.1:8201
 
 parserType: zte
 
diff --git a/catalog-core/httpserver/pom.xml b/catalog-core/httpserver/pom.xml
index a7480987..dd5ff6d9 100644
--- a/catalog-core/httpserver/pom.xml
+++ b/catalog-core/httpserver/pom.xml
@@ -95,7 +95,9 @@
                         </goals>
                         <configuration>
                             <tasks name="${project.artifactId}">
-                                <copydir src="src/main/assembly/" dest="target/assembly"/>
+                                <delete file="target/assembly/tomcat/conf/server.xml"/>
+                                <delete file="target/assembly/tomcat/conf/web.xml"/>
+                                <copydir src="src/main/assembly/" dest="target/assembly" />
                                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
                                     <zipfileset dir="target/assembly" includes="**"/>
                                 </zip>
diff --git a/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml b/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml
index 2c34c9d6..5b4066ca 100644
--- a/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml
+++ b/catalog-core/httpserver/src/main/assembly/tomcat/conf/server.xml
@@ -20,7 +20,7 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
-<Server port="8005" shutdown="SHUTDOWN">
+<Server port="48005" shutdown="SHUTDOWN">
   <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />
@@ -91,7 +91,7 @@
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+    <!--<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />-->
 
 
     <!-- An Engine represents the entry point (within Catalina) that processes
-- 
cgit 1.2.3-korg