etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,696 Commits 325 Branches 325 Tags 885 MiB
Commit Graph

130 Commits

Author SHA1 Message Date
Alex Huang 01151331f5 Separate out the target directories for eclipse and the one for regular builds 2013-03-13 20:21:57 -07:00
Rohit Yadav cccdbe6309 pom: Exclude systemvmtemplate64 during rat checking, attr already fixed in LICENSE 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-03-11 14:59:11 +05:30
Prasanna Santhanam c9ee05517d rat-check:Reduce scope of the WEB-INF check 
License headers from the files within artifact org.apache.axi2 causes
RAT to complain. Ignore them as they are not part of the repo.
 2013-03-07 18:58:48 +05:30
Prasanna Santhanam b899789665 rat-check: couple more in awsapi need exclusion 
awsapi/ .info files aren't needed either.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-07 14:52:10 +05:30
Prasanna Santhanam 81a42b9591 rat check: exclude the WEB-INF directories in check 
WEB-INF directories will carry generated code so exclude them.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-07 14:35:53 +05:30
Wido den Hollander e14e057f3d packaging: Use the JNA version from the distribution 
Libvirt-java 0.4.9 works just fine with JNA 3.2.4 which is in
all distributions.

Future libvirt version require at least JNA 3.5.1 due to new methods
and memory management, but that is not our concern now.

By depending on the JNA in the distribution and adding it to the classpath
we can work just fine.
 2013-03-05 16:10:38 +01:00
Min Chen 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
Chiradeep Vittal 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
Min Chen 8b9c45b96d Merge branch 'master' into vim51_win8 
Conflicts:
	setup/db/db/schema-40to410.sql
 2013-03-01 16:46:58 -08:00
Hugo Trippaers 092d5e4cd8 Tweak the jna dependency 2013-03-01 20:09:41 +01:00
Wido den Hollander 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
Min Chen 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
Noa Resare 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
Edison Su 8e360f342d CLOUDSTACK-724: add basic zone wide storage support, refactor storage allocator, need ui support 2013-02-26 18:39:23 -08:00
Min Chen fbfc5c6894 Merge from master and fix conflicts 2013-02-25 11:53:24 -08:00
Min Chen 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
Sheng Yang 99653ea328 IPv6: Update java-ipv6 dependency to 0.10 2013-02-20 18:41:58 -08:00
Rohit Yadav 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
Chip Childers 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
Prasanna Santhanam 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
Rohit Yadav 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
Rohit Yadav 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
Alex Huang 2293caa32e moved console proxy into services directory. no code change 2013-02-12 16:00:13 -08:00
Chip Childers 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
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 894cb8f7d9 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