Commit Graph

1059 Commits

Author SHA1 Message Date
Milamber de3dcf68a8 CLOUDSTACK-1517 - fix catalan and italian black page (double backslash before a quote) 2013-03-22 15:52:28 -04:00
Milamber ea86ce2328 CLOUDSTACK-1780 and CLOUDSTACK-1783 - Client UI: l10n files in ASCII with unicode chars: es/ja/zh_CN 2013-03-22 13:24:21 -04:00
Sebastien Goasguen 8a18b7f23e CLOUDSTACK-1780: Added support for multi-language in login page 2013-03-22 09:36:11 -04:00
Milamber 030d5646e1 CLOUDSTACK-1780: Fix multi-language support in UI
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2013-03-22 09:02:26 -04:00
Sebastien Goasguen 54f45e2545 CLOUDSTACK-1517: Added translation files for UI 2013-03-20 18:29:22 -04:00
Kelven Yang 00f63c44b6 CLOUDSTACK-1323: retire some of no-longer used files 2013-03-08 16:54:46 -08:00
Milamber 5807635533 CLOUDSTACK-465 - French language file quotes are dropping javascript syntax errors 2013-03-06 06:10:45 -05:00
Hugo Trippaers ce6f8aafd2 CLOUDSTACK-1304 Set permissions using the chmod ant task 2013-03-02 21:04:54 +01:00
Likitha Shetty 5d8883fde7 CLOUDSTACK-1450. AWSAPI server fails to start. Missing annotation @Component in CloudStackUserDao implementation 2013-03-01 09:52:28 -05:00
Hugo Trippaers be141f6ede Avoid the use of operating system specific functions, actually avoid
exec as much as possible.
2013-03-01 08:22:40 +01:00
frank 2093aefcb8 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
2013-02-28 15:34:57 -08:00
Hugo Trippaers ad90e208b0 Don't load from a fixed path, but load from the classpath so admins or packagers can overwrite the logging config
(cherry picked from commit 97ca7791b3)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-28 23:36:16 +01:00
Noa Resare c40e971752 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:31:02 +00:00
Min Chen 4198e65500 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:28:32 -08:00
Noa Resare 78e8d18428 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 Belgium.
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
2013-02-27 15:38:55 +00:00
Min Chen 25efe05018 CLOUDSTACK-1387: fix incorrect commit
d37ed18c3aff4fe522adb803322ba912819c73da.(cherry picked from commit cf06861c9b)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 11:15:35 +05:30
Prasanna Santhanam 6977e7bd45 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>

Conflicts:
	client/tomcatconf/componentContext.xml.in

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-26 18:54:02 +05:30
Rohit Yadav 06ed67c776 CLOUDSTACK-1244: Make sure path exists before copying scripts in client/target
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-26 12:13:57 +05:30
frank 14a22ab2f5 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:05:51 -08:00
Kelven Yang 4f38d745b8 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-02-24 13:31:42 -08:00
Mice Xia 3e29864925 CloudStack CLOUDSTACK-774 add baremetal related class declaration in nonossComponentContext.xml 2013-02-22 15:54:53 +08:00
frank 2e069ad16b CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

able to start vm
2013-02-21 15:39:15 -08:00
frank 10afc3b571 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

adding missing scripts back
2013-02-21 15:39:15 -08:00
frank 241d05e685 CloudStack CLOUDSTACK-774
Supporting kickstart in CloudStack baremetal

