99ea4011b1
Removing baremetal related references
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-27 15:56:13 +05:30
359b931993
CLOUDSTACK-1788: remember, changing componentcontext.xml also needs to
...
change nooss, they are not in inheritance relationship any more.
2013-03-26 17:51:21 -07:00
c9f4e51300
Regions UI: Add 'redirecting to region' text during login loading
2013-03-21 15:57:05 -07:00
3ed6200ef8
move default primary storage plugin into its own pom
2013-03-20 17:21:40 -07:00
873ec27135
simulator: by default don't start the simulator discoverers
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 14:52:32 +05:30
de1ac4b7cd
jvmArgs is invalid here
...
jvmArgs are unaffected in the jetty:run configuration. Use MAVEN_OPTS
for this instead.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 11:07:49 +05:30
792db8b5cc
simulator: removing cyclic dependency from simulator
...
The database creator caused a cyclic dependecny in the simulator which
is removed with this commit. Additionally the simulator profile is now
merged with developer profile and a test for server health is included
Steps to run:
$ mvn -Pdeveloper clean install
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator
$ mvn -pl client jetty:run
To deploy an adv. zone and test the server health:
$ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test
Conflicts:
pom.xml
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 10:36:43 +05:30
4faad73d6c
CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on, for non-oss version
2013-03-19 18:54:16 -07:00
2bebb124cc
CLOUDSTACK-1729: a partical resolution for user authenticators to unblock developers who are currently working on and relying on the fix
2013-03-19 15:47:22 -07:00
61754cd987
CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack
...
Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-03-18 11:36:19 +05:30
183b989d30
CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful
2013-03-18 14:01:15 +05:30
7566424a0b
List view: Subselect UI: Fixes
...
-Split subselect options into 2 subcategories, 'label' and 'dataProvider'
-Localize subselect label
2013-03-13 11:05:50 -07:00
0f8c4d0ac0
baremetal: Remove old templateadapter in cloud-server, fix spring xmls
...
The BareMetalTemplateAdapter in cloud-server is old and was introduced by recent
branch merges, Frank had separated and moved code to the baremetal plugin so
we will use that.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-13 11:50:54 +05:30
162de5b17f
CLOUDSTACK-1323: retire some of no-longer used files
...
Conflicts:
client/tomcatconf/components.xml.in
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-12 14:44:58 +05:30
f539f40e35
CLOUDSTACK-874: Ability to delete Events and Alerts
...
This feature will provide the functionality to delete or archive
the Alerts/Events.
Delete or archive alerts APIs are available only for root-admin,
delete or archive events are available for regular users.
2013-03-08 11:59:53 -08:00
bd4508589b
Revert "CLOUDSTACK-874 Ability to delete Events and Alerts"
...
This reverts commit 5e4c2c8a9e
2013-03-08 14:28:23 -05:00
5e4c2c8a9e
CLOUDSTACK-874 Ability to delete Events and Alerts
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-03-08 10:52:40 -08:00
38aec6fc4d
CLOUDSTACK-465 - French language file quotes are dropping javascript syntax errors
2013-03-06 06:09:16 -05:00
333dd810d2
CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory
2013-03-05 19:03:30 -05:00
b683c34d3f
Fix the typo in componentContext.xml.in
...
HypervisorTemplateAdapter was mispelt causing server to not startup.
Reported-by: Dave Cahill <dcahill@midokura.net.jp>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-05 13:51:06 +05:30
613a061977
Merge branch 'master' into vim51_win8
...
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
2013-03-04 17:32:52 -08:00
7a54458e17
CLOUDSTACK-1502 Fixed the api-doc build component caused by new API commands:
...
addIpToNic
removeIpFromNic
listNics
1) Removed trailing whitespaces from commands.properties file for the commands above
2) Created a new category "Nic" in gen_toc.py for the new commands
2013-03-04 16:19:08 -08:00
d922f6fd4b
CLOUDSTACK-1304 Set permissions using the chmod ant task
2013-03-04 21:03:15 +01:00
b12aebefee
Revert "CLOUDSTACK-658 - Adding Scalevm command and XS related changes"
...
This reverts commit e0019eccd9
2013-03-04 23:32:52 +05:30
e0019eccd9
CLOUDSTACK-658 - Adding Scalevm command and XS related changes
2013-03-04 14:47:55 +05:30
aedb8c478e
CLOUDSTACK-24: mipn feature for isolated and vpc networks
...
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
https://issues.apache.org/jira/browse/CLOUDSTACK-24
2013-03-04 11:02:09 +05:30
8b9c45b96d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-40to410.sql
2013-03-01 16:46:58 -08:00
2eae9a1390
Summary: few fixes to the pom
...
Only one dependency to the ovm hypervisor is enough
Depend on the right jna package
2013-03-01 20:52:17 +01:00
14791a9d8f
Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes."
...
This reverts commit f9d96c9169
2013-03-01 22:29:47 +05:30
f9d96c9169
CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes.
2013-03-01 16:40:26 +05:30
f1249b353e
CLOUDSTACK-1450. AWSAPI server fails to start.
...
Missing annotation @Component in CloudStackUserDao implementation
2013-03-01 15:23:39 +05:30
9f2a2081b5
Avoid the use of operating system specific functions, actually avoid
...
exec as much as possible.
2013-03-01 08:20:40 +01:00
bd0fc2f354
CloudStack CLOUDSTACK-723
...
Enhanced baremetal servers support on Cisco UCS
change UcsXxxDao to Spring xml loading
change ListxxxCmd to inherit ListCmd
change API response in line with current API architecture
adding missing db schema to db upgrade schemaOh
Conflicts:
client/pom.xml
plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java
plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java
2013-02-28 15:42:48 -08:00
801e5269ea
Merge branch 'master' into vim51_win8
2013-02-28 14:25:26 -08:00
6f19895191
Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion.
...
Confirmed with Kishan about this.
2013-02-28 14:17:58 -08:00
97ca7791b3
Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config
2013-02-28 21:28:46 +01:00
9801667199
Revert classpath.conf.in to before .deb packaing merge
...
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix
CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]
Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:45:46 +00:00
e5bf4a8fc4
CLOUDSTACK-1434 BeanCreationException: Error creating bean with name 'apiRateLimitServiceImpl' when starting up mgmt server
2013-02-28 11:49:12 +08:00
93f14e7c65
Merge branch 'master' into vim51_win8
...
Conflicts:
client/tomcatconf/componentContext.xml.in
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
vmware-base/test/com/cloud/vmware/TestVMWare.java
2013-02-27 17:47:10 -08:00
36f4b44c36
Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
...
new Spring framework and register it into internal dao map.
2013-02-27 15:47:07 -08:00
79bfbe32ce
Merge branch 'master' into ui-regions
2013-02-27 08:37:31 -08:00
2f135be15f
CLOUDSTACK-1415: Debian & Ubuntu packaging work
...
Some concepts included:
* the replace.properties location used by maven is parameterized to allow
for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
-dev mailing list and between committers at the Build a Cloud Day in Belgi
* package version pattern is updated (since we redo all package names,
we might as well drop the epoch)
2013-02-27 15:44:46 +00:00
ddd507bccc
Missed commenting the missing allocator.
2013-02-27 20:03:33 +05:30
d68b6c3e54
temporary fix: autowriring failing for missing storage allocator
...
The storage allocator beans were given with the wrong package namespace
of com.cloud and not org.apache.cloudstack. Removed and correctedt the
namespace. Server coems up successfully.
Edison to revisit and complete the fix.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 20:01:16 +05:30
8e360f342d
CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support
2013-02-26 18:39:23 -08:00
b9294daaf1
Add remove region action labels
2013-02-26 16:05:32 -08:00
60cd4dd09e
Merge branch 'master' into vim51_win8
2013-02-26 15:14:45 -08:00
cf06861c9b
CLOUDSTACK-1387: fix incorrect commit
...
d37ed18c3a
2013-02-26 15:08:30 -08:00
8aba25f18d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-410to420.sql
2013-02-26 14:12:36 -08:00
8831b2920c
Implement 'add region' action
2013-02-26 13:27:59 -08:00
142a5a8fba
Implement region list view
2013-02-26 13:09:32 -08:00
d37ed18c3a
CLOUDSTACK-1244: Make sure path exists before copying scripts in client/target
...
This reverts commit cc25e58d
2013-02-26 12:17:38 +05:30
c1d513ef12
CloudStack CLOUDSTACK-1382
...
vm deploy fails with Error "cannot find DeployPlannerSelector for vm"
adding configuration of DeployPlanSelector to nonossComponentContext.xml.in
fixed resolved
2013-02-25 16:07:50 -08:00
39af8a3a16
Merge branch 'master' into vim51_win8
2013-02-25 14:18:21 -08:00
cc25e58dc2
move copy scripts after classes folder is created
2013-02-25 14:06:30 -08:00
fbfc5c6894
Merge from master and fix conflicts
2013-02-25 11:53:24 -08:00
79fee523bd
CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml
2013-02-22 15:56:54 +08:00
e0008844df
client: Remove duplicate baremetal dependency, regression from 1f15c1e9
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-22 11:38:54 +05:30
15ead099a1
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
able to start vm
Conflicts:
client/tomcatconf/componentContext.xml.in
server/src/com/cloud/baremetal/BareMetalTemplateAdapter.java
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-02-21 15:48:08 -08:00
55b77c7c8f
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
adding missing scripts back
Conflicts:
client/pom.xml
client/tomcatconf/commands.properties.in
server/src/com/cloud/server/ManagementServerImpl.java
2013-02-21 15:46:11 -08:00
1f15c1e9e7
CloudStack CLOUDSTACK-774
...
Supporting kickstart in CloudStack baremetal
fixing bugs to align to new code base
Conflicts:
client/tomcatconf/componentContext.xml.in
2013-02-21 15:42:38 -08:00
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
d81209210c
client: Add baremetal and ucs as dependencies
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 23:52:05 +05:30
16f51227c6
client: Fix web.xml string processing based on profile, oss or nonoss
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-21 23:52:05 +05:30
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
73d5926d0f
CLOUDSTACK-1333: enable logging at Spring startup phase
2013-02-19 20:48:10 -05:00
11d5eadc72
Summary: Re-adjusting tomcat memory settings per Rohit's emails
...
Detail: adjusting MaxPerm to 800, Perm to 512.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361312885 -0700
2013-02-19 15:30:42 -07:00
5b94646d5e
Summary: Increase tomcat servers memory size per dev list discussion
...
Detail: Per Kelven Yang when Javelin was merged into master/4.1, the memory
settings for management server should be a heap of 2g and a max perm size of
512m, due to increased footprint introduced by spring framework/Javelin.
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361311099 -0700
2013-02-19 15:00:34 -07:00
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
295b327281
client: In pom.xml fix jetty:run to include utilities/scripts/db/ in its classpath
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 13:31:59 +05:30
9e32fc4c83
maven: Fix stray characted in client/pom.xml introduced in 4572bc06
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-14 16:30:24 +05:30
dfaffcebad
Merge branch 'master' into ui-plugins
...
Conflicts:
ui/index.jsp
2013-02-13 14:03:53 -08:00
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
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
c0442e2556
Fix a bug in register template, cannot find template adapter.
2013-02-12 16:56:02 -08:00
2293caa32e
moved console proxy into services directory. no code change
2013-02-12 16:00:13 -08:00
22636d520e
Merge branch 'master' into ui-plugins
2013-02-11 11:48:31 -08:00
1896685d83
Slightly upgraded memory requirements, with 128M the server will crash
...
after 30 minuted with an OOM on PermGen
2013-02-11 17:47:35 +01:00
4a96a200b1
Merge branch 'master' into ui-plugins
2013-02-08 13:09:52 -08:00
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
2cb50b17fb
Merge branch 'master' into ui-plugins
2013-02-07 12:03:35 -08:00
d72e5ffc0f
CLOUDSTACK-1184 Localization - Add Korean label to all locales
2013-02-07 14:05:36 +05:30
bdb904c125
Localization:Korean Translation
2013-02-07 10:34:18 +05:30
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
e5866cf2ef
CLOUDSTACK-1165, fix nonoss build startup issue
2013-02-05 14:27:57 -08:00
4f274d0b8e
Summary: resizeVolume needs to be available in UI
...
Detail: Adds UI element for resizing a volume
BUG-ID: CLOUDSTACK-644
Reported-by: hongtu_zang@tcloudcomputing.com
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360091087 -0700
2013-02-05 12:04:47 -07:00
0816a0bdea
CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl
2013-02-05 17:18:23 +05:30
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
2234e043e2
Summary: update packaging
...
Change some paths to use the new cloudstack name
2013-02-05 10:47:42 +01:00
43dc31bcf2
NiciraNvpElement is loaded twice, but no idea where. This makes it work
...
however
2013-02-04 15:08:58 +01:00
e04d8f3fcf
We don't need logs in out source tree
2013-02-02 11:25:04 +01:00
e74f72be34
Fix the merge conflicts
2013-02-01 15:22:58 -08:00
296c20332d
Merge javelin into master
2013-02-01 14:40:45 -08:00
7b75f0d990
Sync master to javelin one more time
2013-02-01 11:37:33 -08:00
736b236eaf
bigswitch controller support
...
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +05:30
9ea90c3359
Merge branch 'master' into regions
...
Conflicts:
client/tomcatconf/components.xml.in
server/src/com/cloud/api/ApiResponseHelper.java
2013-02-01 11:38:16 +05:30
96c24930ae
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2013-02-01 08:45:53 +05:30
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
64d794ea36
Restore old caching policy on DAOs under Spring configuration
2013-01-31 16:00:13 -08:00
5cb9df91a1
Merge branch 'ipv6'
...
Conflicts:
api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
e7a554fc6a
Merging events framework branch into master. This commit will bring
...
following changes
- introduced notion of event bus with publish, subscribe, unsubscribe
semantics
- a plug-in can implement the EventBus abstraction to provide event
bug to CloudStack
- A rabbitMQ based plug-in that can interact with AMQP servers to
provide message broker based event-bug
- stream lines, action events, usage events, alerts publishing in to
convineance classed which are also used to publish corresponding
event on to event bus
- introduced notion of state change event. On a state change, in the
state machine corrsponding to the resource, a state change event is
published on the event bug
- associated a state machined with Snapshot and Network objects
- Virtual Machine, Volume, Snaphost, Network object state changes wil
result in a state change event
2013-02-01 01:37:24 +05:30
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
c607e03f0e
Merge branch 'master' into regions
2013-01-31 22:31:25 +05:30
8b1a5b1de2
- Separated RegionServiceImpl and RegionManagerImpl
...
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
3cbce11b78
Fixing a label in network offering
2013-01-31 18:01:42 +05:30
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
b21595c10d
CLOUDSTACK-297: Reset SSH key to access VM
...
This feature provides resetting a SSH key for an existing VM which means,
setting the old ssh key that is assigned to the VM previously with the new ssh
key.
Signed-off-by: Harikrishna Patnala <harikrishna.patnala@citrix.com>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-30 17:33:44 -08:00
ed547d91f7
IPv6: Rename public_ipv6_address to user_ipv6_address
2013-01-30 17:05:47 -08:00
c5b2a65598
Removing the merge conflict statements from git.
2013-01-30 17:04:57 -08:00
15906c03ca
Summary: add/remove/update default nics feature
...
Description: Adds API calls updateDefaultNicForVirtualMachine,
addNicToVirtualMachine, and removeNicFromVirtualMachine. These are
intended to allow a user to modify a VM's configuration post
deployment, to adjust the networks to which the VM belongs.
BUG-ID: CLOUDSTACK-645
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
2013-01-30 17:43:21 -07:00
397b5b5829
Removing the merge conflict statements from git.
2013-01-30 16:30:57 -08:00
0f6eb2f53d
UI plugins: Add localization strings
2013-01-29 15:36:02 -08:00
8887f01b37
CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name
2013-01-28 17:12:41 -08:00
ea660cd06d
removed MockAPI server
2013-01-28 17:50:38 +05:30
4c1a69ac33
client: Fix maven to replace nonoss spring ctx xml for nonoss build
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-27 05:40:17 -08:00
bd4bc025d1
IPv6: Accept IPv6 parameter for createNetworkCmd
...
Also ass public_ipv6_address for ipv6 address management.
Extend nics and vlans for ipv6 address.
Add dependency to com.googlecode.ipv6(java-ipv6).
Modify dhcpcommand for ipv6.
2013-01-26 23:14:15 -08:00
767f54cc9a
Make nonoss build work under Spring
2013-01-25 17:18:36 -08:00
2b67fc8441
Add nonossComponentContext.xml.in for nooss composition of CloudStack
2013-01-25 15:48:25 -08:00
1f57d925eb
Apply API refactoring changes. Make changes to Regions API to work with new code
2013-01-25 18:41:59 +05:30
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
1cb0ce44df
Removing BareMetalService referrences. We will load UserVMService by default.
2013-01-22 12:54:20 -08:00
fe994a6e63
CLOUDSTACK-1027: Update SSL certificate button should properly reflect it's functionality:Changing the label and adding the title tag
2013-01-22 15:09:28 +05:30
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
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
64f13e1cd8
DatabaseCreator: Fast forward merge due to recent pull in merge of master
2013-01-18 18:16:04 -08:00
6214b1d4bd
db.properties: adding other key value info for dbcreator to work in a generic way
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 17:19:55 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
2fd1d476b4
Merge branch 'master' into api_limit
2013-01-17 21:23:50 -08:00
86ada92ffa
Fix some bugs and add java integration test for api rate limit plugin.
2013-01-17 15:13:51 -08:00
c1a540c6bb
Merge branch 'master' into api_limit
...
Conflicts:
api/src/org/apache/cloudstack/api/BaseCmd.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/ApiServlet.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:48:22 -08:00
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
975021dda1
Summary: adding resizeVolume api call
...
Detail: This merges the resizevolume feature branch, which provides the
ability to migrate a disk between disk offerings, thereby changing its
size, or specifying a new size if current disk offering is custom.
BUG-ID: CLOUDSTACK-644
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358358209 -0700
2013-01-16 17:43:35 -07:00
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
727fab71cb
Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run
2013-01-16 14:16:01 -08:00
4355d06a86
Reuse APIChecker adapter interface for APi Rate limit checking and optimize ApiRateLimitService interface.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-15 15:53:19 -08:00
af67d87662
Fix issues with @DB support in Spring environment
2013-01-15 12:35:03 -08:00
0a1e4b8cf9
tomcatconf: Move apiname:mask rules in commands.properties.in, delete others
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:25 -08:00
f304df44df
Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP
2013-01-14 17:44:31 -08:00
ec3dd71adf
Configure ApiRateLimit adapter.
2013-01-14 17:19:35 -08:00
4d0c850dc8
Fix plugin component configuration.
2013-01-14 17:13:18 -08:00
6dfbcee63d
Fix singleton initialization in ApiServer/ApiDispatcher to make it work under Spring bootstraped environment
2013-01-14 13:57:30 -08:00
127867cc99
Improved handling of unknown OS, Distribution
...
Introduce UnknownSystemExcpetion to indicate that the system is
is unknonwn. Catch said exception in cloud-setup-management,
print an error and exit.
CLOUDSTACK-966: Improve error reporting when running on unknown OS / version
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-13 15:08:04 +05:30
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
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
57e67c57d7
Merge branch 'master' into api_limit
...
Conflicts:
server/src/com/cloud/api/ApiServer.java
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-11 15:50:21 -08:00
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
74bb043c37
APIChecker: Rename refactor and add interface checkExistence
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 18:51:30 -08:00
d900345a20
Ehcache implementation of APi Rate limit plugin.
2013-01-10 17:47:48 -08:00
1294cdc701
pulled from master
2013-01-10 16:01:01 -08:00
Funs Kessen
Edison Su
Brian Federle
Prasanna Santhanam
Kelven Yang
Anshul Gangwar
Rajesh Battala
Rohit Yadav
Sanjay Tripathi
Chip Childers
Milamber
Min Chen
Alena Prokharchyk
Hugo Trippaers
Nitin Mehta
Jayapal Uradi
Hugo Trippaers
Abhinandan Prateek
Likitha Shetty
frank
Noa Resare
Mice Xia
Edison Su
frank
Marcus Sorensen
Alex Huang
Pranav Saxena
Channy Yun
Kishan Kavala
Kanzhe Jiang
Murali Reddy
Sheng Yang
Harikrishna Patnala
Prachi Damle
Chiradeep Vittal