From 5f87e77ba8b3fbfa60ead9be883484827abd90c1 Mon Sep 17 00:00:00 2001
From: QiLiang <liangqi1@huawei.com>
Date: Fri, 18 Dec 2015 08:39:03 +0000
Subject: Update control configure

Bug fix and scripts clean

JIRA:BOTTLENECK-24

Change-Id: Iaeb84f6abaebc32372ab8e8d7636d1ea0bb6b343
Signed-off-by: QiLiang <liangqi1@huawei.com>
---
 rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml | 79 +++++++++++++++++++++
 .../1-1-1/tomcat_conf/server.xml-ubuntu            | 81 ----------------------
 2 files changed, 79 insertions(+), 81 deletions(-)
 create mode 100644 rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
 delete mode 100644 rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml-ubuntu

(limited to 'rubbos/rubbos_scripts/1-1-1/tomcat_conf')

diff --git a/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml b/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
new file mode 100644
index 00000000..525c4398
--- /dev/null
+++ b/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml
@@ -0,0 +1,79 @@
+
+<Server port="8005" shutdown="SHUTDOWN">
+
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+
+  <!-- Global JNDI resources -->
+  <GlobalNamingResources>
+
+    <!-- Test entry for demonstration purposes -->
+    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
+
+    <!-- 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" />
+
+  </GlobalNamingResources>
+
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Catalina">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+    -->
+
+    <!-- Define a non-SSL HTTP/1.1 Connector on port 2117 (default 8080) -->
+    <Connector port="8080" maxHttpHeaderSize="8192"
+               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
+               enableLookups="false" redirectPort="8443" acceptCount="6000"
+               connectionTimeout="20000" disableUploadTimeout="true" />
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009"
+               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
+               acceptCount="6000" redirectPort="8443" protocol="AJP/1.3" />
+
+    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
+    <!-- See proxy documentation for more information about using this. -->
+    <!--
+    <Connector port="8082"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" acceptCount="100" connectionTimeout="20000"
+               proxyPort="80" disableUploadTimeout="true" />
+    -->
+
+    <!-- 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). -->
+
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine jvmRoute="TOMCAT1" name="Catalina" defaultHost="localhost">
+
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase"/>
+
+      <!-- Define the default virtual host -->
+
+      <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
+
+   <!--    <Context path="" docBase="webapps" debug="0" reloadable="true"/> -->
+
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+      </Host>
+
+
+    </Engine>
+
+  </Service>
+
+</Server>
+
diff --git a/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml-ubuntu b/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml-ubuntu
deleted file mode 100644
index 0998a819..00000000
--- a/rubbos/rubbos_scripts/1-1-1/tomcat_conf/server.xml-ubuntu
+++ /dev/null
@@ -1,81 +0,0 @@
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
- 
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
- 
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
- 
-    <!-- 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" />
- 
-  </GlobalNamingResources>
- 
- 
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
- 
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-    -->
- 
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 2117 (default 8080) -->
-    <Connector port="8080" maxHttpHeaderSize="8192"
-               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
-               enableLookups="false" redirectPort="8443" acceptCount="6000"
-               connectionTimeout="20000" disableUploadTimeout="true" />
- 
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009"
-               maxThreads="330" minSpareThreads="5" maxSpareThreads="50"
-               acceptCount="6000" redirectPort="8443" protocol="AJP/1.3" />
- 
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" acceptCount="100" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
- 
-    <!-- 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). -->
-      
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine jvmRoute="TOMCAT1" name="Catalina" defaultHost="localhost">
- 
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
- 
-      <!-- Define the default virtual host -->
- 
-      <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
-
-   <!--    <Context path="" docBase="webapps" debug="0" reloadable="true"/> -->
- 
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-      </Host>
- 
- 
-    </Engine>
- 
-  </Service>
- 
-</Server>
-
-
-
-- 
cgit 1.2.3-korg