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
6a1ecae552
Ensure RAT does not report marvin generated files as noncompliant in developer environment
...
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-02 16:49:02 +05:30
8b9c45b96d
Merge branch 'master' into vim51_win8
...
Conflicts:
setup/db/db/schema-40to410.sql
2013-03-01 16:46:58 -08:00
092d5e4cd8
Tweak the jna dependency
2013-03-01 20:09:41 +01:00
24c974dc03
agent: Add net.java.dev.jna.platform as a runtime dependency
...
This is required for newer versions of libvirt-java
2013-03-01 16:47:05 +01: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
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
8e360f342d
CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support
2013-02-26 18:39:23 -08:00
fbfc5c6894
Merge from master and fix conflicts
2013-02-25 11:53:24 -08:00
a433a29e8e
Add -XDignore.symbol.file=true javac option to avoid compilation check
...
to acccess com.sun.xml.internal.ws.transport.http.client package.
2013-02-22 11:32:23 -08:00
99653ea328
IPv6: Update java-ipv6 dependency to 0.10
2013-02-20 18:41:58 -08:00
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
6279433f45
CLOUDSTACK-625: Correcting legal documentation for the require.js file
...
that was added for the UI plugin feature.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-15 10:24:16 -05:00
05437d0e97
maven pom: put apache cloudstack tools together in umbrella pom
...
minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.
$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>
OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config
will deploy the datacenter using the marvin.config property's value
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-15 20:53:41 +05:30
93096efc77
maven: build client at the end, fixes path error for console-proxy build target
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 13:48:49 +05:30
9fd09a7f5f
console-proxy: Fix broken build system due to console-proxy moves
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-13 12:56:40 +05:30
2293caa32e
moved console proxy into services directory. no code change
2013-02-12 16:00:13 -08:00
ebe738ee20
CLOUDSTACK-1233: Fixed veewee config file legal documentation
...
The veewee configuration files used for the devcloud base-box build, as
well as the newly introduced files used to create a system vm, were
inappropriately identified as ASLv2 licensed and copyrighted by the ASF.
The fixes:
- The ASF headers stripped to match the source.
- The files are now excluded from RAT checks in the root pom.
- The tools/whisker/descriptor.xml file updated
- The root LICENSE and NOTICE were re-generated
Changes in the Apache Whisker templates for LICENSE and NOTICE files
caused a good bit of whitespace oddness in this commit for those 2
files.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-11 21:40:06 -05:00
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
7bd8bec68a
Sync javelin with master up to 894cb8f7d9
2013-01-31 17:20:19 -08:00
780ac2a9c6
Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP.
2013-01-31 10:32:05 -08:00
da2e6461a6
Remove temporary hacking and use Official way to wire-up servlet with injection under Spring
2013-01-30 15:21:01 -08:00
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
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
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
f7e75d3aaf
Fixed the problems with simulator. Turned off the skip tests
2013-01-21 10:37:53 -08:00
fe6f0457d5
fixed unit tests from merge
2013-01-18 15:58:55 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
e8c0c1a8ee
Avoid some m2e error in eclipse for imported project.
2013-01-18 11:36:09 -08:00
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
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
9759ad57f2
Commit the current changes to unit tests
2013-01-17 06:50:11 -08:00
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
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
757e1a931b
cleanup warnings in utils
2013-01-10 17:19:30 -08:00
d6f44a4d6a
merged from master
2013-01-10 15:55:42 -08:00
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
f40e7b7511
removed componentlocator and inject
2013-01-10 11:05:20 -08:00
b6c56736e5
merge from master
2013-01-09 05:20:36 -08:00
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
cf8de7ee17
Removed all the .project files
2013-01-08 14:11:00 -08:00
30f2565d98
Merge branch 'api_refactoring' into javelin
2013-01-08 12:36:04 -08:00
e2f2f7bf3d
enabling cobertura reports
2013-01-03 16:51:30 -05:00
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
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
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
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
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
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
b0955e43ff
Put the mockito version in the central version list
2012-12-06 14:42:59 +01:00
Min Chen
Chiradeep Vittal
Hugo Trippaers
Wido den Hollander
Noa Resare
Edison Su
Sheng Yang
Rohit Yadav
Chip Childers
Prasanna Santhanam
Alex Huang
Kelven Yang
Marcus Sorensen
David Nalley
Hugo Trippaers