Alex Huang
f40e7b7511
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
Prachi Damle
ad2cd775e0
fixing errors
2013-01-09 11:00:18 -08:00
Alex Huang
b6c56736e5
merge from master
2013-01-09 05:20:36 -08:00
Alex Huang
0bcb64605f
all built with the latest
2013-01-09 05:02:39 -08:00
Rohit Yadav
2eee2cd999
plugins: Fix getPropertiesFiles() for pluggable service plugins, CiscoNexusVSMEElement
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:56:32 -08:00
Rohit Yadav
0b0752f047
CLOUDSTACK-932: Fix incorrect param that caused casting error while processing api
...
Reported-by: Kishan Kavala <kishan.kavala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:47:53 -08:00
Alex Huang
14bd345f1f
merge compiles
2013-01-09 04:41:27 -08:00
Rohit Yadav
fc92f04c6b
ApiDispatcher: Remove unused methods which were for acl processing
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
Rohit Yadav
765504c070
ApiServer: Fix apidiscovery fail case, fix comment
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 04:18:35 -08:00
Wido den Hollander
ef89793c4e
init: Explicitly set the HOME variable to the homedir of the user cloud
...
We have to explicitly set the HOME variable to the homedir from the user "cloud"
This is because various scripts run by the management server read the HOME variable
and fail when this init script is run manually.
For example the injectkeys.sh script reads the HOME variable
2013-01-09 13:11:21 +01:00
Prasanna Santhanam
b18c03a006
simulator: formatting changes
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-09 15:13:12 +05:30
Rohit Yadav
077f47193d
Sync changes: Merge branch 'master' into api_refactoring
...
Conflicts:
plugins/network-elements/dns-notifier/pom.xml
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 20:36:17 -08:00
Noa Resare
4f98d879f6
maven: remove explicit submodule versions from module pom.xml
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 20:25:58 -08:00
Rohit Yadav
d613c59dcb
plugins: Fix apidiscovery's annotation field values and example plugin's name
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 20:00:13 -08:00
Rohit Yadav
b59638e5ae
apidoc: Fix apidoc building to generate for new plugin as well
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 19:59:47 -08:00
Kelven Yang
ff26a42eb2
Get rid of static references to component framework
2013-01-08 19:01:27 -08:00
Rohit Yadav
a0dbbad253
Merge branch 'master' into api_refactoring
2013-01-08 18:55:05 -08:00
Rohit Yadav
2c04dad529
ApiDiscovery: New plugin to help discover apis on mgmt server
...
- Introduces api/discovery plugin that helps discover apis on the mgmt server
- It's a pluggable service, therefore has it's own api-discovery_commands.properties
where the discovery api, listApi can be blacklisted (by removing it), or it's
role mask can be changed
- By default its response has all the apis
- Changes in other parts of the code to make it work, viz. components.xml, pom.xml,
and in ApiServer where it is used as an adapter to get apiname, cmd mappings
The ApiDiscoveryService interface is a contract that the implementing class will
provide:
1. A means to get all the apis as a list of response, plugin is free to implement
the response class, as long as it extends on the BaseResponse:
ListResponse<? extends BaseResponse> listApis();
2. Provides a map of apiname as the key and cmd class as the value:
Map<String, Class<?>> getApiNameCmdClassMapping();
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav
0482734e2f
maven: Use reflections 0.9.8
...
Reflections is compatbile to APL at the time of commit
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav
d760271945
ApiDispatcher: Get rid of reflections, reuse utils' ReflectUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav
539d94b4a6
ApiXmlDocWriter: Reuse methods from ReflectUtil
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Rohit Yadav
db297a338f
utils: Reflection utilities to get cmd, annotation and fields
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 18:54:29 -08:00
Kelven Yang
cc23a23324
Fix startup sequence for classes that have due Manager/Adapter interfaces
2013-01-08 18:42:12 -08:00
Kelven Yang
b274c570f9
Cleanup places that use explicit wiring of the components
2013-01-08 17:45:33 -08:00
Min Chen
d22229eb9d
Remove updateUuids code in ConfigurationServerImpl (which is not the
...
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 17:12:14 -08:00
Alex Huang
7f3a748d6c
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
2013-01-08 14:46:38 -08:00
Alex Huang
e54ed85926
getting it to compile
2013-01-08 14:39:05 -08:00
Kelven Yang
32e67f60d4
Work with Spring proxy-ed object
2013-01-08 14:24:19 -08:00
Alex Huang
606682690a
Added back in the .project ignore setting
2013-01-08 14:11:28 -08:00
Alex Huang
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
radhikap
aa9ccf7302
fix for CLOUDSTACK-481
...
Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
2013-01-08 15:04:19 -06:00
Alex Huang
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
Min Chen
74c15a22a0
Create DB view for ListStoragePools API performance optimization.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 12:33:18 -08:00
Brian Federle
db2033d2e6
List view UI: Disable overflow scrolling
2013-01-08 12:10:15 -08:00
Prachi Damle
a4f4c98670
OrchestrationService: some changes for DeployVM
2013-01-08 11:53:54 -08:00
Kelven Yang
992fa473be
convert existing singleton objects into Spring loadable bean components
2013-01-08 11:07:22 -08:00
Chip Childers
c6110a88c5
Updating copyright year in the LICENSE file to 2013
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-07 22:02:28 -05:00
Kelven Yang
b96bb8feb9
Hook log4j to Spring bootstrapped Javelin server
2013-01-07 18:21:58 -08:00
Rohit Yadav
0a25884215
Merge branch 'master' into api_refactoring
2013-01-07 17:28:57 -08:00
Min Chen
0894822651
DB view dao cleanup, and introduce global configuration parameter for
...
entity detail batch query size to remove hard-coded
VM_DETAILS_BATCH_SIZE.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-07 16:40:31 -08:00
Kelven Yang
559933f062
First page of Javelin management server bootstraped by Spring is able to show now
2013-01-07 15:54:18 -08:00
Hugo Trippaers
91673b10b8
Summary: Get started with packaging cloud-agent
...
Modify the spec file to package the agent files and the scripts
Some changes to the poms to put the java dependencies in the right place.
Move the agent script to the dedicated os dir in packaging.
2013-01-07 22:18:01 +01:00
Hugo Trippaers
d616dcdd40
Summary: small fix for the classpath loader
...
Add the file separator if the path does not end with one
2013-01-07 22:17:55 +01:00
Rohit Yadav
a948a89378
Sync updates: Merge branch 'master' into api_refactoring
...
Conflicts:
server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java
server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-07 10:38:43 -08:00
Min Chen
13de3ca253
Enable default sorting for listVirtualMachines and listRouters to keep
...
back compatible.
2013-01-07 10:26:33 -08:00
Pranav Saxena
d5ac10d7b2
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2013-01-07 22:31:51 +05:30
Sanjay Tripathi
fd8607d41e
CLOUDSTACK-819:Changing GET request to POST while creating account/user to hide the passwords in the access logs
2013-01-07 22:29:28 +05:30
Murali Reddy
bf6ed9312d
Missed portion of the fix for CLOUDSTACK-595 submitted by commit
...
3ffbc4320abc9fd03ad3abd1f8077cc8d8f9ed4c which caused build break.
Fixing the build break and added missing code.
2013-01-07 16:36:47 +05:30
Koushik Das
3ffbc4320a
CLOUDSTACK-595 : Recreate root volume scenarios doesn't work in vmware
...
Issue seen during system vm template upgrade and restoreVM command
scenarios for vmware. In these cases CS tries to recreate root disk with
same name as the existing one, in case of vmware this results in creation
of vmdk file with same name for both existing and new root volume.
This results in undesired behavior when storage cleanup thread tries to
cleanup old volume. Made the vmdk file name unique by adding the volume
id to it. This will ensure that during volume recreation in the scenarios
mentioned vmdk will get created with a new name and there will be
no undesired side effects of running the storage cleanup thread.
2013-01-07 16:18:05 +05:30
Kishan Kavala
5502f4b20c
Corrected response object in Traffic Monitor APIs Implementation annontation as TrafficMonitorResponse
2013-01-07 12:32:24 +05:30