Commit Graph

477 Commits

Author SHA1 Message Date
Hugo Trippaers 8e704f5eee Add a first version of a PMD ruleset to our check project 2014-06-11 14:06:16 +02:00
Damodar Reddy aca7606a40 CLOUDSTACK-6563: Integrating dependencies as part of MSI installer so that those will get installed along with cloud stack installation 2014-05-16 10:50:32 +05:30
Anthony Xu 2ff2b6c249 Applied Tina's patches for removing the xapi jar 2014-04-23 15:32:12 -07:00
Anshul Gangwar 455d2b3284 CLOUDSTACK-6411: removing license header from nuget.config and agent settings file, with
the header they are not getting loaded properly. Added an exception to not to do rat
checks on these files.
2014-04-21 14:10:17 +05:30
Hugo Trippaers bd3fbc5dc0 Add PMD to core to provide some feedback on potential code quality concerns 2014-04-11 08:13:14 -06:00
Wido den Hollander 09f83e48eb CLOUDSTACK-4665: Depend on rados-java 0.1.4
This fixes the ArrayIndexOutOfBounds exception during the
removal of a RBD based volume
2014-04-08 17:44:30 +02:00
Alex Huang e9c81c78b9 Applied Tina's patches for removing the xapi jar 2014-04-02 14:00:56 -07:00
edison 6647802d08 CLOUDSTACK-5573: bump gson version to 1.7.2, fix https://code.google.com/p/google-gson/issues/detail?id=354 2014-03-28 16:22:32 -07:00
Daan Hoogland a7d7fee0cb findbugs: filter definition 2014-03-28 17:16:05 +01:00
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Daan Hoogland 3be5002eb3 findbugs: filter on character encoding problems 2014-03-27 18:47:33 +01:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
miguelaferreira ef547108dd NetUtils testing
- Refactor tests:
  - Upgrade tests to use jUnit4
  - Add hamcrest dependency (contribution of by Laszio Hornyak)
  - Break big tests in small unit tests
  - Replace assertTrue/False with complex conditions by assertThat with
specific matchers
- Remove dead code:
  - Private static method never called locally
- Add test for method that validates cidrs

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-02-25 19:23:13 +01:00
Hugo Trippaers bb23e3ac1f Update the XenServer library to version 6.2.0-1 in the poms. 2014-02-25 12:30:46 +01:00
Hugo Trippaers 594b51c629 Fixup the license headers in the utils project. All files now use the same license header and this is enforced by the maven-license-check plugin. 2014-02-18 12:08:36 +01:00
Antonio Fornie 510972abde Nvp and rest refactoring and more tests
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-18 09:51:54 +01:00
miguelaferreira 1237bf3222 Fix findbugs findings in cloudstack-service-console-proxy-rdpclient
Findings:
- 32 int shifted by an amount not in range -31..31:
	The shifts by 32 bits don't actually have any effect on the value
	(as shown by the tests)
- possible null pointer dereference
- repeated conditional test
- field only ever set to null
	All other uses of the field were to check if it was null,
	which it was, so it was removed

Other actions:
- Upgrade jUnit to version 4
- Add PowerMock dependency

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-14 18:37:46 +01:00
Hugo Trippaers 884c03f90d Add versions to the reporting plugins, prevents maven from complaining about it 2014-02-05 14:18:07 +01:00
Hugo Trippaers 12777e9e3a Allow even more memory for findbugs, awsapi is hungry 2014-01-29 13:44:20 +01:00
Hugo Trippaers 1c57dd7bcd Give findbugs some more memory or it will fail with an OOM on awsapi 2014-01-29 09:17:01 +01:00
Wido den Hollander 49a29ce0cf Switch to Java 7
We now require at least Java 7 to build and run CloudStack.

