Commit Graph

17080 Commits

Author SHA1 Message Date
Noa Resare 9801667199 Revert classpath.conf.in to before .deb packaing merge
This change is apparently incompatible with the centos packaging,
temporarily reverting until we have discussed a proper fix

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:45:46 +00:00
Min Chen bcaac324aa Rebase with master, bring into Vmware vswitch change. 2013-02-28 11:00:03 -08:00
Rohit Yadav f16347960a rat: Fix the license, the mouse is squeaking, Nitin stepped on it :)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 18:35:43 +05:30
Wido den Hollander 01db2df23e debian: Copy the 4.2 jar files to the destination directories.
This is FAR from perfect, but it works for now.

the VERSION variable returns 4.1 from the debian/changelog file, but in
the Maven configuration everything is already set to 4.2

So generated JAR files have 4.2.XX-SNAPSHOT in their name.

We probably want to find a better way to match this, extracting the version
somewhere out of Maven maybe?
2013-02-28 13:48:14 +01:00
Wido den Hollander ca6c1eba9c debian: Require either Java 6 or 7
Our source is 1.6 compatible (pom.xml), but users can choose to compile
with JDK7 and run with JRE 7 if they want.
2013-02-28 13:48:14 +01:00
Radhika PC 4446b9dff6 CLOUDSTACK-1221 2013-02-28 18:11:13 +05:30
Rohit Yadav e80ccea517 CLOUDSTACK-1340: Jenkins fails for changing directories, rvm sourcing fails
http://jenkins.cloudstack.org/job/build-systemvm-master/64/console

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:37:02 +05:30
Rohit Yadav 54bfd7e04a orchestration: Fix VirtualMachineEntityFactory to process spring injections
The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 17:28:15 +05:30
Rohit Yadav 44f345e4c6 CLOUDSTACK-1340: Fix destination path issue, vbox's internalcommands issue
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:55:41 +05:30
Nitin Mehta 2081aa3100 CLOUDSTACK-658 - Adding Scalevm commands 2013-02-28 16:54:39 +05:30
Rohit Yadav 80a6aaf7e1 CLOUDSTACK-1340: Fix locale, cmd, disk size and remove multiple apt-get installs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:15:09 +05:30
Rohit Yadav 6380e2004c CLOUDSTACK-1340: apt-get autoclean and then clean to remove cached debs
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 16:02:44 +05:30
Rohit Yadav 673700a1a2 CLOUDSTACK-1340: Fix raw disk export using vbox internalcommand
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 15:58:50 +05:30
Kishan Kavala 1d31c3ecaf CLOUDSTACK-241: Moved regions upgrade changes to Upgrade40to41.jav from schema file. Sets the right regins_id from db.properties instead of using default 1.
Conflicts:
	setup/db/db/schema-40to410.sql
