From 511e3cb23574a8ed6b24b493a30eca3833392132 Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Mon, 20 Aug 2012 17:30:59 -0700
Subject: [PATCH] [ASFCS40]CS-15373: Awsapi port change to 7080.

Reviewed-By: Frank

Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack

Conflicts:

	awsapi/conf/cloud-bridge.properties
	client/tomcatconf/server-ssl.xml.in
---
 awsapi/conf/cloud-bridge.properties |   4 +-
 awsapi/conf/ec2-service.properties  |   2 +-
 build/build-aws-api.xml             |  49 ++++++------
 build/developer.xml                 |   1 +
 client/tomcatconf/server-nonssl.xml |  91 +++++++++++++++++++--
 client/tomcatconf/server-ssl.xml.in | 118 +++++++++++++++++++++++++---
 client/tomcatconf/server.xml.in     |  91 +++++++++++++++++++--
 7 files changed, 303 insertions(+), 53 deletions(-)

diff --git a/awsapi/conf/cloud-bridge.properties b/awsapi/conf/cloud-bridge.properties
index 123c18d0c38..4d1b23f86e7 100644
--- a/awsapi/conf/cloud-bridge.properties
+++ b/awsapi/conf/cloud-bridge.properties
@@ -15,11 +15,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-host=http://localhost:8080/awsapi
+host=http://localhost:7080/awsapi
 storage.root=/Users/john1/S3-Mount
 storage.multipartDir=__multipart__uploads__
 bucket.dns=false
-serviceEndpoint=localhost:8080
+serviceEndpoint=localhost:7080
 
 
 
diff --git a/awsapi/conf/ec2-service.properties b/awsapi/conf/ec2-service.properties
index 40398cb01b2..6af0f63fd11 100644
--- a/awsapi/conf/ec2-service.properties
+++ b/awsapi/conf/ec2-service.properties
@@ -16,7 +16,7 @@
 # under the License.
 
 managementServer=127.0.0.1
-cloudAPIPort=7080
+cloudAPIPort=8080
 cloudstackVersion=2.2.0
 WSDLVersion=2010-11-15
 keystore=xes.keystore
diff --git a/build/build-aws-api.xml b/build/build-aws-api.xml
index 5f11997f98f..04db51626f0 100644
--- a/build/build-aws-api.xml
+++ b/build/build-aws-api.xml
@@ -109,6 +109,7 @@
 	</target>
 	<target name="clean-awsapi-tomcat">
 		<delete dir="${tomcat.home}/webapps/awsapi" />
+		<delete dir="${tomcat.home}/webapps7080/awsapi" />
 	</target>
 	<path id="awsapi.classpath">
 		<path refid="deps.classpath" />
@@ -171,7 +172,7 @@
 		</jar>
 	</target>
 	<target name="deploy-axis" depends="-init-awsapi">
-		<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2.war" dest="${server.deploy.to.dir}/webapps/awsapi" />
+		<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" />
 	</target>
 	<condition property="access_key.private.notpresent">
 		<not>
@@ -197,34 +198,34 @@
 	</target>
 	<target name="deploy-awsapi" depends="deploy-axis">
 		<!--
-                <copy todir="${deploy.dir}/webapps/awsapi/WEB-INF/services">
+                <copy todir="${deploy.dir}/webapps7080/awsapi/WEB-INF/services">
                         <fileset dir="${dist.files.dir}">
                                 <include name="cloud-s3.aar"/>
                         </fileset>
                 </copy>
 		-->	
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/services">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/services">
 			<fileset dir="${dist.files.dir}">
 				<include name="cloud-ec2.aar" />
 			</fileset>
 		</copy>
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
 			<fileset dir="${dist.files.dir}">
 				<include name="cloud-auth-s3.mar" />
 			</fileset>
 		</copy>
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
 			<fileset dir="${dist.files.dir}">
 				<include name="cloud-auth-ec2.mar" />
 			</fileset>
 		</copy>
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
 			<fileset dir="${jar.dir}">
 				<include name="cloud-awsapi.jar" />
 				<include name="cloud-jasypt-1.8.jar" />
 			</fileset>
 		</copy>
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
 			<fileset dir="${base.dir}/deps/awsapi-lib">
 				<include name="*.jar" />
 				<exclude name="mysql-connector-java-5.1.7-bin.jar" />
@@ -241,30 +242,30 @@
 				<include name="**/*" />
 			</fileset>
 		</copy>
