cloudstack/client/tomcatconf
Prachi Damle 511e3cb235 [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
2012-08-21 16:27:55 -07:00
..
catalina.policy.in Source code committed 2010-08-11 09:13:29 -07:00
catalina.properties.in Source code committed 2010-08-11 09:13:29 -07:00
cisconexusvsm_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
classpath.conf.in License header update for the client folder 2012-08-01 13:49:10 -04:00
cloudmanagementserver.keystore Bug 9479 - provide option for built in https 2011-09-01 16:01:28 -07:00
commands-ext.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
commands.properties.in Probably a left-over of a merge conflict 2012-08-02 09:33:48 +02:00
components-cloudzones.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
components.xml.in Merge branch 'master' into vpc 2012-08-01 19:04:28 -07:00
context.xml.in Source code committed 2010-08-11 09:13:29 -07:00
db-enc.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
db.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
ehcache.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
environment.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
f5bigip_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
junipersrx_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
log4j-cloud.xml.in License header update for the client folder 2012-08-01 13:49:10 -04:00
logging.properties.in Source code committed 2010-08-11 09:13:29 -07:00
netscalerloadbalancer_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
nicira-nvp_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
server-nonssl.xml [ASFCS40]CS-15373: Awsapi port change to 7080. 2012-08-21 16:27:55 -07:00
server-ssl.xml.in [ASFCS40]CS-15373: Awsapi port change to 7080. 2012-08-21 16:27:55 -07:00
server.xml.in [ASFCS40]CS-15373: Awsapi port change to 7080. 2012-08-21 16:27:55 -07:00
simulator.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
tomcat-users.xml.in Source code committed 2010-08-11 09:13:29 -07:00
tomcat6-nonssl.conf.in License header update for the client folder 2012-08-01 13:49:10 -04:00
tomcat6-ssl.conf.in License header update for the client folder 2012-08-01 13:49:10 -04:00
virtualrouter_commands.properties.in License header update for the client folder 2012-08-01 13:49:10 -04:00
web.xml.in Source code committed 2010-08-11 09:13:29 -07:00