Both the DEB and RPM packaging now also require Java 7 during installation
of the packages.
2014-01-27 11:54:43 +01:00
Hugo Trippaers e668c3f4e5 Add configuration to the reporting section of the pom so we have findbugs and cobertura output in the site output. 2014-01-23 14:44:34 +00:00
Hugo Trippaers 9d735dd288 Add a profile that enables findbugs checks at build time. Use -Penablefindbugs to enable findbugs.
Add a bit of reporting configuration so the mvn site target includes javadoc and a findbugs report
2014-01-23 09:06:33 +01:00
Hugo Trippaers b68639c6da Add the license plugin with the check goal to the list of disabled eclipse plugins 2014-01-22 14:29:13 +01:00
Hugo Trippaers d3cd73d861 Add license check plugin to root pom. Disabled for the entire project, except for poms that override it (opendaylight, nvp) 2014-01-22 11:22:42 +01:00
Hugo Trippaers 33eaa4f633 Add a profile that disables checkstyle completely for the project.
Activate this profile in your IDE if you're having problems with checkstyle when switching branches. Please ensure that you at least compile once with checkstyle enabled before committing.
2014-01-22 10:29:07 +01:00
Hugo Trippaers dc227e3384 Don't build stuff that is never used, move the cloud-test project to the developer build. 2014-01-22 10:23:50 +01:00
Hugo Trippaers 25ae91da10 Shave another few seconds of the build time by disabling the checkstyle run in the main pom. 2014-01-15 09:49:57 +01:00
Hugo Trippaers b61f0a74ca Centralize all eclipse m2e excludes in the main pom.xml 2014-01-14 09:39:42 +01:00
Hugo Trippaers 7c8facf3c9 Change checkstyle to run on every sub project, so it will also run when you build an individual module 2014-01-09 17:00:11 +01:00
Alex Huang c2baed665b Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies 2013-12-20 17:21:34 -08:00
Alex Huang affe7efc82 Have the check happen earlier 2013-12-12 17:05:24 -08:00
Alex Huang f1eadc09e6 Fixed problem with checkstyle 2013-12-12 16:57:38 -08:00
Alex Huang 0c2a4b251a Everything now builds 2013-12-12 12:26:08 -08:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Alex Huang f33b247fc3 Moved the checkstyle project from parents to build to store all build tools in one location. Modified the config file to use 1024 for now. 2013-12-12 12:23:49 -08:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Alex Huang 170f32f171 Broke up some long strings 2013-11-21 07:25:01 -08:00
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang eaa250fd3c Formatted again after all the tab expansions and eol removals 2013-11-21 04:47:01 -08:00
Alex Huang e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang 62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Alex Huang 0232906708 Brought in Hugo's checkstyle 2013-11-21 03:09:07 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Darren Shepherd 0ec6b9ac99 Ignore all logs for rat, not just the ones at root
Git ignores log files, so basically they shouldn't checked in.  This
configures rat to ignore log files also.  Specifically the juniper-contrail
code creates a log file during testing.
2013-11-06 09:50:45 -07:00
Hugo Trippaers 479f404aea Fix several rat issues introduced by recent commits 2013-11-04 20:14:46 +01:00
Hugo Trippaers f39b6b2c56 Add checkstyle to the build process and enable it for the Nicira NVP plugin 2013-11-04 15:24:54 +01:00
Devdeep Singh d14592fe93 Make sure only unit tests are run during build time and not functional tests.
Fixing rebase issues after integrating with wmi v2 implementation.
Removing the executable attribute from some files.
Remove the unused wmi v1 interface file.
Unit test for DestroyCommand implementation in hyperv agent.
Fixed VM state changes w.r.t wmi version 2 changes
If a VM is already running, deploy virtual machine shouldn't fail and throw an exception.
Don't run vhd-util on templates which are present on CIFS. Hyperv uses cifs as secondary storage
Add a SCSI controller by default. This is needed so that data volumes can be added/removed
on a running vm.
Remove the hard coded path in the agent code.
Rat fixes for hyper agent. Added the missing headers in files where it was missing.
2013-11-04 18:48:54 +05:30
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Hugo Trippaers 85f83a4e83 Rat and me, the saga continues 2013-10-17 16:13:33 +02:00
Darren Shepherd 8cf00de51d Configuration to enable Spring Modularization
All of the code changes for the Spring Modularization will work in
a modularized context or a non-modularized context.  This commit
is the final commit to turn modularization on.  Revert this commit
to disable the modularization and go back to monolithic Spring
configuration.
2013-10-02 15:43:11 -07:00
Darren Shepherd aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Wido den Hollander 3e416da0bc kvm: Use libvirt-java 0.5.1
This version is Java 6 compatible and makes CloudStack Java 6
compatible again
2013-09-25 10:25:24 +02:00
Chip Childers 50de798861 Fixing more rat exclusions after refactor of systemvm build location 2013-09-24 09:04:14 -04:00
Chip Childers 87dde7024b Fixing the RAT exclusions after the refactor from 6c26104282 2013-09-23 20:00:39 -04:00
Hugo Trippaers 7f2481486e Rename nonoss to noredist to better reflect what the flag is used for. 2013-09-21 12:32:09 +08:00
Hugo Trippaers 8e25c7ab45 Add activation on systemvm property to the systemvm profile for backwards compatibility with existing buildscripts 2013-09-20 19:35:36 +08:00
Hugo Trippaers cf6a5c7c5a Fix a bug in the pom where the target and dist directory would not be removed during a clean 2013-09-20 19:31:44 +08:00
Hugo Trippaers 6c26104282 Move the system vm to a separate maven project.
All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat.
2013-09-20 18:31:02 +08:00
Hugo Trippaers e8eb75b38c Also remove the dist directory with a mvn clean 2013-09-20 18:31:02 +08:00
Wido den Hollander a709f34ff9 kvm: During migrate change the VNC listen address
The migrate method from libvirt supports passing down a different XML for running
the instance of the target hypervisor.

