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
Rohit Yadav
4ca828c1d6
maven: disable awsapi by default, enabled by -P awsapi profile
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:40:59 -08:00
Rohit Yadav
b45cdef5d9
DatabaseCreator: Process db props, sql and upgrade classes separately
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
Kelven Yang
17a94b20ec
Always use premium setting in ConsoleProxyManager
2013-01-17 18:23:06 -08:00
Kelven Yang
93985ae191
allow nested injection in ComponentContext
2013-01-17 18:23:06 -08:00
Rohit Yadav
8d016d035b
MockConfigurationDaoImpl: Fix build issue, add base class method
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:15:15 -08:00
Rohit Yadav
cafe881acb
maven: Fix deploydb in developer/pom.xml to pass through DatabaseCreator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
Rohit Yadav
ef07cde449
DBCreator: Fix ScriptRunner to strip comments, reformat code
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
Kelven Yang
6d155416c2
System VM can start now with Spring bootstraped management server
2013-01-17 14:22:14 -08:00
Alex Huang
cbb7ff1c32
added missing files
2013-01-17 06:50:59 -08:00
Alex Huang
b751b69c55
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-17 06:50:19 -08:00
Alex Huang
9759ad57f2
Commit the current changes to unit tests
2013-01-17 06:50:11 -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
Rohit Yadav
1db3a84a03
maven: Fix deploydb in developer/pom.xml
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-16 17:25:55 -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
Kelven Yang
4c1257bf18
Handle proxy object situation in dispatching API command
2013-01-16 11:28:09 -08:00
Kelven Yang
339c09bdef
Remove unused fields in VMInstanceVO.java
2013-01-15 18:28:51 -08:00
Kelven Yang
df684261cf
Put command classes under Spring injection framework
2013-01-15 18:07:19 -08:00
Kelven Yang
a2dab60236
deprecate storage provider in StroragePoolVO
2013-01-15 18:07:19 -08:00
Edison Su
c93918a896
rename dataobject to datastream
2013-01-15 15:46:21 -08:00
Kelven Yang
af67d87662
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
Edison Su
8af85b04d0
refactor api, based on suggestion from community
2013-01-14 18:52:39 -08:00
Kelven Yang
8ba00f7558
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-14 18:08:23 -08:00
Edison Su
110465b504
Revert "Merge remote-tracking branch 'origin/javelin' into javelin"
...
This reverts commit f237759cd3fdee6680feecdf774ae7d0ca9205de, reversing
changes made to 96bd1d4172aaa37757cc75a694b40783a6b962c4.
2013-01-14 17:58:48 -08:00
Edison Su
16376269c3
Revert "fix compile"
...
This reverts commit 008340353a12372d3e8ee78ce94f4a5f4f7f321c.
2013-01-14 17:58:33 -08:00
Kelven Yang
f304df44df
Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP
2013-01-14 17:44:31 -08:00
Edison Su
008340353a
fix compile
2013-01-14 16:20:39 -08:00
Edison Su
f237759cd3
Merge remote-tracking branch 'origin/javelin' into javelin
2013-01-14 16:11:00 -08:00
Edison Su
a2f86003f0
refactor api
2013-01-14 16:07:03 -08:00
Kelven Yang
96bd1d4172
Forget to save changed file in last commit
2013-01-14 14:10:47 -08:00
Kelven Yang
6dfbcee63d
Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment
2013-01-14 13:57:30 -08:00
Kelven Yang
64c947a9f8
Re-fix startup of management server
2013-01-14 10:52:37 -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
Rohit Yadav
fdc9103fbe
create-schema: Fix deploydb, drop existing (new) tables
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:43:35 -08:00
Rohit Yadav
452e9c3efd
maven: Remove duplicate cloud-core dependency in server
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-12 03:41:27 -08:00
Rohit Yadav
ad063ed610
StaticRoleBasedAPIAccessChecker: Throw exception on failed check
...
Plugin should not be responsible for existence of checking an API, this was wrong.
Throw exception boldly when checkAccess fails.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 19:24:11 -08:00
Rohit Yadav
0dca44efe8
ApiServer: Debug messages, don't spam with info, remove identity helper in ResponseGenerator
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
40779975d3
ExtractVolumeCmd: Fix regression, use Zone Id for getting zone
...
Fixes regression introduced in b14b39a69fa295d1d20484170b95b97fe310af28
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
4c80684b1f
StaticRoleBasedAPIAccessChecker: Fix acl cfg processing error messages
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
83e7214b02
ConsoleProxyManagerImpl: Get rid of IdentityDao
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
8eba0ee0bb
ApiDispatcher: Remove helper method that proxies via ApiResponseHelper to get entity by IdentityDao
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
a35db97355
NetworkService: Add method to interface to get network by uuid
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
35544f26e5
DeployVmCmd: Remove usage of IdentityDao, use Network to get by id or uuid
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:20 -08:00
Rohit Yadav
8cdb40a416
NetworkManagerImpl: Add method to getNetwork by uuid
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-11 18:44:19 -08:00