Hugo Trippaers
9789e934b6
Fix the awsapi build by downloading the correct dependencies
...
Use maven to download all dependencies for the ant build, just make sure mvn is in the path
2012-08-31 21:41:16 +02:00
Hugo Trippaers
4f93161c10
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-08-31 21:04:54 +02:00
Hugo Trippaers
53bb62be9c
Workaround to have maven download the deps to make ant happy
2012-08-31 21:03:44 +02: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
Wido den Hollander
9064236879
debian: Depend on the MySQL Java connector
...
Ubuntu and Debian provide the JDBC MySQL connector, we depend on this for running the client
2012-08-31 19:57:51 +02:00
Hugo Trippaers
9d0cec344e
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-08-31 19:30:41 +02:00
David Nalley
88c792d854
removing even more jars
2012-08-31 12:57:32 -04:00
Hugo Trippaers
16cacf4c45
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-08-31 18:57:08 +02:00
Hugo Trippaers
d18ac73aee
Add a dependency to mysql-connector-java to the cloud.spec file for the client package.
...
Fix some build errors in the spec file
2012-08-31 18:56:23 +02:00
David Nalley
22327d2d64
removing selenium
2012-08-31 12:46:00 -04:00
David Nalley
ad577b8a48
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-08-31 11:29:24 -04:00
David Nalley
6204ca2bd0
removing tons of binaries (jars)
2012-08-31 11:27:01 -04:00
Gavin Lee
39a676c496
Correct license header mainly for patches folder
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree. If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
2012-08-31 10:50:46 -04:00
Hugo Trippaers
afb05ef3dc
Fix the right file
2012-08-31 14:30:25 +02:00
Hugo Trippaers
db4a435a84
Add mysql-connector-java to the classpath
2012-08-31 13:26:38 +02:00
Hugo Trippaers
3c63a39fa4
Make sure that jenkins can find the mysql connector jar
2012-08-31 12:28:03 +02:00
Jessica Wang
5ccca40067
cloudstack 3.0 UI - account page - create account action - encrypt password even md5-hashed is off before passing it to API call.
2012-08-30 14:46:22 -07:00
Brian Federle
eb0caf10a2
CS-16218: Only show VPC router details for ROOT admin
2012-08-30 11:01:02 -07:00
Alena Prokharchyk
7272b8d56b
Applying the patch from https://reviews.apache.org/r/5871/
...
Original committer: Venkata Siva Vijayendra Bhamidipati
2012-08-30 10:33:07 -07:00
Edison Su
3429c55e55
Implement PlugNicCommand,UnPlugNicCommand for KVM
...
This is part 1 in enabling VPC for KVM. The various commands needing
implementation will be submitted individually unless I'm told to do
otherwise, in case I don't complete all of the commands, such that
someone else can take over or build on my work.
RB: https://reviews.apache.org/r/6859
Send-by: shadowsor@gmail.com
2012-08-30 10:28:03 -07:00
Gavin Lee
d3921139ed
Patch from Gavin Lee: Change license to ASL2.0 in server and tools
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-08-30 10:36:29 -04: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
Chip Childers
2ba09d88c8
Patch from Gavin Lee: Change license to ASL2.0 in plugin
2012-08-30 09:17:11 -04:00
Darren Shepherd
34f007f13a
Current working dir for jetty:run Eclipse configuration is half way broken
2012-08-30 09:00:49 +02:00
Darren Shepherd
f7acd8fed8
Create random version for StartupCommands in dev env setup
2012-08-30 08:47:02 +02:00
Koushik Das
0c915cd69e
bug CS-16171 : Cannot attach ISO on VMware VM due to Invalid datastore path error
2012-08-30 11:04:30 +05:30
Brian Federle
5c69742f7d
Update zone wizard disclaimer text for local storage
...
Conflicts:
client/WEB-INF/classes/resources/messages.properties
2012-08-29 15:45:25 -07:00
Sheng Yang
60df21a023
Merge S2S VPN for VMware
2012-08-29 14:17:29 -07:00
Chip Childers
0f0c08373f
Added XenServerJava BSD licensing information to the whisker descriptor and output LICENSE files.
2012-08-29 16:33:47 -04:00
Jessica Wang
05fef0fb25
cloudstack 3.0 UI - VPC - localize Configure VPC Chart (Reviewed-by: Brian)
2012-08-29 13:29:44 -07:00
Chip Childers
8f9d6e48b8
Patch from Devdeep Singh: Applies the fixes/customization's that had been made to Xenserver java sdk source for CS
2012-08-29 15:57:17 -04:00
Chip Childers
7d59e6698c
Patch from Devdeep Singh: Importing the updated xenserver sdk source that comes with BSD license.
2012-08-29 15:56:25 -04:00
Chip Childers
43634b0e4b
Removing two files that the previous commit's submitted patch was unable to remove.
2012-08-29 15:55:36 -04:00
Chip Childers
75c3f2c999
Patch from Devdeep Singh: Removing the older Xenserver java sdk source.
2012-08-29 15:54:31 -04:00
Jessica Wang
4a9f77610c
cloudstack 3.0 UI - check in translated labels for VPC widget (Reviewed-by: Brian)
2012-08-29 10:58:55 -07:00
olivier lamy
6e421bc37a
add note on using ide debugger with tomcat7:run
2012-08-29 18:55:25 +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
Edison Su
7bd5c58fc3
fix http://bugs.cloud.com/show_bug.cgi?id=14775 , it happened when untagged network created on tagged vlan
2012-08-29 09:46:44 -07: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
Chip Childers
bf2601f1ea
Added steps to create a 12.04.1 Ubuntu template within VeeWee
2012-08-29 09:21:27 -04:00
Nitin Mehta
79ebffe4f3
CS-13594: Download template is unable to handle multiple SSVMs per zone
...
Reviewed-by: Kishan
2012-08-29 15:25:00 +05:30
Jayapal
eb4a3cf6c8
bug CS-15398: fix for basic zone dns issue in multiple pods
2012-08-29 14:33:27 +05:30
Hugo Trippaers
f128d8e123
Merge branch 'master' of https://hugo@git-wip-us.apache.org/repos/asf/incubator-cloudstack.git
2012-08-29 10:48:36 +02:00
Hugo Trippaers
1b8b7b1bba
Help the magic a little bit
2012-08-29 10:47:50 +02:00
Pranav Saxena
d134a63ea8
CS-16147: Always show VPC section and VPN customer Gateway if advanced zone is present
2012-08-29 13:28:00 +05:30
Pranav Saxena
ad78a0e918
CS-16201:Network Page drop down shows VPN Customer Gateway even in Basic Zone
2012-08-29 12:30:47 +05:30
Pranav Saxena
d7b249fb01
Fixing UI compatibility with IE which was broken because of license headers added to jsp file
2012-08-29 11:35:28 +05:30
Pranav Saxena
8884febe44
CS-15962: Inter VLAN Virtual router tab development under VPC section -fixing a typo
2012-08-29 11:11:40 +05:30
Jessica Wang
2e6759093c
cloudstack 3.0 UI - Spanish translation file is out-of-date and never used in 3.0 UI, therefore remove it from branch.
2012-08-28 16:03:40 -07:00
Jessica Wang
bbf8bed8ee
cloudstack 3.0 UI - VPC widget - localize text (Reviewed-by: Brian)
2012-08-28 15:59:46 -07:00