This enables the VNC to bind to the private IP Address of the hypervisor and during
migration this will be changed to the private IP address of the target host.

This way VNC doesn't listen world wide and is much safer.
2013-09-16 11:57:16 +02:00
Chip Childers 1f69ad1159 Removing apache RAT plugin version spec, so that we can use version 0.10 2013-08-19 14:31:06 -04:00
Wido den Hollander 3c35faaf5a CLOUDSTACK-4278: Fix resizing RBD volumes
Although libvirt supports resizing RBD volumes (and other formats) the
Java bindings (libvirt-java) don't.

Right now we use the Java bindings for librbd to handle the resizing for us,
but in the future this should be done by libvirt rather then these
Java bindings.
2013-08-14 16:15:09 +02:00
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang 5287f4c9ec Got everything running through testing 2013-08-07 16:41:06 -07:00
Alex Huang e4f20c7ced config in place 2013-08-07 16:41:03 -07:00
Alex Huang cd28e4f370 Added 1.7 as the version for antrun 2013-08-02 16:34:47 -07:00
Chiradeep Vittal d8a5f03c7f Revert "Starting the work of moving orchestration pieces to engine"
This reverts commit 7a2aaf96fd.
2013-08-02 15:09:29 -07:00
Alex Huang 7a2aaf96fd Starting the work of moving orchestration pieces to engine 2013-08-02 13:51:48 -07:00
Alex Huang 66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Wido den Hollander b611394cca rbd: Enable snapshotting of RBD images
Signed-off-by: Wido den Hollander <wido@42on.com>
2013-08-01 01:12:42 +02:00
Alex Huang 5595a099b2 Added commons io to server 2013-07-30 14:07:21 -07:00
Alex Huang a8da8c8dff Added commons io to runtime 2013-07-30 14:07:20 -07:00
Chip Childers 7d342e695b Adding exclude for JS libraries pulled into repo for tools/ngui 2013-07-29 14:40:48 -04:00
Alex Huang a4cea4ebf2 Removed schema from the dependency of many components 2013-07-29 10:55:19 -07:00
Alex Huang 3d2e49bcfc Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format 2013-07-26 20:35:49 -07:00
Alex Huang 3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Prasanna Santhanam 32c8cd3cd7 ignore the test template from rat check
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-26 17:34:10 +05:30
Alex Huang 5af61a85ae Fixed build. Not sure why it didn't come up on my compile before the commit 2013-07-18 22:53:30 -07:00
Alex Huang b18c72626b Moved the SprintUtils which is for testing only to be in test directory. Changed pom.xml for different projects to use the utils test-jar. Removed some @Component annotations. Moved majority of the dependencies from cloudstack pom to utils pom 2013-07-18 21:53:51 -07:00
ahuang 96d29c7f3d Added the git commit and branch to war file 2013-07-11 17:33:31 -07:00
Prasanna Santhanam 14c9a159a5 CLOUDSTACK-3374: bucket names cannot contain periods.
The older AWS SDK 1.3.21.1 had a bug where in bucket names that contain
periods like a DNS name would fail to work over https. Bump up the
aws.sdk version to 1.3.22 which fixes the bug

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-06 19:11:21 +05:30
Wido den Hollander bef3a2edb7 CLOUDSTACK-1191: rbd: Use cloning for deploying templates instead of a copy
RBD format 2 supports cloning (aka layering) where one base image can serve
as a parent image for multiple child images.

This enables fast deployment of a large amount of virtual machines, but it also
saves spaces on the Ceph cluster and improves performance due to better caching.

Qemu-img doesn't support RBD format 2 (yet), so to enable these functions the
RADOS/RBD Java bindings are required.

This patch also enables deployment of System VMs on RBD storage pools. Since we
no longer require a patchdisk for passing the boot arguments we are able to deploy
these VMs on RBD.
2013-05-24 16:00:08 +02:00
Hugo Trippaers dcc288c8be Make the classes that get started by jsvc implement Daemon.
Set the daemon version centrally in the pom
2013-05-13 16:53:27 +02:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Chip Childers a51b566fb6 Adding release plugin to pom 2013-04-18 16:13:18 -04:00
Chiradeep Vittal 778a59fbf6 QuickCloud: move devcloud configuration into pom profile for exec:java
Also ignore agent.properties in RAT since
a. they are trivial
b. they are modified by the java code (stripping the license)

