Skip to content

Commit 511e3cb

Browse files
author
Prachi Damle
committed
[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
1 parent 4bffd71 commit 511e3cb

7 files changed

Lines changed: 299 additions & 49 deletions

File tree

‎awsapi/conf/cloud-bridge.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
host=http://localhost:8080/awsapi
18+
host=http://localhost:7080/awsapi
1919
storage.root=/Users/john1/S3-Mount
2020
storage.multipartDir=__multipart__uploads__
2121
bucket.dns=false
22-
serviceEndpoint=localhost:8080
22+
serviceEndpoint=localhost:7080
2323

2424

2525

‎awsapi/conf/ec2-service.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# under the License.
1717

1818
managementServer=127.0.0.1
19-
cloudAPIPort=7080
19+
cloudAPIPort=8080
2020
cloudstackVersion=2.2.0
2121
WSDLVersion=2010-11-15
2222
keystore=xes.keystore

‎build/build-aws-api.xml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
</target>
110110
<target name="clean-awsapi-tomcat">
111111
<delete dir="${tomcat.home}/webapps/awsapi" />
112+
<delete dir="${tomcat.home}/webapps7080/awsapi" />
112113
</target>
113114
<path id="awsapi.classpath">
114115
<path refid="deps.classpath" />
@@ -171,7 +172,7 @@
171172
</jar>
172173
</target>
173174
<target name="deploy-axis" depends="-init-awsapi">
174-
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2.war" dest="${server.deploy.to.dir}/webapps/awsapi" />
175+
<unwar overwrite="true" src="${base.dir}/deps/awsapi-lib/axis2.war" dest="${server.deploy.to.dir}/webapps7080/awsapi" />
175176
</target>
176177
<condition property="access_key.private.notpresent">
177178
<not>
@@ -197,34 +198,34 @@
197198
</target>
198199
<target name="deploy-awsapi" depends="deploy-axis">
199200
<!--
200-
<copy todir="${deploy.dir}/webapps/awsapi/WEB-INF/services">
201+
<copy todir="${deploy.dir}/webapps7080/awsapi/WEB-INF/services">
201202
<fileset dir="${dist.files.dir}">
202203
<include name="cloud-s3.aar"/>
203204
</fileset>
204205
</copy>
205206
-->
206-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/services">
207+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/services">
207208
<fileset dir="${dist.files.dir}">
208209
<include name="cloud-ec2.aar" />
209210
</fileset>
210211
</copy>
211-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
212+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
212213
<fileset dir="${dist.files.dir}">
213214
<include name="cloud-auth-s3.mar" />
214215
</fileset>
215216
</copy>
216-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
217+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
217218
<fileset dir="${dist.files.dir}">
218219
<include name="cloud-auth-ec2.mar" />
219220
</fileset>
220221
</copy>
221-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
222+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
222223
<fileset dir="${jar.dir}">
223224
<include name="cloud-awsapi.jar" />
224225
<include name="cloud-jasypt-1.8.jar" />
225226
</fileset>
226227
</copy>
227-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
228+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
228229
<fileset dir="${base.dir}/deps/awsapi-lib">
229230
<include name="*.jar" />
230231
<exclude name="mysql-connector-java-5.1.7-bin.jar" />
@@ -241,46 +242,46 @@
241242
<include name="**/*" />
242243
</fileset>
243244
</copy>
244-
<copy overwrite="true" todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/conf">
245+
<copy overwrite="true" todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/conf">
245246
<fileset dir="${base.dir}/awsapi/resource/Axis2/">
246247
<include name="axis2.xml" />
247248
</fileset>
248249
</copy>
249-
<copy overwrite="true" todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF">
250+
<copy overwrite="true" todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF">
250251
<fileset dir="${base.dir}/awsapi/web/">
251252
<include name="web.xml" />
252253
</fileset>
253254
</copy>
254255
<!-- rampart lib goes where the axis lib files go -->
255-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/lib">
256+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/lib">
256257
<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
257258
<include name="*.jar" />
258259
</fileset>
259260
</copy>
260261
<!-- copying over rampart mar files for WS-Security -->
261-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/modules">
262+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/modules">
262263
<fileset dir="${base.dir}/awsapi/modules">
263264
<include name="*.mar" />
264265
</fileset>
265266
</copy>
266267
<!-- WS-Security requires this keystore -->
267-
<copy todir="${server.deploy.to.dir}/webapps/awsapi/WEB-INF/classes">
268+
<copy todir="${server.deploy.to.dir}/webapps7080/awsapi/WEB-INF/classes">
268269
<fileset dir="${base.dir}/awsapi/resource/AmazonEC2">
269270
<include name="crypto.properties" />
270271
<include name="xes.keystore" />
271272
</fileset>
272273
</copy>
273274
</target>
274275
<target name="deploy-debian-install" depends="build-awsapi-jar, build-awsapi">
275-
<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/services">
276+
<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/services">
276277
<fileset dir="${dist.files.dir}">
277278
<!--
278279
<include name="cloud-s3.aar"/>
279280
-->
280281
<include name="cloud-ec2.aar" />
281282
</fileset>
282283
</copy>
283-
<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/modules">
284+
<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/modules">
284285
<fileset dir="${dist.files.dir}">
285286
<include name="cloud-auth-s3.mar" />
286287
<include name="cloud-auth-ec2.mar" />
@@ -289,7 +290,7 @@
289290
<include name="*.mar" />
290291
</fileset>
291292
</copy>
292-
<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/lib">
293+
<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
293294
<fileset dir="${base.dir}/rampart-lib">
294295
<include name="*.jar" />
295296
</fileset>
@@ -303,7 +304,7 @@
303304
<include name="*.jar" />
304305
</fileset>
305306
</copy>
306-
<copy todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/classes">
307+
<copy todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/classes">
307308
<fileset dir="${base.dir}/resource/AmazonEC2">
308309
<include name="crypto.properties" />
309310
<include name="xes.keystore" />
@@ -317,12 +318,12 @@
317318
<include name="**/*" />
318319
</fileset>
319320
</copy -->
320-
<copy overwrite="true" todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF/conf">
321+
<copy overwrite="true" todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF/conf">
321322
<fileset dir="${base.dir}/awsapi/resource/Axis2/">
322323
<include name="axis2.xml" />
323324
</fileset>
324325
</copy>
325-
<copy overwrite="true" todir="${debian.tomcat.dir}/webapps/awsapi/WEB-INF">
326+
<copy overwrite="true" todir="${debian.tomcat.dir}/webapps7080/awsapi/WEB-INF">
326327
<fileset dir="${base.dir}/awsapi/web/">
327328
<include name="web.xml" />
328329
</fileset>
@@ -345,15 +346,15 @@
345346
</copy>
346347
</target>
347348
<target name="deploy-rpm-install" depends="build-awsapi-jar, build-awsapi">
348-
<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/services">
349+
<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/services">
349350
<fileset dir="${dist.files.dir}">
350351
<!--
351352
<include name="cloud-s3.aar"/>
352353
-->
353354
<include name="cloud-ec2.aar" />
354355
</fileset>
355356
</copy>
356-
<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/modules">
357+
<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/modules">
357358
<fileset dir="${dist.files.dir}">
358359
<include name="cloud-auth-s3.mar" />
359360
<include name="cloud-auth-ec2.mar" />
@@ -362,7 +363,7 @@
362363
<include name="*.mar" />
363364
</fileset>
364365
</copy>
365-
<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/lib">
366+
<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/lib">
366367
<fileset dir="${base.dir}/deps/awsapi-lib/rampart-lib">
367368
<include name="*.jar" />
368369
</fileset>
@@ -376,7 +377,7 @@
376377
<include name="*.jar" />
377378
</fileset>
378379
</copy>
379-
<copy todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/classes">
380+
<copy todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/classes">
380381
<fileset dir="${base.dir}/awsapi/resource/AmazonEC2">
381382
<include name="crypto.properties" />
382383
<include name="xes.keystore" />
@@ -387,12 +388,12 @@
387388
<include name="**/*" />
388389
</fileset>
389390
</copy>
390-
<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF/conf">
391+
<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF/conf">
391392
<fileset dir="${base.dir}/awsapi/resource/Axis2/">
392393
<include name="axis2.xml" />
393394
</fileset>
394395
</copy>
395-
<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps/awsapi/WEB-INF">
396+
<copy overwrite="true" todir="${rpm.tomcat.dir}/webapps7080/awsapi/WEB-INF">
396397
<fileset dir="${base.dir}/awsapi/web/">
397398
<include name="web.xml" />
398399
</fileset>

‎build/developer.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<target name="clean-tomcat" depends="stop-tomcat,clean-awsapi-tomcat">
144144
<delete dir="${tomcat.home}/webapps/client"/>
145145
<delete dir="${tomcat.home}/webapps/awsapi" />
146+
<delete dir="${tomcat.home}/webapps7080/awsapi" />
146147
<delete dir="${tomcat.home}/work/Catalina"/>
147148
<delete dir="${tomcat.home}/temp" />
148149
<delete dir="${tomcat.home}/logs" />

‎client/tomcatconf/server-nonssl.xml‎

Lines changed: 83 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
5555
maxThreads="150" minSpareThreads="25"/>
5656

57-
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
58-
maxThreads="150" minSpareThreads="25"/>
5957

6058
<!-- A "Connector" represents an endpoint by which requests are received
6159
and responses are returned. Documentation at :
@@ -76,12 +74,7 @@
7674
acceptCount="150" enableLookups="false" maxThreads="150"
7775
maxHttpHeaderSize="8192" redirectPort="8443" />
7876

79-
<Connector executor="tomcatThreadPool-internal" address="127.0.0.1"
80-
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
81-
connectionTimeout="20000" disableUploadTimeout="true"
82-
acceptCount="150" enableLookups="false" maxThreads="150"
83-
maxHttpHeaderSize="8192" redirectPort="8443" />
84-
77+
8578
<!-- Define a SSL HTTP/1.1 Connector on port 8443
8679
This connector uses the JSSE configuration, when using APR, the
8780
connector should be using the OpenSSL style configuration
@@ -153,4 +146,86 @@
153146
</Host>
154147
</Engine>
155148
</Service>
149+
150+
<Service name="Catalina7080">
151+
152+
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
153+
154+
<Executor name="tomcatThreadPool-internal" namePrefix="catalina-exec-int-"
155+
maxThreads="150" minSpareThreads="25"/>
156+
157+
<Connector executor="tomcatThreadPool-internal"
158+
port="7080" protocol="org.apache.coyote.http11.Http11NioProtocol"
159+
connectionTimeout="20000" disableUploadTimeout="true"
160+
acceptCount="150" enableLookups="false" maxThreads="150"
161+
maxHttpHeaderSize="8192" redirectPort="8443" />
162+
163+
<!-- Define a SSL HTTP/1.1 Connector on port 8443
164+
This connector uses the JSSE configuration, when using APR, the
165+
connector should be using the OpenSSL style configuration
166+
described in the APR documentation -->
167+
<!--
168+
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
169+
maxThreads="150" scheme="https" secure="true"
170+
clientAuth="false" sslProtocol="TLS"
171+
keystoreType="PKCS12"
172+
keystoreFile="conf\cloud-localhost.pk12"
173+
keystorePass="password"
174+
/>
175+
-->
176+
177+
<!-- Define an AJP 1.3 Connector on port 20400 -->
178+
179+
180+
<!-- An Engine represents the entry point (within Catalina) that processes
181+
every request. The Engine implementation for Tomcat stand alone
182+
analyzes the HTTP headers included with the request, and passes them
183+
on to the appropriate Host (virtual host).
184+
Documentation at /docs/config/engine.html -->
185+
186+
<Engine name="Catalina7080" defaultHost="localhost">
187+
188+
<!--For clustering, please take a look at documentation at:
189+
/docs/cluster-howto.html (simple how to)
190+
/docs/config/cluster.html (reference documentation) -->
191+
<!--
192+
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
193+
-->
194+
195+
<!-- The request dumper valve dumps useful debugging information about
196+
the request and response data received and sent by Tomcat.
197+
Documentation at: /docs/config/valve.html -->
198+
<!--
199+
<Valve className="org.apache.catalina.valves.RequestDumperValve"/>
200+
-->
201+
202+
<!-- This Realm uses the UserDatabase configured in the global JNDI
203+
resources under the key "UserDatabase". Any edits
204+
that are performed against this UserDatabase are immediately
205+
available for use by the Realm. -->
206+
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
207+
resourceName="UserDatabase"/>
208+
209+
<!-- Define the default virtual host
210+
Note: XML Schema validation will not work with Xerces 2.2.
211+
-->
212+
<Host name="localhost" appBase="webapps7080"
213+
unpackWARs="true" autoDeploy="true"
214+
xmlValidation="false" xmlNamespaceAware="false">
215+
216+
<!-- SingleSignOn valve, share authentication between web applications
217+
Documentation at: /docs/config/valve.html -->
218+
<!--
219+
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
220+
-->
221+
222+
<!-- Access log processes all example.
223+
Documentation at: /docs/config/valve.html -->
224+
<Valve className="org.apache.catalina.valves.FastCommonAccessLogValve" directory="logs"
225+
prefix="access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
226+
227+
</Host>
228+
</Engine>
229+
</Service>
230+
156231
</Server>

0 commit comments

Comments
 (0)