Prasanna Santhanam 792db8b5cc simulator: removing cyclic dependency from simulator ... The database creator caused a cyclic dependecny in the simulator which is removed with this commit. Additionally the simulator profile is now merged with developer profile and a test for server health is included Steps to run: $ mvn -Pdeveloper clean install $ mvn -Pdeveloper -pl developer -Ddeploydb $ mvn -Pdeveloper -pl developer -Ddeploydb-simulator $ mvn -pl client jetty:run To deploy an adv. zone and test the server health: $ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test Conflicts: pom.xml Signed-off-by: Prasanna Santhanam <tsp@apache.org>		2013-03-20 10:36:43 +05:30
..
applicationContext.xml.in	CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory	2013-03-05 19:03:30 -05: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
classpath.conf.in	Revert classpath.conf.in to before .deb packaing merge	2013-02-28 19:45:46 +00:00
cloudmanagementserver.keystore	Bug 9479 - provide option for built in https	2011-09-01 16:01:28 -07:00
commands.properties.in	CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful	2013-03-18 14:01:15 +05:30
componentContext.xml.in	simulator: removing cyclic dependency from simulator	2013-03-20 10:36:43 +05:30
context.xml.in	Source code committed	2010-08-11 09:13:29 -07:00
db-enc.properties.in	removed some unused database connection properties	2012-12-13 22:46:29 -08:00
db.properties.in	Sync master to javelin one more time	2013-02-01 11:37:33 -08:00
ehcache.xml.in	License header update for the client folder	2012-08-01 13:49:10 -04:00
environment.properties.in	Added Mock ApiServer, Regions API calls with api keys	2012-10-17 14:16:36 +05:30
log4j-cloud.xml.in	CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack	2013-03-18 11:36:19 +05:30
logging.properties.in	Source code committed	2010-08-11 09:13:29 -07:00
nonossComponentContext.xml.in	CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on, for non-oss version	2013-03-19 18:54:16 -07:00
server-nonssl.xml.in	api: Enable UTF-8 URI encoding for tomcat	2012-12-17 20:43:37 -08:00
server-ssl.xml.in	Removing the merge conflict statements from git.	2013-01-30 17:04:57 -08:00
server.xml.in	api: Enable UTF-8 URI encoding for tomcat	2012-12-17 20:43:37 -08:00
tomcat-users.xml.in	Source code committed	2010-08-11 09:13:29 -07:00
tomcat6-nonssl.conf.in	Summary: Re-adjusting tomcat memory settings per Rohit's emails	2013-02-19 15:30:42 -07:00
tomcat6-ssl.conf.in	Summary: Re-adjusting tomcat memory settings per Rohit's emails	2013-02-19 15:30:42 -07:00
web.xml.in	Source code committed	2010-08-11 09:13:29 -07:00