Commit Graph

52 Commits

Author SHA1 Message Date
Hugo Trippaers 3c63a39fa4 Make sure that jenkins can find the mysql connector jar 2012-08-31 12:28:03 +02:00
Kishan Kavala d05106053a fixed run-usage and debug-usage targets, deploy missing usage-components.xml and log4j-cloud_usage.xml 2012-08-24 16:59:20 +05:30
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
David Nalley 16437df9bd commenting out the copy statement for mysql-connector-java so the test doesn't break 2012-08-20 14:19:37 -04:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
Edison Su e116c24989 Removed obsolete file SearchCriteria2Test.java which caused ant unittest
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
2012-08-02 10:33:06 -07:00
Chip Childers 9ef5b42202 Build configuration change from Ewan Mellor: https://reviews.apache.org/r/6266/ 2012-07-31 21:21:35 -04:00
Ewan Mellor 9acd1ccaa3 FailOnError for deploydb and doc targets
Use failonerror=true for the exec calls used in the
deploy-cloudstack-db, deploydb-simulator, and build-apidocs targets.
2012-07-31 12:03:23 +05:30
kishan 09e4b1683f Added ant target deploy-server-encrypt to enable encryption in dev setup 2012-07-16 16:11:44 -07:00
frank a2d49bef69 Change OVM script deploy target in line with Alex re-packaging change
fix RPM build, don't install cloud-console-proxy.jar as there is not such package anymore
2012-06-20 10:45:56 -07:00
eric pretorious 9dfc3b0a1f Replaced Cloud.com & Citrix copyright notices with the Apache Software License, Version 2.0. 2012-06-12 09:03:36 -04:00
Vijayendra Bhamidipati b0facd16e4 Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
At this point, the mgmt server comes up, loading the
	   Nexus related modules without dying.

Description:

	1) Added a new properties file for Cisco N1kv VSM commands:
		cisconexusvsm_commands.properties.in

	2) Added the CiscoNexusVSMElement to the components.xml file.

	3) Modified CiscoNexusVSMElement to implement NetworkElement.

		The NetworkElement interface functions are not
	  	relevant to the N1KV VSM, so we override them
	  	with noops.

	4) Added an addDao() of CiscoNexusVSMDeviceDaoImpl in populateDaos(),
	   else we'd run into a failure to look up the VSM's dao when the
	   mgmt server is starting up:

		com.cloud.utils.exception.CloudRuntimeException: Unable to find DAO com.cloud.network.dao.CiscoNexusVSMDeviceDao

	5) Also added the CiscoNexusVSMElementService in populateServices(),
	   and modified CiscoNexusVSMElement to implement Manager as well.

	6) populateServices() was running into an exception that indicated
	   that it was unable to find a commands.properties file for the
	   cisco n1kv vsm service. Fixed it by changing getProperties() in
	   CiscoNexusVSMElement to return the correct string
	   "cisconexusvsm_commands.properties", and putting in an @Override
	   for getProperties() in CiscoNexusVSMElement. Also fixed up all
	   the other functions in CiscoNexusVSMElement that needed to have
	   @Override. Also updated build/developers.xml with this file
	   location. And did other small cleanup.

	7) More clean up in CiscoNexusVSMDeviceManagerImpl.

Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
2012-05-25 17:07:03 -07:00
prachi 49cdc2317b merge awsapi build script changes to master 2012-05-25 14:40:56 -07:00
frank 318fdbfa89 correctly removing awsapi when clean-tomcat
Conflicts:

	build/developer.xml
