Commit Graph

550 Commits

Author SHA1 Message Date
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