frank
428f8ae152
add missing jar for awsapi as maven dependency
...
Fixed conflicts between:
2f9941d85f8277f1fb2cbf958e41afb3fcd6960b
5c3ec1541040ecc9d1f1da240b38eed0c4802632
on:
awsapi/pom.xml
2012-10-09 18:38:54 +05:30
frank
39bd7e5f51
bring missing jars back to awsapi
2012-10-09 18:31:10 +05:30
Rohit Yadav
5f1ef3b434
CLOUDSTACK-257: Add jasypt and axiom
...
Define rule for ant to copy jasypt and axiom to deploy-rpm target.
2012-10-08 23:06:57 +05:30
Rohit Yadav
c5e5f7300a
CLOUDSTACK-257: Copy jars to awsapi/WEB-INF/lib
...
Uncomment rule in build/build-aws-api.xml to copy libs to:
/usr/share/cloud/bridge/webapps/awsapi/WEB-INF/lib
2012-10-08 23:06:34 +05:30
Alex Huang
13d771e57e
it's 1.9.0 not 1.9....duh
2012-10-08 01:52:02 -07:00
Alex Huang
135f5dcfe9
Fixed more problems with aws
...
Conflicts:
setup/bindir/cloud-setup-encryption.in
2012-10-08 00:59:47 -07:00
Chiradeep Vittal
651ac2a83b
Fix ant debug developer target. The excluded jars in /usr/local/apache-tomcat-6.0.32/lib either conflict with the ones in awsapi webapp or the slf4j jars cause an infinite class loading loop
2012-09-12 15:51:03 -07:00
David Nalley
ff58e05c40
fixing apidocs build
2012-09-12 18:18:41 -04: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
Chip Childers
bdfb36d500
Changed the location from which to pull the mar files during deploy-server
2012-09-10 16:05:50 -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
Prachi Damle
e73d4334d1
- Removing the AWS wsdl file
...
- Adding license to the services.xml
2012-09-06 11:23:13 -07:00
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
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
Prachi Damle
511e3cb235
[ASFCS40]CS-15373: Awsapi port change to 7080.
...
Reviewed-By: Frank
Changes:
- Changes to deploy awsapi in separate webapps folder and listeining on 7080 port
- Revert changes which were done to open 7080 on CloudStack
Conflicts:
awsapi/conf/cloud-bridge.properties
client/tomcatconf/server-ssl.xml.in
2012-08-21 16:27:55 -07:00
eric pretorious
9dfc3b0a1f
Replaced Cloud.com & Citrix copyright notices with the Apache Software License, Version 2.0.
2012-06-12 09:03:36 -04:00
prachi
49cdc2317b
merge awsapi build script changes to master
2012-05-25 14:40:56 -07:00
