update the license.

Change-Id: Iae9b27b6423129c27dd1debfe20ac42c06129c06
Signed-off-by: jiaxiangli <jiaxiangli@huawei.com>

1 files changed, 33 insertions, 78 deletions

diff --git a/servicegateway/deployment/src/main/release/conf/server.xml b/servicegateway/deployment/src/main/release/conf/server.xml
index ffd05e81..a5af6154 100644
--- a/servicegateway/deployment/src/main/release/conf/server.xml
+++ b/servicegateway/deployment/src/main/release/conf/server.xml
@@ -1,92 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file 
-    distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to You 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. -->
-<!-- Note: A "Server" is not itself a "Container", so you may not define subcomponents such as "Valves" at this level. Documentation 
-    at /docs/config/server.html -->
-<Server port="-1" shutdown="SHUTDOWN">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8306" shutdown="SHUTDOWN">
     <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-    <!-- Security listener. Documentation at /docs/config/listeners.html <Listener className="org.apache.catalina.security.SecurityListener" 
-        /> -->
-    <!--APR library loader. Documentation at /docs/apr.html -->
-    <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-    <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
-    <Listener className="org.apache.catalina.core.JasperListener" />
-    <!-- Prevent memory leaks due to use of particular java/javax APIs -->
+    <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" />
-
-    <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html -->
     <GlobalNamingResources>
-        <!-- Editable user database that can also be used by UserDatabaseRealm to authenticate users -->
-        <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved"
-            factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml" />
+        <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>
-
-    <!-- A "Service" is a collection of one or more "Connectors" that share a single "Container" Note: A "Service" is not 
-        itself a "Container", so you may not define subcomponents such as "Valves" at this level. Documentation at /docs/config/service.html -->
     <Service name="Catalina">
-
-        <!--The connectors can use a shared executor, you can define one or more named thread pools -->
-        <!-- <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> -->
-
-
-        <!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation 
-            at : Java HTTP Connector: /docs/config/http.html (blocking & non-blocking) Java AJP Connector: /docs/config/ajp.html APR 
-            (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 -->
-
-        <Connector port="8300" protocol="org.openo.cloudsop.initconfig.tool.CustomHttp11Protocol" scheme="https"
-            sslEnabledProtocols="TLSv1.2" connectionTimeout="20000" maxPostSize="2097152" maxHttpHeaderSize="8192"
-            allowTrace="false" />
-
-        <!-- A "Connector" using the shared thread pool -->
-        <!-- <Connector executor="tomcatThreadPool" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" 
-            /> -->
-        <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 This connector uses the NIO implementation that requires the 
-            JSSE style configuration. When using the APR/native implementation, the OpenSSL style configuration is required as described 
-            in the APR/native documentation -->
-        <!-- <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" maxThreads="150" SSLEnabled="true" 
-            scheme="https" secure="true" clientAuth="false" sslProtocol="TLS" /> -->
-
-        <!-- Define an AJP 1.3 Connector on port 8009 -->
-        <!-- <Connector port="18009" protocol="AJP/1.3" redirectPort="8443" /> -->
-
-
-        <!-- An Engine represents the entry point (within Catalina) that processes every request. The Engine implementation 
-            for Tomcat stand alone analyzes the HTTP headers included with the request, and passes them on to the appropriate Host (virtual 
-            host). Documentation at /docs/config/engine.html -->
-
-        <!-- You should set jvmRoute to support load-balancing via AJP ie : <Engine name="Catalina" defaultHost="localhost" 
-            jvmRoute="jvm1"> -->
-        <Engine name="Catalina" defaultHost="localhost">
-
-            <!--For clustering, please take a look at documentation at: /docs/cluster-howto.html (simple how to) /docs/config/cluster.html 
-                (reference documentation) -->
-            <!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> -->
-
-            <!-- Use the LockOutRealm to prevent attempts to guess user passwords via a brute-force attack -->
+        <Connector connectionTimeout="20000" port="8503" protocol="HTTP/1.1" redirectPort="8443" />
+        <Connector port="8305" protocol="AJP/1.3" redirectPort="8443" />
+        <Engine defaultHost="localhost" name="Catalina">
             <Realm className="org.apache.catalina.realm.LockOutRealm">
-                <!-- This Realm uses the UserDatabase configured in the global JNDI resources under the key "UserDatabase". 
-                    Any edits that are performed against this UserDatabase are immediately available for use by the Realm. -->
                 <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" />
             </Realm>
 
-            <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="false" deployOnStartup="false">
-                <!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html -->
-                <!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> -->
-                <Context path="/" reloadable="false" docBase="ROOT" workDir="${TOMCAT_WORK_DIR}">
-                    <Manager className="com.huawei.cloudsop.tomcat.api.session.StandardManagerExt" />
-                </Context>
-                <!-- Access log processes all example. Documentation at: /docs/config/valve.html Note: The pattern used is 
-                    equivalent to using pattern="common" -->
-                <Valve className="com.huawei.cloudsop.tomcat.api.log.AccessLogValveExt" pattern="%h %l %u %t &quot;%r&quot; %s %b %{x-request-id}i" />
-
+            <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" />
             </Host>
         </Engine>
     </Service>
-</Server>
+</Server>
\ No newline at end of file