-		<copy overwrite="true" todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/conf">
+		<copy overwrite="true" todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/conf">
 			<fileset dir="${base.dir}/awsapi/resource/Axis2/">
 				<include name="axis2.xml" />
 			</fileset>
 		</copy>
-		<copy overwrite="true" todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF">
+		<copy overwrite="true" todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF">
 			<fileset dir="${base.dir}/awsapi/web/">
 				<include name="web.xml" />
 			</fileset>
 		</copy>
 		<!-- rampart lib goes where the axis lib files go -->
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
 			<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
 				<include name="*.jar" />
 			</fileset>
 		</copy>
 		<!-- copying over rampart mar files for WS-Security -->
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
 			<fileset dir="${base.dir}/awsapi/modules">
 				<include name="*.mar" />
 			</fileset>
 		</copy>
 		<!-- WS-Security requires this keystore -->
-		<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/classes">
+		<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/classes">
 			<fileset dir="${base.dir}/awsapi/resource/AmazonEC2">
 				<include name="crypto.properties" />
 				<include name="xes.keystore" />
@@ -272,7 +273,7 @@
 		</copy>
 	</target>
 	<target name="deploy-debian-install" depends="build-awsapi-jar, build-awsapi">
-		<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/services">
+		<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/services">
 			<fileset dir="${dist.files.dir}">
 				<!--                
                 <include name="cloud-s3.aar"/>
@@ -280,7 +281,7 @@
 				<include name="cloud-ec2.aar" />
 			</fileset>
 		</copy>
-		<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/modules">
+		<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/modules">
 			<fileset dir="${dist.files.dir}">
 				<include name="cloud-auth-s3.mar" />
 				<include name="cloud-auth-ec2.mar" />
@@ -289,7 +290,7 @@
 				<include name="*.mar" />
 			</fileset>
 		</copy>
-		<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/lib">
+		<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
 			<fileset dir="${base.dir}/rampart-lib">
 				<include name="*.jar" />
 			</fileset>
@@ -303,7 +304,7 @@
 				<include name="*.jar" />
 			</fileset>
 		</copy>
-		<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/classes">
+		<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/classes">
 			<fileset dir="${base.dir}/resource/AmazonEC2">
 				<include name="crypto.properties" />
 				<include name="xes.keystore" />
@@ -317,12 +318,12 @@
 				<include name="**/*" />
 			</fileset>
 		</copy -->
-		<copy overwrite="true" todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/conf">
+		<copy overwrite="true" todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/conf">
 			<fileset dir="${base.dir}/awsapi/resource/Axis2/">
 				<include name="axis2.xml" />
 			</fileset>
 		</copy>
-		<copy overwrite="true" todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF">
+		<copy overwrite="true" todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF">
 			<fileset dir="${base.dir}/awsapi/web/">
 				<include name="web.xml" />
 			</fileset>
@@ -345,7 +346,7 @@
 		</copy>
 	</target>
 	<target name="deploy-rpm-install" depends="build-awsapi-jar, build-awsapi">
-		<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/services">
+		<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/services">
 			<fileset dir="${dist.files.dir}">
 <!--                
                 <include name="cloud-s3.aar"/>
@@ -353,7 +354,7 @@
 				<include name="cloud-ec2.aar" />
 			</fileset>
 		</copy>
-		<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/modules">
+		<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/modules">
 			<fileset dir="${dist.files.dir}">
 				<include name="cloud-auth-s3.mar" />
 				<include name="cloud-auth-ec2.mar" />
@@ -362,7 +363,7 @@
 				<include name="*.mar" />
 			</fileset>
 		</copy>
-		<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/lib">
+		<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
             <fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
 				<include name="*.jar" />
 			</fileset>
@@ -376,7 +377,7 @@
 				<include name="*.jar" />
 			</fileset>
 		</copy>
-		<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/classes">
+		<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/classes">
             <fileset dir="${base.dir}/awsapi/resource/AmazonEC2">
 				<include name="crypto.properties" />
 				<include name="xes.keystore" />
@@ -387,12 +388,12 @@
 				<include name="**/*" />
 			</fileset>
 		</copy>
-		<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/conf">
+		<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/conf">
 			<fileset dir="${base.dir}/awsapi/resource/Axis2/">
 				<include name="axis2.xml" />
 			</fileset>
 		</copy>
-		<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF">
+		<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF">
 			<fileset dir="${base.dir}/awsapi/web/">
 				<include name="web.xml" />
 			</fileset>
