Edison Su
e903f83872
fix simulator compilation
2012-09-14 13:38:08 -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
Mice Xia
55bcfaf805
CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI
2012-09-13 11:21:11 +08:00
Mice Xia
0d02e33d31
CLOUDSTACK-69 Hibernate jars should be removed
2012-09-10 21:15:35 +08:00
Rajesh Battala
39aa7d86af
Moved Awsapi (EC2/S3) from Hibernate framework to CloudStack Generic Dao Framework
...
Created/Modified new VO's and Dao Impl classes to use Generic Dao Framework
2012-08-31 11:44:58 -07:00
Hugo Trippaers
a6be8c76c3
Reverting part of commit ff7c964a6621cf56d555120e9740dc87cf37b9eb (Add
...
ability to do jetty:run in eclipse). This change breaks the ability to
upload scripts to XenServer (and possibly other places). Needs some
investigation before enabling this again.
2012-08-30 16:10:28 +02:00
Darren Shepherd
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
Darren Shepherd
43e4de429e
Fix up some dependencies
2012-08-28 09:03:25 -07:00
Darren Shepherd
590f52df82
Include some missing resources in the jars
2012-08-28 08:59:20 -07:00
olivier lamy
40f9d84ea9
versions defined in parent pom
2012-08-27 21:54:27 +02: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
Chiradeep Vittal
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
Mice Xia
00b2a8040b
Remove @author tag from non third-party source files in agent-simulator, cloud-cli, test, ui and utils folder
2012-08-13 15:30:42 +08:00
Sheng Yang
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
Alena Prokharchyk
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
Chip Childers
0ad8118562
Fixed three .classpath license header issues
2012-08-09 14:21:06 -04: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
f04c006f9a
Added javax.persistence and javax.ejb jar packages to replace the files removed. Added a new annotation to replace the encrypt attributed added to the Column annotation. Removed join attribute added to SecondaryTable in previous commit
2012-08-08 12:58:24 -07:00
Alex Huang
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
Alena Prokharchyk
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
Alex Huang
57b57703eb
fixed broken unit test
2012-08-07 17:38:05 -07:00
Alex Huang
a617ccc898
Added missing file
2012-08-07 15:52:34 -07:00
Alex Huang
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
Alex Huang
1d3a443237
Added support for component libraries in plugins
2012-08-07 15:40:01 -07:00
Alena Prokharchyk
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
Alena Prokharchyk
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
Sheng Yang
84a1a311f9
S2S VPN: CS-15511: Add PFS support for VPN connection
2012-08-06 15:27:13 -07:00
Alena Prokharchyk
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
Chip Childers
95ce55f0a1
License header updates for the utils folder
2012-08-03 14:15:09 -04:00
Alena Prokharchyk
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
Alena Prokharchyk
8f797afd42
VPC: CS-15813 - ICMP type and code validation
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
Sheng Yang
e8d2ca48b4
S2S VPN: Update the supported crypto list
...
We would support 3DES, AES128, AES192, AES256.
2012-07-30 16:43:55 -07:00
Sheng Yang
e9ae7336c1
CS-15649: Remove DES from s2s vpn support policy
...
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
Sheng Yang
c0fcca3990
CS-15511: Not allow pfs parameter for customer VPN gateway
2012-07-19 15:10:31 -07:00
Alena Prokharchyk
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
Sheng Yang
94c62f2127
CS-15513: Fix group 5 of s2s vpn
...
Conflicts:
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
Alena Prokharchyk
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
David Nalley
53d5fe6636
fixing another license header
2012-07-04 19:47:12 -04:00
Sheng Yang
24c480f9e6
CS-6840: Add commands for site-to-site vpn
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-02 16:26:34 -07:00
Alena Prokharchyk
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
Alena Prokharchyk
634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
Alena Prokharchyk
46b97cbf7d
VPC: update public IP info in domain_router table once the VR gets the public nic
2012-06-28 10:25:24 -07:00
Murali reddy
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
Alena Prokharchyk
55a12582b4
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-20 15:45:08 -07:00
