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

24 Commits

Author SHA1 Message Date
Prasanna Santhanam edac894f31 spring changes for simulator component 
allow spring to do DI for simulator plugin. componentContext.xml will
have simulator components disabled by default.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-02-19 16:40:57 +05:30
Rohit Yadav 7401b06cb1 CLOUDSTACK-1070: Don't create HyervisorTemplateAdapter bean, it's already a @Component 
The issue was completely different than a spring injection issue

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-02-13 15:54:42 +05:30
Min Chen 12cbaad691 Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only 
one ApiChecker instance is injected in ApiServer.
 2013-02-07 21:50:07 -08:00
Hugo Trippaers 9d134f0f19 Summary: We need the integrity checkers to run 
The EncryptionSecretKeyChecker is required to load db.properties with
encrypted passwords.

Make usre the integrity checkers are run before anything else during
start-up
 2013-02-05 23:50:01 +01:00
Kelven Yang e5866cf2ef CLOUDSTACK-1165, fix nonoss build startup issue 2013-02-05 14:27:57 -08:00
Kishan Kavala 0816a0bdea CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl 2013-02-05 17:18:23 +05:30
Kishan Kavala fc0bf21a13 CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:49:34 +05:30
Hugo Trippaers 43dc31bcf2 NiciraNvpElement is loaded twice, but no idea where. This makes it work 
however
 2013-02-04 15:08:58 +01:00
Kelven Yang e74f72be34 Fix the merge conflicts 2013-02-01 15:22:58 -08:00
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kelven Yang 7b75f0d990 Sync master to javelin one more time 2013-02-01 11:37:33 -08:00
Kelven Yang 7bd8bec68a Sync javelin with master up to 894cb8f7d9 2013-01-31 17:20:19 -08:00
Kelven Yang 64d794ea36 Restore old caching policy on DAOs under Spring configuration 2013-01-31 16:00:13 -08:00
Kelven Yang 8887f01b37 CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name 2013-01-28 17:12:41 -08:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin 
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-24 19:18:53 -08:00
Prachi Damle 1cb0ce44df Removing BareMetalService referrences. We will load UserVMService by default. 2013-01-22 12:54:20 -08:00
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
Kelven Yang d056cd5cab Add configurable components to Spring XML context file to allow configuration of componets not hard-coded in code 2013-01-18 19:15:32 -08:00
Kelven Yang 497dcd5044 Get rid of PlugService annotation, replace it with Spring standard injection in command classes 2013-01-16 18:44:44 -08:00
Kelven Yang 2be270de89 Separate loadable components like Gurus, Elements, Adapters to componentContext.xml 2013-01-16 16:33:59 -08:00
Kelven Yang 727fab71cb Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run 2013-01-16 14:16:01 -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 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 f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00