diff --git a/build/developer.xml b/build/developer.xml
index 544fac693f4..f2e5aa6463e 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -143,6 +143,7 @@
   <target name="clean-tomcat" depends="stop-tomcat,clean-awsapi-tomcat">
     <delete dir="${tomcat.home}/webapps/client"/>
     <delete dir="${tomcat.home}/webapps/awsapi" />
+	<delete dir="${tomcat.home}/webapps7080/awsapi" />
     <delete dir="${tomcat.home}/work/Catalina"/>
     <delete dir="${tomcat.home}/temp" />
     <delete dir="${tomcat.home}/logs" />
diff --git a/client/tomcatconf/server-nonssl.xml b/client/tomcatconf/server-nonssl.xml
index 0b627b228cd..607b0b3b8d6 100755
--- a/client/tomcatconf/server-nonssl.xml
+++ b/client/tomcatconf/server-nonssl.xml
@@ -54,8 +54,6 @@
     <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" 
         maxThreads="150" minSpareThreads="25"/>
     
-    <Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" 
-        maxThreads="150" minSpareThreads="25"/>
     
     <!-- A "Connector" represents an endpoint by which requests are received
          and responses are returned. Documentation at :
@@ -76,12 +74,7 @@
                acceptCount="150" enableLookups="false" maxThreads="150"
                maxHttpHeaderSize="8192" redirectPort="8443" />
 
-	<Connector executor="tomcatThreadPool-internal" address="127.0.0.1"
-               port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol" 
-               connectionTimeout="20000" disableUploadTimeout="true"
-               acceptCount="150" enableLookups="false" maxThreads="150"
-               maxHttpHeaderSize="8192" redirectPort="8443" />
-			   
+	   
     <!-- Define a SSL HTTP/1.1 Connector on port 8443
          This connector uses the JSSE configuration, when using APR, the 
          connector should be using the OpenSSL style configuration
@@ -153,4 +146,86 @@
       </Host>
     </Engine>
   </Service>
+  
+  <Service name="Catalina7080">
+  
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+	
+	<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" 
+        maxThreads="150" minSpareThreads="25"/>
+    
+	<Connector executor="tomcatThreadPool-internal"
+               port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol" 
+               connectionTimeout="20000" disableUploadTimeout="true"
+               acceptCount="150" enableLookups="false" maxThreads="150"
+               maxHttpHeaderSize="8192" redirectPort="8443" />
+			   
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443
+         This connector uses the JSSE configuration, when using APR, the 
+         connector should be using the OpenSSL style configuration
+         described in the APR documentation -->
+    <!--
+    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" 
+               keystoreType="PKCS12"
+	       keystoreFile="conf\cloud-localhost.pk12" 
+	       keystorePass="password"
+               />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 20400 -->
+
+
+    <!-- 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 -->
+
+    <Engine name="Catalina7080" 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"/>
+      -->        
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request and response data received and sent by Tomcat.
+           Documentation at: /docs/config/valve.html -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- 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"/>
+
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost"  appBase="webapps7080"
+            unpackWARs="true" autoDeploy="true"
+            xmlValidation="false" xmlNamespaceAware="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html -->
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"  
+               prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+
+      </Host>
+    </Engine>
+  </Service>
+
 </Server>
diff --git a/client/tomcatconf/server-ssl.xml.in b/client/tomcatconf/server-ssl.xml.in
index 8cba79ffdda..3ea43dc832d 100755
--- a/client/tomcatconf/server-ssl.xml.in
+++ b/client/tomcatconf/server-ssl.xml.in
@@ -54,8 +54,6 @@
     <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" 
         maxThreads="150" minSpareThreads="25"/>
     
-	<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" 
-        maxThreads="150" minSpareThreads="25"/>
     
     <!-- A "Connector" represents an endpoint by which requests are received
          and responses are returned. Documentation at :
@@ -98,14 +96,7 @@
                keystoreType="JKS"
                keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
                keystorePass="vmops.com"/>
-
-	<Connector executor="tomcatThreadPool-internal" address="127.0.0.1" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
-               maxThreads="150" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" 
-               keystoreType="JKS"
-               keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
-               keystorePass="vmops.com"/>
-
+			   
     <!-- Define an AJP 1.3 Connector on port 20400 -->
     <Connector port="20400" protocol="AJP/1.3" redirectPort="6443" />
 
@@ -163,4 +154,111 @@
       </Host>
     </Engine>
   </Service>
