Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							80d58b6c73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-20 16:42:56 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							3a0588f317 
							
						 
					 
					
						
						
							
							netapp: Fix as pluggable service and return list of apis it offers  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-08 16:36:24 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							753b884044 
							
						 
					 
					
						
						
							
							spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-24 15:40:40 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6088cbfe47 
							
						 
					 
					
						
						
							
							nonoss compiled up til netscaler  
						
						
						
						
					 
					
						2013-01-23 17:18:55 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							10d9c019a9 
							
						 
					 
					
						
						
							
							All merge conflicts resolved  
						
						
						
						
					 
					
						2013-01-18 12:14:57 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3dabd5fbf3 
							
						 
					 
					
						
						
							
							Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException  
						
						... 
						
						
						
						and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-16 22:36:34 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d6f44a4d6a 
							
						 
					 
					
						
						
							
							merged from master  
						
						
						
						
					 
					
						2013-01-10 15:55:42 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							56e5fbdee2 
							
						 
					 
					
						
						
							
							removed import of componentlocator and inject from all files  
						
						
						
						
					 
					
						2013-01-10 11:44:47 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							4e71a5a7b9 
							
						 
					 
					
						
						
							
							netapp: Fix String conversion method of long id  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-09 11:22:35 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							cf8de7ee17 
							
						 
					 
					
						
						
							
							Removed all the .project files  
						
						
						
						
					 
					
						2013-01-08 14:11:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							30f2565d98 
							
						 
					 
					
						
						
							
							Merge branch 'api_refactoring' into javelin  
						
						
						
						
					 
					
						2013-01-08 12:36:04 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							774cb29b0c 
							
						 
					 
					
						
						
							
							api: Annotate all remaining cmd classes with APICommand name field  
						
						... 
						
						
						
						Automates name field filling using following python program which reads from
