Kelven Yang
5fee891162
merge from master
2012-10-11 17:42:25 -07:00
Hugo Trippaers
b71acbc29b
include db.properties
2012-10-02 13:27:23 -07:00
Hugo Trippaers
f11a16379c
Stick to the versions the amazon classes were originally generated with
2012-10-02 11:35:29 -07:00
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
3343362328
Better to print an error message than to die with a npe.
2012-10-02 07:35:10 -07: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
Chiradeep Vittal
d1bc54fc84
Avoid m2e complaining about unsupported plugins (according to http://s.apache.org/lZ0 )
2012-09-26 14:54:22 -07:00
Sebastien Goasquen
56b4ac184f
Initial AWS EC2 docs
2012-09-23 09:13:45 -04:00
Prachi Damle
b7d9fce564
CLOUDSTACK-51
...
Outdated docs and license data present in awsapi
2012-09-20 14:02:56 -07:00
Edison Su
2abeac11c7
fix mvn install: org.apache.xalan doesn't work
2012-09-18 11:40:10 -07:00
Alex Huang
387c6fc135
Merge branch 'master' into javelin
2012-09-17 15:31:37 -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
Jie Feng
c9aa08350a
[DOC] docbook conversion - choosing a deployment architecture
2012-09-13 16:12:06 -04:00
Alex Huang
db9cc97ab3
Brought over new changes from master
2012-09-13 11:43:22 -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
Edison Su
29df8d8b8e
remove bcprov-jdk14
2012-09-12 13:46:12 -07:00
Alex Huang
298d224f83
Added extra maven files
2012-09-11 18:14:42 -07:00
Prachi Damle
a7d2a08c5e
CLOUDSTACK-51: Outdated docs and license data present in awsapi
...
CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?
2012-09-11 17:38:26 -07:00
Prachi Damle
335bb6f687
CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?
...
CLOUDSTACK-51: Outdated docs and license data present in awsapi
Removing content that is not used by awsapi.
2012-09-11 17:38:25 -07:00
Edison.Su
5437bfc607
fix rpm build
2012-09-11 17:38:07 -07:00
Edison Su
7ea8706046
fix the build, hope
2012-09-11 17:38:01 -07:00
Chip Childers
0503d9a703
Fixed rampart group ID in the awsapi/pom.xml file.
2012-09-11 17:37:54 -07:00
Chip Childers
516dd173fe
Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26
2012-09-11 17:37:52 -07:00
Chip Childers
a9f69dadce
CLOUDSTACK-26 and CLOUDSTACK-47: Removing *.war, *.jar, and deps/awsapi-lib/rampart-lib/*.txt files.
...
I realize that this might be destructive to the stability of the
tree, but these files have to be removed.
I tested the build, and it appears to still function without any of these
binary files being in the source tree.
2012-09-11 17:37:45 -07:00
Mice Xia
c86711a5a9
CLOUDSTACK-69 Hibernate jars should be removed
2012-09-11 17:37:10 -07:00
Rajesh Battala
2dd45a5095
CLOUDSTACK-52 Fix for AWSAPI contains hibernate configurations https://reviews.apache.org/r/6967/diff/
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2012-09-11 17:37:07 -07:00
Chip Childers
31fc02e5c2
CLOUDSTACK-56 : fixing license headers
2012-09-11 17:33:22 -07:00
Prachi Damle
bfcc31d9ed
CLOUDSTACK-51: Outdated docs and license data present in awsapi
...
CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?
2012-09-11 15:26:28 -07:00
Prachi Damle
6ead90ab3b
CLOUDSTACK-53: CloudBridge installation pieces present, deprecated?
...
CLOUDSTACK-51: Outdated docs and license data present in awsapi
Removing content that is not used by awsapi.
2012-09-11 15:17:20 -07:00
Edison.Su
52d8849003
fix rpm build
2012-09-10 22:33:41 -04:00
Edison Su
176c340492
fix the build, hope
2012-09-10 16:29:38 -07:00
Chip Childers
fae3ce3ebd
Fixed rampart group ID in the awsapi/pom.xml file.
2012-09-10 16:00:44 -04:00
Chip Childers
b1ae7c732c
Partial fix for awsapi deploy-server issues that I introduced when trying to fix CLOUDSTACK-26
2012-09-10 14:42:08 -04:00
Chip Childers
cbd4cb3fb9
CLOUDSTACK-26 and CLOUDSTACK-47: Removing *.war, *.jar, and deps/awsapi-lib/rampart-lib/*.txt files.
...
I realize that this might be destructive to the stability of the
tree, but these files have to be removed.
I tested the build, and it appears to still function without any of these
binary files being in the source tree.
2012-09-10 10:26:26 -04:00
Mice Xia
0d02e33d31
CLOUDSTACK-69 Hibernate jars should be removed
2012-09-10 21:15:35 +08:00
Rajesh Battala
d9c03a55cf
CLOUDSTACK-52 Fix for AWSAPI contains hibernate configurations https://reviews.apache.org/r/6967/diff/
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2012-09-10 17:58:16 +08:00
Chip Childers
8746e902e4
CLOUDSTACK-56 : fixing license headers
2012-09-07 17:03:53 -04:00
Alex Huang
a1bd6d7eb7
Merge branch 'master' into javelin
2012-09-06 16:31:32 -07:00
Prachi Damle
f57f96f7b7
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-09-06 11:23:50 -07:00
Prachi Damle
e73d4334d1
- Removing the AWS wsdl file
...
- Adding license to the services.xml
2012-09-06 11:23:13 -07:00
Jamshid Afshar
5d208a5c95
Add initial support for Caringo CAStor object store as backing store for S3 API
...
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2012-09-05 23:35:09 -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
c4955e82e8
fix rpmbuild
2012-09-04 21:34:52 -07:00
Hugo Trippaers
79004fc7bc
Fix RPM build using waf (oss only) and maven. With the exception of awsapi most of the rpms are build. Not the neatest way to do it, but a good base for improvement.
2012-09-04 15:16:18 +02:00
Hugo Trippaers
378c98cb7e
awsapi depends on cloud-utils
2012-08-31 21:48:24 +02:00
Hugo Trippaers
cd869f122d
awsapi depends on cloud-utils
2012-08-31 21:47:30 +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
Alex Huang
6309253de1
Deleted some useless files
2012-08-30 09:59:25 -07:00