2013-02-28 14:35:23 +05:30
Mice Xia 6a46656c72 CLOUDSTACK-1448 Failed to start VM with standard vSwitch on VMware 2013-02-28 16:31:06 +08:00
Pranav Saxena 9446eba78c CLOUDSTACK-1447:Persistent Status is not displayed for VPC Tiers 2013-02-28 13:27:27 +05:30
Rohit Yadav 644a73bb2f CLOUDSTACK-1340: Don't remove all scripts in /root, rm only those copied by veewee
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-28 13:19:59 +05:30
Pranav Saxena b1fd371655 Vmware dvSwitch UI integration - tooltips 2013-02-28 12:16:50 +05:30
Pranav Saxena c25a0d8d8e Displaying persistent network property in the detail view for VPC networks 2013-02-28 11:54:04 +05:30
Pranav Saxena 680a360624 Merge branch 'dvswitch-UI' 2013-02-28 11:09:04 +05:30
Mice Xia 398b049327 add license header for a js file reported by rat 2013-02-28 11:50:07 +08:00
Mice Xia e5bf4a8fc4 CLOUDSTACK-1434 BeanCreationException: Error creating bean with name 'apiRateLimitServiceImpl' when starting up mgmt server 2013-02-28 11:49:12 +08:00
Mice Xia 91417115ef CLOUDSTACK-1401 NPE: listCapacity 2013-02-28 11:46:10 +08: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
Prachi Damle 9afd33d206 CLOUDSTACK-1418- As regular user , we are not allowed to deploy VM on a shared network.
- Added the access type attribute to @acl
- Domainchecker needs the AccessType.UseNetwork value specified to check access to network
2013-02-27 17:16:49 -08:00
Min Chen 36f4b44c36 Fix CLOUDSTACK-1425 and CLOUDSTACK-1399: Failed to load UserVmDaoImpl in
new Spring framework and register it into internal dao map.
2013-02-27 15:47:07 -08:00
Sheng Yang 50f995f8b4 CLOUDSTACK-1170: Use a unified way to generate PublicIp
Tired of manually generate mac address everytime when create PublicIp object.
2013-02-27 14:20:26 -08:00
Brian Federle 91d1835c6e Merge branch 'ui-regions' 2013-02-27 13:51:00 -08:00
Min Chen 7d2ebc9fc3 Add some comments on some code source to give credit to vmware sample
code.
2013-02-27 13:46:43 -08:00
Brian Federle fd50578dec CLOUDSTACK-1419: Add trademark to logos 2013-02-27 13:44:42 -08:00
Brian Federle 612a598dcc CLOUDSTACK-1419: Add trademark to logos 2013-02-27 13:44:07 -08:00
Brian Federle 74c3f35d7d Merge branch 'master' into ui-regions 2013-02-27 13:18:52 -08:00
Pranav Saxena 699cb03308 CLOUDSTACK-1432:Inconsistent field names in the cluster dialog box 2013-02-28 02:25:31 +05:30
Pranav Saxena b07f482bac dvswitch UI integration Complete:Enabling the flag - Set 4 2013-02-28 00:15:04 +05:30
Pranav Saxena 08b2f7734b dvswitch UI integration Complete - Set 4 2013-02-27 23:44:02 +05:30
Brian Federle fb9afaad2a Add region UI: Don't use URL validation
Don't use URL validation for endpoint, becuase it doesn't accept
hostnames without domains (i.e., http://localhost:8080/client)
2013-02-27 09:13:28 -08:00
Brian Federle 289c433cb9 Regions UI: Highlight active region in selector 2013-02-27 09:12:25 -08:00
Brian Federle fdaa5b4909 User accounts UI: Support for regions
-Add region select to add account form

-Show account's region in detail view
2013-02-27 08:59:55 -08:00
Brian Federle 79bfbe32ce Merge branch 'master' into ui-regions 2013-02-27 08:37:31 -08:00
Marcus Sorensen 8ba91fcd72 Summary: Fix RPM installation error for cloudstack-awsapi
Detail: getting "hard link not allowed for directory" due to line 321 in
cloud.spec. Changing to symlink.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361982798 -0700
2013-02-27 09:35:56 -07:00
Wido den Hollander 0b7f2eb178 CLOUDSTACK-1410: Add a Unit test to verify if it actually works.
This is also the first Unit Test for LibvirtComputingResource
2013-02-27 17:34:06 +01:00
Pranav Saxena c289380910 dvswitch UI integration set 3 2013-02-27 21:52:47 +05:30
Pranav Saxena bd58361362 dvSwitch UI integration Set 2 2013-02-27 21:23:13 +05:30
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
Wido den Hollander 23e232f5fa CLOUDSTACK-1410: Add the old constructor to VirtualMachineTO
Although the code compiled just fine, add back the old constructor
for safety.
2013-02-27 16:39:33 +01:00
Wido den Hollander 2e28f69d3e CLOUDSTACK-1410: >4.1 agents should be able to communicatie with <=4.1 management servers
The recently added overcommit feature breaks compatibility between older management servers
and 4.2 agents.

This patch fixes that by falling back if needed.
2013-02-27 16:23:21 +01:00
Prasanna Santhanam ddd507bccc Missed commenting the missing allocator. 2013-02-27 20:03:33 +05:30
Prasanna Santhanam d68b6c3e54 temporary fix: autowriring failing for missing storage allocator
The storage allocator beans were given with the wrong package namespace
of com.cloud and not org.apache.cloudstack. Removed and correctedt the
namespace. Server coems up successfully.

Edison to revisit and complete the fix.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-27 20:01:16 +05:30
Murali Reddy 3e0bdaac1e CLOUDSTACK-1391: EventBus is not getting injected after javelin merge
added logic to inject event bus using ComponentContext.getComponent

Conflicts:
	server/src/com/cloud/storage/listener/SnapshotStateListener.java
2013-02-27 18:55:22 +05:30
Rohit Yadav a5ab63602d CLOUDSTACK-1340: Fix typos, paths, create user cloud and make 'em invincible
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-27 18:40:51 +05:30