+
+  <Service name="Catalina7080">
+  
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" 
+        maxThreads="150" minSpareThreads="25"/>
+    
+    <!-- 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 HTTP/1.1 Connector on port 8080
+    -->
+    <!-- 
+    <Connector port="8080" protocol="HTTP/1.1" 
+               connectionTimeout="20000" 
+               redirectPort="8443" />
+    -->
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol" 
+               connectionTimeout="20000" disableUploadTimeout="true"
+               acceptCount="150" enableLookups="false" maxThreads="150"
+               maxHttpHeaderSize="8192" redirectPort="8443" />
+    -->
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443
+         This connector uses the JSSE configuration, when using APR, the 
+         connector should be using the OpenSSL style configuration
+         described in the APR documentation -->
+    <!--
+    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" 
+               keystoreType="PKCS12"
+	       keystoreFile="conf\cloud-localhost.pk12" 
+	       keystorePass="password"
+               />
+    -->
+
+    <!-- Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6 -->
+  	<Connector executor="tomcatThreadPool-internal" port="5443" protocol="org.apache.coyote.http11.Http11NioProtocol" SSLEnabled="true"
+>>>>>>> bcfd64a... CS-15373: Awsapi port change to 7080.
+               maxThreads="150" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" 
+               keystoreType="JKS"
+               keystoreFile="/etc/cloud/management/cloudmanagementserver.keystore"
+               keystorePass="vmops.com"/>
+			   
+    <!-- Define an AJP 1.3 Connector on port 20400 -->
+    <Connector port="20400" protocol="AJP/1.3" redirectPort="6443" />
+
+
+    <!-- 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="Catalina7080" 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"/>
+      -->        
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request and response data received and sent by Tomcat.
+           Documentation at: /docs/config/valve.html -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- 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"/>
+
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost"  appBase="webapps7080"
+            unpackWARs="true" autoDeploy="true"
+            xmlValidation="false" xmlNamespaceAware="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html -->
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"  
+               prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+
+      </Host>
+    </Engine>
+  </Service>
 </Server>
diff --git a/client/tomcatconf/server.xml.in b/client/tomcatconf/server.xml.in
index 71b98a9e197..8f65b060431 100644
--- a/client/tomcatconf/server.xml.in
+++ b/client/tomcatconf/server.xml.in
@@ -54,9 +54,7 @@
     <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" 
         maxThreads="150" minSpareThreads="25"/>
     
-	<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" 
-        maxThreads="150" minSpareThreads="25"/>
-    
+
     <!-- 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)
@@ -76,11 +74,6 @@
                acceptCount="150" enableLookups="false" maxThreads="150"
                maxHttpHeaderSize="8192" redirectPort="8443" />
 
-	<Connector executor="tomcatThreadPool-internal" address="127.0.0.1"
-               port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol" 
-               connectionTimeout="20000" disableUploadTimeout="true"
-               acceptCount="150" enableLookups="false" maxThreads="150"
-               maxHttpHeaderSize="8192" redirectPort="8443" />
 			   
     <!-- Define a SSL HTTP/1.1 Connector on port 8443
          This connector uses the JSSE configuration, when using APR, the 
@@ -153,4 +146,86 @@
       </Host>
     </Engine>
   </Service>
+  
+
+  <Service name="Catalina7080">
+  
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+	<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-" 
+        maxThreads="150" minSpareThreads="25"/>
+    
+	<Connector executor="tomcatThreadPool-internal"
+               port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol" 
+               connectionTimeout="20000" disableUploadTimeout="true"
+               acceptCount="150" enableLookups="false" maxThreads="150"
+               maxHttpHeaderSize="8192" redirectPort="8443" />
+			   
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443
+         This connector uses the JSSE configuration, when using APR, the 
+         connector should be using the OpenSSL style configuration
+         described in the APR documentation -->
+    <!--
+    <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+               maxThreads="150" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" 
+               keystoreType="PKCS12"
+	       keystoreFile="conf\cloud-localhost.pk12" 
+	       keystorePass="password"
+               />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 20400 -->
+
+
+    <!-- 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 -->
+
+    <Engine name="Catalina7080" 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"/>
+      -->        
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request and response data received and sent by Tomcat.
+           Documentation at: /docs/config/valve.html -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- 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"/>
+
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost"  appBase="webapps7080"
+            unpackWARs="true" autoDeploy="true"
+            xmlValidation="false" xmlNamespaceAware="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html -->
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"  
+               prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+
+      </Host>
+    </Engine>
+  </Service>
+
 </Server>