QuickCloud: proper path for log.home

QuickCloud: proper path for secstorage.sh
2013-04-09 14:45:26 -07:00
Rohit Yadav 7e54f40a02 CLOUDSTACK-1897: Ignore appliance definitions for license checking
Regression caused due to 8e917b1ad3

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-04-03 01:30:38 +05:30
Prasanna Santhanam 7ee602beaf 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
2013-04-02 18:31:29 +05:30
Prasanna Santhanam 8e917b1ad3 removing unused commented dependencies
removing the spring related dependencies that were commented out.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-02 18:31:29 +05:30
Rohit Yadav 74bd7d5709 rat: Ignore all veewee definition files
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-03-25 15:08:21 +05:30
Prasanna Santhanam 057a6f5097 minor correction to the otherArchive tag
otherArchive is child of otherArchives.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-23 20:36:04 +05:30
Prasanna Santhanam 23d301ffd8 Apache CloudStack has graduated.
Fixing the links in the pom.xml

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-23 20:26:48 +05:30
Prasanna Santhanam 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
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
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
olivier lamy a6d1ff3328 use released version of tomcat7-maven-plugin 2012-10-17 14:44:20 +02:00
Edison Su 0a7d03c90b javelin is revived 2012-10-15 15:42:59 -07:00
Edison Su 93024c8104 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 2012-10-09 01:14:32 -07:00
Chip Childers c5db929e62 Added CHANGES file to RAT ignore list 2012-10-08 20:04:02 -04:00
Chip Childers 7bd31e2894 Added some exclusions to the RAT report to avoid build artifacts being interpreted as code artifacts 2012-10-03 20:20:32 -04:00
Hugo Trippaers f11a16379c Stick to the versions the amazon classes were originally generated with 2012-10-02 11:35:29 -07:00
Chip Childers 07af738d30 Added INSTALL.md to the RAT exclusion list 2012-10-02 13:07:53 -04:00
Hugo Trippaers 28bfaea0d1 Fix some dependencies for awsapi. Axis2 and rampart versions should be
equal otherwise there will be conflicts with dependencies.