fixing bugs to align to new code base
2013-02-21 15:39:15 -08:00
Kelven Yang cc58b7b85a CLOUDSTACK-1333: enable logging at Spring startup phase 2013-02-19 20:49:14 -05:00
Marcus Sorensen 27479d569a 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:28:05 -07:00
Marcus Sorensen 2bbbe09098 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 14:58:19 -07:00
Rohit Yadav 65d1a4bc7d client: In pom.xml fix jetty:run to include utilities/scripts/db/ in its classpath
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 295b327281)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-17 00:24:58 +05:30
Rohit Yadav 0853aca36b maven: Fix stray characted in client/pom.xml introduced in 4572bc06
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 4f33ea29e8d0953c42ae9a3185e3656961174f9a)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-14 16:29:42 +05:30
Rohit Yadav 0119d22370 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>
(cherry picked from commit 7401b06cb1)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 15:55:39 +05:30
Hugo Trippaers 2b593dd894 Slightly upgraded memory requirements, with 128M the server will crash
after 30 minuted with an OOM on PermGen(cherry picked from commit 1896685d83)

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-11 17:47:12 +01:00
Min Chen 3ce7531d2b Remove duplicate bean for ApiRateLimitServiceImpl to make sure that only
one ApiChecker instance is injected in ApiServer.
2013-02-07 21:42:30 -08:00
Pranav Saxena 7f0e5fefec CLOUDSTACK-1184 Localization - Add Korean label to all locales 2013-02-07 14:17:02 +05:30
Channy Yun 624ff03f24 Localization:Korean Translation 2013-02-07 10:48:14 +05:30
Hugo Trippaers 5793a0c597 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(cherry picked from commit 9d134f0f19)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 23:51:55 +01:00
Kelven Yang 2a63dbe59d CLOUDSTACK-1165, fix nonoss build startup issue 2013-02-05 14:38:13 -08:00
Hugo Trippaers 38f364bb8d Summary: update packaging
Change some paths to use the new cloudstack name
(cherry picked from commit 2234e043e2)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 21:14:15 +01:00
Hugo Trippaers cb4d498da1 NiciraNvpElement is loaded twice, but no idea where. This makes it work
however(cherry picked from commit 43dc31bcf2)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 21:12:11 +01:00
Hugo Trippaers ed4dbb4104 We don't need logs in out source tree
(cherry picked from commit e04d8f3fcf)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-02-05 21:05:20 +01:00
Marcus Sorensen 35f7ac307a 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:08:18 -07:00
Kishan Kavala cffa45f710 CLOUDSTACK-1154: Added @Component annotation to RegionServiceImpl and RegionManagerImpl 2013-02-05 17:17:13 +05:30
Kishan Kavala 7970384f6e CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl 2013-02-05 16:43:40 +05:30
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
Kanzhe Jiang 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
Kishan Kavala 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
Murali Reddy 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
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
Sheng Yang 5cb9df91a1 Merge branch 'ipv6'
Conflicts:
	api/src/com/cloud/network/NetworkProfile.java
2013-01-31 15:07:33 -08:00
Murali Reddy 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
Kelven Yang 1b2b369ecb Merge latest master into javelin 2013-01-31 11:34:49 -08:00
Kishan Kavala c607e03f0e Merge branch 'master' into regions 2013-01-31 22:31:25 +05:30
Kishan Kavala 8b1a5b1de2 - Separated RegionServiceImpl and RegionManagerImpl
- Added comments
- Changed package name to org.apache.cloudstack.region
2013-01-31 18:08:20 +05:30
Pranav Saxena 3cbce11b78 Fixing a label in network offering 2013-01-31 18:01:42 +05:30
Jayapal b6727e5646 CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
Harikrishna Patnala 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
Sheng Yang ed547d91f7 IPv6: Rename public_ipv6_address to user_ipv6_address 2013-01-30 17:05:47 -08:00
Prachi Damle c5b2a65598 Removing the merge conflict statements from git. 2013-01-30 17:04:57 -08:00
Marcus Sorensen 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
Prachi Damle 397b5b5829 Removing the merge conflict statements from git. 2013-01-30 16:30:57 -08:00
Kelven Yang 8887f01b37 CLOUDSTACK-1070: HypervisorTemplateAdapter needs to be configured with proper name 2013-01-28 17:12:41 -08:00
Kishan Kavala ea660cd06d removed MockAPI server 2013-01-28 17:50:38 +05:30
Rohit Yadav 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
Sheng Yang 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
Kelven Yang 767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Kelven Yang 2b67fc8441 Add nonossComponentContext.xml.in for nooss composition of CloudStack 2013-01-25 15:48:25 -08:00
Kishan Kavala 1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
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
Pranav Saxena 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
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
Rohit Yadav 64f13e1cd8 DatabaseCreator: Fast forward merge due to recent pull in merge of master 2013-01-18 18:16:04 -08:00
Rohit Yadav 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
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Min Chen 2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Min Chen 86ada92ffa Fix some bugs and add java integration test for api rate limit plugin. 2013-01-17 15:13:51 -08:00
Min Chen 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
Chiradeep Vittal 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
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
Marcus Sorensen 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
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
Min Chen 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
Kelven Yang af67d87662 Fix issues with @DB support in Spring environment 2013-01-15 12:35:03 -08:00
Rohit Yadav 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
Kelven Yang f304df44df Add ActionEventIntercepter to implement origianl ActionEventCallback in Spring AOP 2013-01-14 17:44:31 -08:00
Min Chen ec3dd71adf Configure ApiRateLimit adapter. 2013-01-14 17:19:35 -08:00
Min Chen 4d0c850dc8 Fix plugin component configuration. 2013-01-14 17:13:18 -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
Noa Resare 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
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
Min Chen 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
Kelven Yang f57dcaa820 Loadable components to be in separted Spring component bundling 2013-01-11 15:33:15 -08:00
Rohit Yadav 74bb043c37 APIChecker: Rename refactor and add interface checkExistence
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 18:51:30 -08:00
Min Chen d900345a20 Ehcache implementation of APi Rate limit plugin. 2013-01-10 17:47:48 -08:00
Alex Huang 1294cdc701 pulled from master 2013-01-10 16:01:01 -08:00