etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,547 Commits 323 Branches 325 Tags 884 MiB
Commit Graph

93 Commits

Author SHA1 Message Date
Kelven Yang 2c5859dbd4 Bring javelin back to the status of being able to start System VMs after another round of master branch merge 2013-01-18 19:15:32 -08:00
Edison Su 224621197c add misssing files 2013-01-18 15:39:37 -08:00
Edison Su 1283712d93 replace spring injection in nfssecondarystorage 2013-01-18 15:10:08 -08:00
Rohit Yadav 593b60ca51 rat: Fix license on newly added files 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 21:37:24 -08:00
Kelven Yang 249dcde364 Add FactoryBean for VirtualMachineEntity to help implement dyanmic injection 2013-01-17 21:06:45 -08:00
Kelven Yang e5507c3892 Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption 2013-01-17 18:55:14 -08:00
Edison Su ddc53771bf implement toURI 2013-01-17 18:49:50 -08:00
Edison Su c4a11b9979 rename datastream to dataobject 2013-01-17 18:49:50 -08:00
Alex Huang 9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Kelven Yang df684261cf Put command classes under Spring injection framework 2013-01-15 18:07:19 -08:00
Edison Su c93918a896 rename dataobject to datastream 2013-01-15 15:46:21 -08:00
Edison Su 8af85b04d0 refactor api, based on suggestion from community 2013-01-14 18:52:39 -08:00
Kelven Yang 61ff07e355 Fix POM that breaks the build 2013-01-14 10:16:07 -08:00
Rohit Yadav 9faf00bdc8 Fix license on xml.in, jsp and ucls files on javelin 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:34:34 -08:00
Rohit Yadav ea3f5ecb54 Fix license for xml files in javelin 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:31:47 -08:00
Rohit Yadav ba20e7f85a Fix license headers for java files in javelin 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:27:09 -08:00
Rohit Yadav 38eaa04b98 Pull changes from master into javelin 
- Disables simulator plugin, breaks build, available via simulator profile
- Fixes spring injections
- Fix api,acl plugins, ApiServer, ApiDispatcher
- Fix other merge conflicts

Conflicts:
	docs/en-US/external-firewalls-and-load-balancers.xml
	plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-12 06:02:54 -08:00
Kelven Yang 53da542001 Another round of fixes after merge 2013-01-11 15:21:04 -08:00
Alex Huang f922c6fc03 Keep removing 2013-01-10 14:46:52 -08:00
Alex Huang 56e5fbdee2 removed import of componentlocator and inject from all files 2013-01-10 11:44:47 -08:00
Alex Huang 395de6f2b3 merge from latest pull 2013-01-10 11:07:11 -08:00
Alex Huang f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Edison Su a03d83bba9 refactor the motion service api 2013-01-10 10:27:05 -08:00
Alex Huang 0bcb64605f all built with the latest 2013-01-09 05:02:39 -08:00
Alex Huang 14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Kelven Yang b274c570f9 Cleanup places that use explicit wiring of the components 2013-01-08 17:45:33 -08:00
Kelven Yang 32e67f60d4 Work with Spring proxy-ed object 2013-01-08 14:24:19 -08:00
Prachi Damle a4f4c98670 OrchestrationService: some changes for DeployVM 2013-01-08 11:53:54 -08:00
Kelven Yang b96bb8feb9 Hook log4j to Spring bootstrapped Javelin server 2013-01-07 18:21:58 -08:00
Edison Su 2d6133c61e change the top level async call using future 2013-01-04 17:17:57 -08:00
Edison Su 9410cd1f3c add deletevolume and createdata disk 2013-01-03 18:56:18 -08:00
Kelven Yang 107fccdf69 Add AsyncCallFuture 2013-01-03 17:24:26 -08:00
Prachi Damle 8a9cf04008 Fixing the file that was merged incorrectly 2013-01-03 11:44:40 -08:00
Prachi Damle 1bdec94627 Deleting the file that got added during rebase 2013-01-03 11:44:40 -08:00
Prachi Damle 7e61e200a6 Register Host and unit test 2013-01-03 11:44:39 -08:00
Prachi Damle 3ff3a47e36 Provisioning Service: register Pod, Cluster, Deregister Zone/Pod/Cluster and unit tests 2013-01-03 11:44:37 -08:00
Prachi Damle 1eb64e6181 ProvisioningService:: registerZone changes and unit-test 2013-01-03 11:44:36 -08:00
Edison Su d7bc09f950 fix build 2013-01-03 11:35:41 -08:00
Edison Su e40042b554 refactor volumeservice api 2013-01-02 18:42:48 -08:00
Edison Su ce2120d09d fix build 2013-01-02 17:43:55 -08:00
Edison Su 5d1e97e407 add create volume 2013-01-02 17:32:54 -08:00
Kelven Yang 6504fc6b09 Enforce strong typing for getting result from AsyncMethod 2013-01-02 15:48:45 -08:00
Edison Su 13aef24ba2 add uml class diagram generated by objectaid 2012-12-28 16:51:25 -08:00
Alex Huang 56be555733 missing change 2012-12-28 16:49:12 -08:00
Alex Huang c622bee1ed made changes to work with the new injection stuff 2012-12-28 16:44:26 -08:00
Alex Huang e936c32a04 Fixed problems with inject checkin 2012-12-28 16:24:54 -08:00
Alex Huang 54cce5fa18 Getting things to compile 2012-12-28 16:07:56 -08:00
Kelven Yang 259e6d5f74 Fix a few Spring bootstrap issues 2012-12-27 17:46:52 -08:00
Edison Su 9de3a1fae4 add create volume from base image command 2012-12-27 16:31:59 -08:00
Edison Su d99161399e so many traps in rpc call: you can't use aop in a thread, you need to intercept finalize call etc 2012-12-24 02:37:32 -08:00