Small change to EC2MainServlet, pass along the rootcause for easier
debugging
2012-10-01 21:36:27 -07:00
Hugo Trippaers f16b5103d8 Merge some stuff from maven-waf branch into master 2012-10-01 15:04:08 -07:00
Hugo Trippaers aa6355ffe6 Updated master to 4.1.0
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
Chip Childers 8435e72295 Corrected RAT mvn plugin to appropriate exclude things at the top level, and to also include subprojects. 2012-09-25 15:01:08 -04:00
Chip Childers f20bee3ca4 Adding patches module config for RAT. 2012-09-25 14:26:52 -04:00
Hugo Trippaers 96c7e3fddc Make sure implementation version is added to all jars 2012-09-22 22:00:53 +02:00
Hugo Trippaers 4c38152afe Add cloud database creation to maven, use mvn -P developer -pl developer
-Ddeploydb
2012-09-22 11:28:33 +02:00
Chiradeep Vittal 97a1ed2ecb CLOUDSTACK-143 vcpu hotplug is used whenever the number of vcpus are increased or decreased while the vm is online. so far this is never done in CloudStack for system vms. Also, no evidence that this file is copied to /etc/udev/rules.d where it would be needed
CLOUDSTACK-144 xe-linux-distribution.init is used to communicate the distribution information to the xe toolset in dom0. No evidence that this file is copied to /etc/init.d where it would be needed. The right way to do it would be to install the xe-guest-utilities deb package from the xs-tools ISO distributed by Citrix XenServer
2012-09-21 17:31:38 -07:00
Chiradeep Vittal a4906c6b0c CLOUDSTACK-139, CLOUDSTACK-140, CLOUDSTACK-141, CLOUDSTACK-146 file provenance established or removed 2012-09-21 16:05:37 -07:00
Chiradeep Vittal 0ea17a97af CLOUDSTACK-137 and CLOUDSTACK-138 : apache config files are derived from ASL licensed software 2012-09-21 15:41:16 -07:00
Chiradeep Vittal 1ba030729d CLOUDSTACK-142 remove unneeded file 2012-09-21 15:37:41 -07:00
Chiradeep Vittal 6fe019e3cc CLOUDSTACK-148 logrotate.conf configuration was developed for CloudStack. Deleted comment and blank lines to show origin in a clearer fashion 2012-09-21 15:23:37 -07:00
Chiradeep Vittal 905ccb0209 CLOUDSTACK-157 logrotate.d/* configurations were developed for CloudStack 2012-09-21 15:15:33 -07:00
Chiradeep Vittal 55f74e5f7c CLOUDSTACK-158 sysctl.conf was developed for CloudStack 2012-09-21 15:07:43 -07:00
Chiradeep Vittal f96267d724 CLOUDSTACK-168 remove unneeded file
patches/systemvm/debian/config/root/edithosts.sh creates the file if it is not there
2012-09-21 14:52:18 -07:00
Chiradeep Vittal 9a40415771 CLOUDSTACK-175 reduce config file to bare minimum by eliminating commented lines and whitespace 2012-09-21 14:47:32 -07:00
Chiradeep Vittal 8899180d7d CLOUDSTACK-170 remove unneeded secrets file 2012-09-21 14:44:49 -07:00
Chiradeep Vittal f27168291a CLOUDSTACK-170 remove unneeded file 2012-09-21 14:39:41 -07:00
Chiradeep Vittal feb77f3137 CLOUDSTACK-171 reduce config file to bare minimum by eliminating commented lines and whitespace 2012-09-21 14:35:08 -07:00
Chiradeep Vittal c28ab4ae45 ClOUDSTACK-174 CLOUDSTACK-173 and CLOUDSTACK-172 -- as part of resolution, remove xl2tpd config files from excludes 2012-09-21 14:20:49 -07:00
Kelven Yang 6e767a3491 configure maven compiler plugin 2012-09-20 15:42:06 -07:00
Rohit Yadav 4bf16f8d31 Maven: Fix rampart version in awsapi
Signed-off-by: Hugo Trippaers <hugo@apache.org>
2012-09-17 13:27:18 +02:00
Chip Childers 359e67fc3b Removing iptables config from the exclude list 2012-09-14 13:19:17 -04:00
Alex Huang 87dc0a65c2 Removed the prefs file from pom.xml 2012-09-13 17:16:29 -07:00
Chip Childers 8aaa5abc02 Adding a settings file to the Rat exclude list, and setting the number of accepted license issues to 0 2012-09-13 17:15:09 -04:00
Chip Childers 3dbcc88f28 Minor change to the root pom for RAT 2012-09-13 16:55:48 -04:00
Chip Childers 763311c006 License header updates, and modification to root pom for exclusions. 2012-09-13 16:55:48 -04:00
Chip Childers 769561a2f1 Adding Apache RAT configuration to the root pom.xml 2012-09-13 15:47:38 -04:00
Edison.Su 54fd39b9c0 add build-helper to remove the local repo 2012-09-10 17:09:38 -04:00
Mice Xia 0d02e33d31 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-10 21:15:35 +08:00
Rohit Yadav d917120845 Maven: Fix POM in test
Fixes and adds dependencies for building submodule test

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-10 18:18:28 +05:30
Prasanna Santhanam 42cc2eb474 Poms for the test directory.
- test depends on selenium-java
- added artifact as dependency in test/pom.xml
2012-09-10 16:51:32 +05:30
Edison Su 5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Hugo Trippaers 3054537182 Use maven to build the systemvm zip and iso 2012-09-03 14:09:19 +02:00
Hugo Trippaers 53bb62be9c Workaround to have maven download the deps to make ant happy 2012-08-31 21:03:44 +02:00
olivier lamy e756872c0a use tomcat maven plugin 2.0-SNAPSHOT as it has fixed an issue needed here 2012-08-29 18:51:17 +02:00
olivier lamy 5751385444 do not activate cloud-client-ui by default as it needs nonoss modules too 2012-08-29 18:40:24 +02:00
olivier lamy de31ac34b4 configure tomcat maven plugin too 2012-08-29 00:05:56 +02:00
Darren Shepherd 43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
Darren Shepherd 8aa665d3ec Third party repo no longer used 2012-08-28 09:02:28 -07:00
olivier lamy a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy 3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy ccf624f7a8 add third party repo in pom to short cli to use 2012-08-25 00:16:31 +02:00
olivier lamy 071836327e use maven compiler plugin 2.5.1 which is faster for multi modules builds 2012-08-25 00:12:33 +02:00
olivier lamy 7343ef20ee use apache parent pom to inherits some datas 2012-08-25 00:10:29 +02:00
olivier lamy 5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
Darren Shepherd 4a4007e652 Add license 2012-08-24 11:18:54 -07:00
Darren Shepherd ebc0fa458a * Maven 3 support
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
Darren Shepherd f826971fea Maven config, initial commit 2012-08-24 11:18:52 -07:00