various *commands.properties.in files and populates name fields based on the
name cmd class mapping defined in them.
import os
search_pattern = "@APICommand("
pattern_len = len(search_pattern)
prop_files = [
"client/tomcatconf/cisconexusvsm_commands.properties.in",
"client/tomcatconf/f5bigip_commands.properties.in",
"client/tomcatconf/junipersrx_commands.properties.in",
"client/tomcatconf/netapp_commands.properties.in",
"client/tomcatconf/netscalerloadbalancer_commands.properties.in",
"client/tomcatconf/nicira-nvp_commands.properties.in",
"client/tomcatconf/simulator_commands.properties.in",]
file_prefixes = [
"plugins/hypervisors/vmware/src/",
"plugins/network-elements/f5/src/",
"plugins/network-elements/juniper-srx/src/",
"plugins/file-systems/netapp/src/",
"plugins/network-elements/netscaler/src/",
"plugins/network-elements/nicira-nvp/src/",
"plugins/hypervisors/simulator/src/",]
counter = 0
for prop_file in prop_files:
    f = open(prop_file, 'r')
    data = f.read()
    f.close()
    file_prefix = file_prefixes[counter]
    apis = filter(lambda x: x.strip()!='' and (not x.startswith('#')), data.split('\n'))
    for api in apis:
        api_name = api.split('=')[0].strip()
        cmd_name = file_prefix + api.split('=')[1].split(';')[0].replace('.', '/').strip() + ".java"
        if not os.path.exists(cmd_name):
            print cmd_name, api_name
        f = open(cmd_name, 'r')
        d = f.read()
        f.close()
        idx = d.find(search_pattern) + pattern_len
        new_str = d[:idx] + "name = \"%s\", " % api_name + d[idx:]
        f = open(cmd_name, 'w')
        f.write(new_str)
        f.close()
    counter += 1
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-28 01:28:47 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							7a7fe583e0 
							
						 
					 
					
						
						
							
							Rename Implementation annotation to APICommand  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-26 15:55:34 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							057ac12d23 
							
						 
					 
					
						
						
							
							Enforce InternalIdentity interface on all VO classes that impls long getId()  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-26 15:09:44 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							296b49c2f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into test-merge-api  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-23 13:54:46 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e398b1e47a 
							
						 
					 
					
						
						
							
							api: Refactor command and response classes to org.apache.cloudstack.api.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 19:23:24 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							2b74b6e827 
							
						 
					 
					
						
						
							
							Start removing the old ant build files  
						
						... 
						
						
						
						Removed all build.xml files from the plugins 
						
						
					 
					
						2012-12-07 15:58:56 +01:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc3bc3760 
							
						 
					 
					
						
						
							
							api_refactor: refactor vpn and vm apis  
						
						... 
						
						
						
						- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 21:27:02 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							5edfc2760a 
							
						 
					 
					
						
						
							
							refactor: remove redundant imports, fix trailing chars  
						
						
						
						
					 
					
						2012-12-03 13:54:37 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cea8f3bf37 
							
						 
					 
					
						
						
							
							Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation  
						
						
						
						
					 
					
						2012-11-07 15:03:22 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							aab02e2743 
							
						 
					 
					
						
						
							
							Add Spring annotation to major components  
						
						
						
						
					 
					
						2012-11-07 14:53:39 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							91e68b5f2c 
							
						 
					 
					
						
						
							
							A bunch of .project changes again  
						
						
						
						
					 
					
						2012-11-04 19:25:03 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f92ce72639 
							
						 
					 
					
						
						
							
							Correct dependency errors  
						
						
						
						
					 
					
						2012-10-24 11:12:40 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							059f605ace 
							
						 
					 
					
						
						
							
							add more interfaces  
						
						
						
						
					 
					
						2012-10-22 17:50:51 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							11dc1f0b8e 
							
						 
					 
					
						
						
							
							Check manageontap sdk version and provide instructions.  
						
						
						
						
					 
					
						2012-10-15 17:25:40 +02:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5fee891162 
							
						 
					 
					
						
						
							
							merge from master  
						
						
						
						
					 
					
						2012-10-11 17:42:25 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6355ffe6 
							
						 
					 
					
						
						
							
							Updated master to 4.1.0  
						
						... 
						
						
						
						mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT 
						
						
					 
					
						2012-10-01 11:00:55 -07:00 
						 
				 
			
				
					
						
							
							
								Jie Feng 
							
						 
					 
					
						
						
						
						
							
						
						
							c9aa08350a 
							
						 
					 
					
						
						
							
							[DOC] docbook conversion - choosing a deployment architecture  
						
						
						
						
					 
					
						2012-09-13 16:12:06 -04:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d0a10c69e 
							
						 
					 
					
						
						
							
							Merged master over to javelin to get new poms and maven build  
						
						
						
						
					 
					
						2012-09-05 14:31:24 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							2300310243 
							
						 
					 
					
						
						
							
							Messaging facility initials for new architecture  
						
						
						
						
					 
					
						2012-08-28 17:58:45 -07:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8a01106b 
							
						 
					 
					
						
						
							
							rename cloud-plugins to cloudstack-plugins  
						
						
						
						
					 
					
						2012-08-27 16:53:51 +02:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							a06ed5728c 
							
						 
					 
					
						
						
							
							remove intermediate parent poms  
						
						
						
						
					 
					
						2012-08-27 16:43:24 +02:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							3aa469da2a 
							
						 
					 
					
						
						
							
							groupdId is now org.apache.cloudstack  
						
						
						
						
					 
					
						2012-08-25 09:20:21 +02:00 
						 
				 
			
				
					
						
							
							
								olivier lamy 
							
						 
					 
					
						
						
						
						
							
						
						
							5ef60aceb1 
							
						 
					 
					
						
						
							
							%s/tab/ws/  
						
						
						
						
					 
					
						2012-08-25 00:03:23 +02:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							4a4007e652 
							
						 
					 
					
						
						
							
							Add license  
						
						
						
						
					 
					
						2012-08-24 11:18:54 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ebc0fa458a 
							
						 
					 
					
						
						
							
							* Maven 3 support  
						
						... 
						
						
						
						* Pretty Format POM's
* AWS API compiles now 
						
						
					 
					
						2012-08-24 11:18:54 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f826971fea 
							
						 
					 
					
						
						
							
							Maven config, initial commit  
						
						
						
						
					 
					
						2012-08-24 11:18:52 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d06d6dae72 
							
						 
					 
					
						
						
							
							add maven eclipse project files from Darren  
						
						
						
						
					 
					
						2012-08-23 17:55:20 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9a51ff3bfc 
							
						 
					 
					
						
						
							
							Maven worksplace fixes/patches from Darren  
						
						
						
						
					 
					
						2012-08-23 14:26:27 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							2f6cc4b0cb 
							
						 
					 
					
						
						
							
							Add license  
						
						
						
						
					 
					
						2012-08-23 14:26:26 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							ad54ed1790 
							
						 
					 
					
						
						
							
							* Maven 3 support  
						
						... 
						
						
						
						* Pretty Format POM's
* AWS API compiles now 
						
						
					 
					
						2012-08-23 14:26:26 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e95e435f 
							
						 
					 
					
						
						
							
							Maven config, initial commit  
						
						
						
						
					 
					
						2012-08-23 14:26:25 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							3a882fa17c 
							
						 
					 
					
						
						
							
							License header updates for the plugins folder.  
						
						
						
						
					 
					
						2012-08-03 09:07:43 -04:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							7acf8585b1 
							
						 
					 
					
						
						
							
							Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed  
						
						... 
						
						
						
						2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java 
						
						
					 
					
						2012-07-06 11:43:31 -07:00 
						 
				 
			
				
					
						
							
							
								Murali reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8aa2b55dd6 
							
						 
					 
					
						
						
							
							moving out NetApp code to plugins/file-systems/netapp  
						
						
						
						
					 
					
						2012-07-02 08:34:02 -07:00