Rohit Yadav
16fa74b729
Revert "core: Comment testSourceDirectory in pom.xml to fix build"
...
Had unclean git repo, from switching between 4.0 and master.
This reverts commit c3f9a9b748dba73f0f02a8f93f7c80300b50d6d5.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 17:12:20 +05:30
Rohit Yadav
c3f9a9b748
core: Comment testSourceDirectory in pom.xml to fix build
...
A clean build is breaking due to testSourceDirectory being enabled. The
tests in core/test/com/cloud/hypervisor/vmware/ depend on vmware nonoss
libs and utils's test classes.
The issue here is that core's test classes depend on utils's test
classes.
Commenting testSourceDirectory for now.
The following patch should be added when this issue is fixed, only if
VMWare related tests are moved from core/test:
+ <profiles>
+ <profile>
+ <id>vmware</id>
+ <activation>
+ <property>
+ <name>nonoss</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-vim</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-vim25</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-apputils</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-lib-jaxrpc</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-plugin-hypervisor-vmware</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 15:47:36 +05:30
Alena Prokharchyk
339aa41442
CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.
...
Conflicts:
core/src/com/cloud/async/AsyncJobVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/SyncQueueManager.java
server/src/com/cloud/async/SyncQueueManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
server/test/com/cloud/async/TestSyncQueueManager.java
setup/db/create-schema.sql
2012-10-10 13:40:00 -07:00
Alena Prokharchyk
839929b9b2
Fixed lineendings and trailing whitespaces in a bunch of files
...
Conflicts:
core/src/com/cloud/async/SyncQueueItemVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/async/dao/SyncQueueDaoImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
2012-10-09 17:17:36 -07:00
Kishan Kavala
89779cceb8
Merge branch 'master' into regions
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/user/UserVO.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
Hugo Trippaers
46be0537bf
Core should not depend on xapi, only the xen and ovm plugin.
...
Awsapi needs axis2-adb
2012-10-02 10:19:15 -07:00
Hugo Trippaers
f16b5103d8
Merge some stuff from maven-waf branch into master
2012-10-01 15:04:08 -07:00
Hugo Trippaers
011281f93d
Move vmware specific tests from core to vmware-base
2012-10-01 15:03:15 -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
Kishan Kavala
4fcf64dd74
updated regions branch with changes from master
2012-09-27 17:04:59 +05:30
Alex Huang
db9cc97ab3
Brought over new changes from master
2012-09-13 11:43:22 -07:00
Alex Huang
06b7d80fec
latest changes
2012-09-13 11:31:54 -07:00
Manikanta Kattamuri
cfc2b85651
Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-13 14:18:14 -04:00
Sheng Yang
fe8a2992a2
Elimiate mystery guestIp in IpAddressTO
...
Nobody can explain why it's there...
Also fix wrong return result of several empty network element callbacks
2012-09-12 15:42:48 -07:00
Saksham Srivastava
a56631bc66
bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed.
...
Also after the maximum attempts are reached the user account is disabled
2012-09-12 19:35:24 +05:30
frank
38e8b46398
remove wrong storage network ip checking when setting internal ip route in NFS secondary
...
storage resource.
The bug prevent vmware setting static route to vcenter
2012-09-11 17:33:16 -07:00
frank
a7b77f3316
remove wrong storage network ip checking when setting internal ip route in NFS secondary
...
storage resource.
The bug prevent vmware setting static route to vcenter
2012-09-07 11:03:01 -07:00
Alex Huang
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
Edison Su
ea9121bc8f
KVM initial VPC support
...
Implements
SetupGuestNetworkCommand,SetNetworkACLCommand,SetSourceNatCommand,IpAssocVpcCommand,SetPortForwardingRulesVpcCommand.
Passes basic functionality, though I'm sure there may be some honing to
do.
Also fixes a few minor things found along the way:
vpc_guestnw.sh wasn't successfully setting up apache due to default
listen IP of 10.1.1.1
vpc_guestnw.sh was referencing a 'logger_it' function, replaced with
'logger -t cloud'
system vms were running with OS type "Debian GNU/Linux 5.0(32-bit)",
which was not found in the KVMGuestOsMapper
the Xen implementation of SetupGuestNetworkCommand had apparently
copied its catch message from UnPlug Nic, fixed string
Send-by: Marcus Sorensen
RB: https://reviews.apache.org/r/6883
2012-09-04 11:45:59 -07:00
Alex Huang
b9ddcf8cfe
Started an object model for the orchestration platform
2012-08-30 15:54:33 -07:00
Alex Huang
6309253de1
Deleted some useless files
2012-08-30 09:59:25 -07:00
Edison Su
cc73f2a8f2
add volumeorchestra
2012-08-29 18:17:18 -07:00
Kelven Yang
2300310243
Messaging facility initials for new architecture
2012-08-28 17:58:45 -07:00
Edison Su
60758785b7
Add more storage code
2012-08-27 18:07:54 -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
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
kishan
4ea36b82e9
propogate account changes to other Regions
2012-08-24 15:59:59 +05:30
Kelven Yang
d06d6dae72
add maven eclipse project files from Darren
2012-08-23 17:55:20 -07:00
Kelven Yang
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
Darren Shepherd
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
Darren Shepherd
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
Darren Shepherd
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
Mice Xia
89015cbf3c
Remove @author tag from non third-party source files in core folder
2012-08-13 15:20:10 +08:00
Alena Prokharchyk
b61468d65c
Merge branch 'master' into vpc
...
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
Edison Su
0307effcfa
fix the wrong md5sum check
2012-08-10 17:32:44 -07:00
Edison Su
bc12fd2337
Summary: Introduce Vif Driver in KVM
...
Add BridgeVifDriver and move current vif implementation to it.
- remove dependency on VirtualRoutingResource.
- factor out some of the networking code in LibvirtComputingResource
to BridgeVifDriver.
Add base class for KVM VifDriver.
Add VifDriver Interface for KVM.
RB: https://reviews.apache.org/r/6285
Send-by: Tomoe Sugihara <tomoe@midokura.com>
2012-08-10 12:05:24 -07:00
Edison Su
9be74d1d1e
Revert "Summary: Introduce Vif Driver in KVM"
...
This reverts commit 770563580418c90068be197e2c0ae1f06885267e.
Sorry, accidently checked in, this patch needs more tuning
2012-08-10 11:49:12 -07:00
Edison Su
7705635804
Summary: Introduce Vif Driver in KVM
...
Add BridgeVifDriver and move current vif implementation to it.
- remove dependency on VirtualRoutingResource.
- factor out some of the networking code in LibvirtComputingResource
to BridgeVifDriver.
Add base class for KVM VifDriver.
Add VifDriver Interface for KVM.
RB: https://reviews.apache.org/r/6285
Send-by: Tomoe Sugihara <tomoe@midokura.com>
2012-08-10 11:34:32 -07:00
Alena Prokharchyk
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
Alex Huang
e83c60a057
added JoinType to remove the j2ee source code in CloudStack
2012-08-08 13:42:08 -07:00
Alex Huang
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
Sheng Yang
c4eadf3011
S2S VPN: CS-15884: Delete iptables rules after delete vpn connection
2012-08-07 16:32:22 -07:00
Alena Prokharchyk
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
Chip Childers
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
Sheng Yang
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
Edison Su
0ec679c359
CS-14826, CS-14996: fix the md5 checksum
...
Cherry-picked from 6618101d.
Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-08-06 10:32:33 -07:00