2012-05-18 11:10:56 -07:00
Alena Prokharchyk 10d9e57115 Added cisco.commands.properties to input param for ant build-apidocs target 2012-05-16 13:20:07 -07:00
Prasanna Santhanam ffc07c413a removing the dependency of apidocs on simulator
reviewed-by: Frank Zhang
2012-04-11 18:24:20 +05:30
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk 6a1d7e309d More fixes to 2.2.x - 3.0 db upgrade 2012-03-01 18:31:50 -08:00
Ewan Mellor 22119a33b5 Added build-apidocs-zip build target that generates HTML versions of the
API docs.  Uses XML/XSLT generation system originally by Abhinandan Prateek
(I think).  CSS updates from Jessica Tomechak.  gen_toc.py and build script
changes by me.
2012-02-08 20:40:29 -08:00
Alena Prokharchyk bcca44e05f 1) Use correct command names in f5/juniper commands.properties file
2) Fixed API doc to include f5/juniper/netscaler/virtualRouter commands
2011-11-29 16:24:43 -08:00
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
frank 4e595d04ab Bug 11522 - New agent manager
1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now
2011-10-19 17:51:20 -07:00
frank 625a601615 correct ant build-apidoc 2011-10-18 14:31:33 -07:00
Edison Su ae83246acb bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager
status 11600: resolved fixed
2011-10-03 16:43:47 -07:00
frank 3947c9a126 Bug 11522 - New agent manager
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
frank 2dcdb946d2 fix wrong unittest 2011-09-13 11:22:09 -07:00
frank c826512ada don't do compilation when deploying ovm 2011-08-30 15:43:59 -07:00
frank 4385a3d2de deploy ovm scripts when deploying server 2011-08-30 15:28:05 -07:00
Edison Su 0be1510496 add template for simulator 2011-08-16 10:30:51 -07:00
Kelven Yang 52924ca993 Increase PermGen heap size to 128m for Tomcat debug session 2011-06-08 16:56:41 -07:00
alena 27d6020569 Ant target for apiDocs building 2011-06-07 11:21:07 -07:00
Kelven Yang 48cc8480b2 move common mysql driver jar to Tomcat shared location in developer deployment, let CloudStack be friendly playing with other Web deployments like CloudBridge. 2011-05-27 16:00:57 -07:00
Alex Huang ea9703997b proxy agent 2011-05-17 07:12:58 -07:00
Alex Huang 43c3c775f2 bug 9741: somehow some of the removed code got back into the code path. Must have hit one undo too many. 2011-05-05 17:57:06 -07:00
Alex Huang 093fa851fa made the upgrade utility work with the current version 2011-03-18 10:06:38 -07:00
Alex Huang 8bec1e0b9f added the concept of system integrity checking before a system starts 2011-03-16 17:59:34 -07:00
Alex Huang 851c3344fc database upgrade 2011-03-09 17:56:11 -08:00
Kelven Yang a5c21dc130 1) make JMX port configuration in deverloper build, 2) Add property map based dynamic bean 2011-03-09 11:59:13 -08:00
Kelven Yang d0892a964d Add JMX monitoring to cluster management 2011-03-07 18:40:33 -08:00
Alex Huang ab3c719389 run the scripts 2011-02-28 14:37:30 -08:00
Alex Huang 378a0da0df more unittest support 2011-02-25 11:58:12 -08:00
Alex Huang b8cd91df9e don't generate test-reports directory 2011-02-22 19:13:52 -08:00
Alex Huang c22b37e402 latest work on db migration 2011-02-22 18:23:05 -08:00
Alex Huang 6b0d4947ed bug 8529: propagated to master. Added junit test support to ant 2011-02-16 17:40:58 -08:00
edison 9e0f57bc0e change code for new UI 2010-09-29 18:40:52 -07:00
Anthony Xu d72e0538da Revert "Revert "use iso to patch systemvm""
This reverts commit 145e2e0aaa.
2010-08-26 16:06:28 -07:00
Anthony Xu 145e2e0aaa Revert "use iso to patch systemvm"
This reverts commit 3565f8d21b.
2010-08-26 16:03:34 -07:00
root 3565f8d21b use iso to patch systemvm
Conflicts:

	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/xenserver56/patch
2010-08-26 15:56:02 -07:00
Kelven Yang 45cb68e7e2 add templates.vmware.sql
modify build to deploy vmware database records
2010-08-24 22:58:05 -07:00
Alex Huang c21bc7072c more changes 2010-08-16 11:30:04 -07:00