apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 02:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,901 Commits 312 Branches 325 Tags
Commit Graph

106 Commits

Author SHA1 Message Date
Min Chen
a224287403 Merge branch 'master' into vim51_win8 
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-02-05 10:05:39 -08:00
Kelven Yang
7bd8bec68a Sync javelin with master up to 894cb8f7d9fc8b5561754a9fa541fef8f235148a 2013-01-31 17:20:19 -08:00
Min Chen
780ac2a9c6 Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP. 2013-01-31 10:32:05 -08:00
Kelven Yang
da2e6461a6 Remove temporary hacking and use Official way to wire-up servlet with injection under Spring 2013-01-30 15:21:01 -08:00
Rohit Yadav
1e0709d16d maven: fix axis2 version to 1.5.6 fixes starting issue with awsapi 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-29 14:02:40 -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
Rohit Yadav
0f5c5c2078 maven: tools/devcloud should be in developer profile 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 17:06:52 -08:00
Alex Huang
f7e75d3aaf Fixed the problems with simulator. Turned off the skip tests 2013-01-21 10:37:53 -08:00
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Min Chen
e8c0c1a8ee Avoid some m2e error in eclipse for imported project. 2013-01-18 11:36:09 -08:00
Rohit Yadav
a0bc5089d0 maven: disable awsapi by default, enable by -P awsapi profile 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 21:58:22 -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
Alex Huang
9759ad57f2 Commit the current changes to unit tests 2013-01-17 06:50:11 -08:00
Chip Childers
f7b8ad5e8b Updating the RAT exclude list to no longer exclude devcloud .cfg files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-01-15 16:28:16 -05:00
Rohit Yadav
d8b04507d8 maven: exclude rat license checking for devcloud advanced cfg 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-14 19:36:27 -08:00
Alex Huang
757e1a931b cleanup warnings in utils 2013-01-10 17:19:30 -08:00
Alex Huang
d6f44a4d6a merged from master 2013-01-10 15:55:42 -08:00
Marcus Sorensen
1c59dae708 Summary: Add devcloud-kvm files 
Detail: Working on getting a KVM-based devcloud so that development that
requires the KVM hypervisor can be simpler. This adds some setup devcloud files.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1357852438 -0700
 2013-01-10 14:13:58 -07:00
Alex Huang
f40e7b7511 removed componentlocator and inject 2013-01-10 11:05:20 -08:00
Alex Huang
b6c56736e5 merge from master 2013-01-09 05:20:36 -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
Alex Huang
cf8de7ee17 Removed all the .project files 2013-01-08 14:11:00 -08:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
David Nalley
e2f2f7bf3d enabling cobertura reports 2013-01-03 16:51:30 -05:00
Rohit Yadav
78d70d349b Merge branch 'master' into api_refactoring 
- Applies Isaac Chian'gs fix (CLOUDSTACK-648) to allow user change their password
- TODO: Fix response, only partially applied

Conflicts:
	api/src/org/apache/cloudstack/api/response/UserResponse.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-25 09:51:17 -08:00
Prasanna Santhanam
1f1a13448f simulator: resurrect simulator hypervisor as plugin 
Multiple fixes:
1. changes to the mvn configuration
    a. include simulator to client.war
    b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
    a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties

TODO:
 Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
 2012-12-23 19:28:57 -08:00
Rohit Yadav
296b49c2f8 Merge branch 'master' into test-merge-api 
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-23 13:54:46 -08:00
Rohit Yadav
5572707ec6 maven: Bump httpcore version, add guava and httpclient dependency 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-17 20:44:48 -08:00
Rohit Yadav
89dc874f6f rat: Fix license on recently added new files in tools/devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-12-14 22:23:09 -08:00
Edison Su
b70c1a5a84 Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Hugo Trippaers
b0955e43ff Put the mockito version in the central version list 2012-12-06 14:42:59 +01:00
David Nalley
40ff63564b setting cobertura to produce html and xml reports 2012-11-21 12:54:09 -05:00
Meghna Kale
b7c74ee78b Unit test additions (and some minor command class changes to support testing) 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-11-20 12:21:54 -05:00
olivier lamy
66ca4323b4 fix project name in description element 2012-11-20 12:40:36 +01:00
adefanti
2a0d0104bd maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only 
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
 2012-11-20 09:27:07 +01:00
Hugo Trippaers
1a7c94204d Summary: remove the deps pom, this is no longer required for the maven 
build.

Removed the deps pom and removed the deps profile from the main pom as
it was only there for the 4.0 build to support jar downloading for
ant.
 2012-11-07 15:14:59 +01:00
Alex Huang
3dafea6eff Moved platform to engine 2012-11-05 09:13:53 -08:00
Rohit Yadav
23659684e8 maven: include tools/cli in top level pom 
For developer profile include tools/cli in top level pom

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2012-10-31 23:19:24 +05:30
Hugo Trippaers
f65b268a2e Active the testrun by default in maven 
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
 2012-10-30 14:15:07 +01:00
Kelven Yang
c272cf6b69 add TransactionContextBuilder based on Spring AOP 2012-10-25 15:01:12 -07:00
Edison Su
ad3e98c1eb @DB works on spring 2012-10-25 10:27:22 -07:00
Hugo Trippaers
6a20802640 Fix runtime dependencies for vmware modules 
The vmware modules should be listed as provided so they are never
packaged. However this also means that you have to put them in the
web-inf/lib directory by hand.

Set the version of the api in the central pom for easy reference.

Add wsdl4j as a runtime requirement. It is actually required by the
vmware implementation but it is easier to list it as a requirements for
the component here as vmware is not in any maven repo

put the dependency on vim back in the dependencies. It is not required
for compile, but is required as runtime by apputils.
 2012-10-22 17:58:36 +02:00
Hugo Trippaers
d04bfc3400 Moved apidocs,marvin and devcloud to developer profile 
These maven targets depend on a specific setup of a developer desktop
and require special tools that might not be available on all operating
systems (like bash). Also on of the bash scripts directly calls javac
instead of using the maven build system to deal with dependencies to the
method might not run correcly on all systems.

I've moved these tasks to the developer profile, so you can still use
them but you need to add -P developer to the mvn commandline. This
allows the base of cloudstack to build and run even if you environment
is not configured to run publican for example.
 2012-10-22 10:05:22 +02:00
Edison Su
d1af01fbc8 add marvin project 2012-10-21 00:01:48 -07:00
Edison Su
b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00
Edison Su
f6ac4dbe5d fix some pom xml files indentation, add db.root.passowrd, add utils/conf/db.properties.override, add to create user cloud, add devcloud pom file 
Conflicts:

	pom.xml
 2012-10-19 15:27:19 -07:00
Kelven Yang
8ef9e32cfd Architecture refactoring - Stateless management server - Spring Framework initiatives 2012-10-19 15:24:15 -07:00
olivier lamy
a900f5a370 define version of dependency plugin in parent pom 2012-10-17 15:10:43 +02:00
olivier lamy
45ec07c3fd remove tabs replace with spaces 2012-10-17 15:03:27 +02:00