You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/05 23:31:49 UTC
[25/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4f93161c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4f93161c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4f93161c
Branch: refs/heads/javelin
Commit: 4f93161c105c07493f6733d7b72de0216a4da1eb
Parents: 53bb62b 39aa7d8
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Aug 31 21:04:54 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Aug 31 21:04:54 2012 +0200
----------------------------------------------------------------------
awsapi-setup/setup/cloudstack-aws-api-register | 2 +-
awsapi/.classpath | 23 +-
awsapi/conf/hibernate.cfg.xml | 51 -
.../bridge/auth/ec2/AuthenticationHandler.java | 21 +-
.../bridge/auth/s3/AuthenticationHandler.java | 10 +-
.../bridge/lifecycle/ServiceEngineLifecycle.java | 4 +-
.../src/com/cloud/bridge/model/BucketPolicyVO.java | 59 +
.../cloud/bridge/model/CloudStackAccountVO.java | 34 +
.../bridge/model/CloudStackConfigurationVO.java | 30 +
.../bridge/model/CloudStackServiceOfferingVO.java | 51 +
awsapi/src/com/cloud/bridge/model/MHost.hbm.xml | 55 -
awsapi/src/com/cloud/bridge/model/MHost.java | 111 --
.../src/com/cloud/bridge/model/MHostMount.hbm.xml | 46 -
awsapi/src/com/cloud/bridge/model/MHostMount.java | 92 --
.../src/com/cloud/bridge/model/MHostMountVO.java | 136 +++
awsapi/src/com/cloud/bridge/model/MHostVO.java | 137 +++
.../com/cloud/bridge/model/MultiPartPartsVO.java | 108 ++
.../com/cloud/bridge/model/MultiPartUploadsVO.java | 94 ++
.../com/cloud/bridge/model/MultipartMetaVO.java | 59 +
.../com/cloud/bridge/model/OfferingBundleVO.java | 46 +
awsapi/src/com/cloud/bridge/model/SAcl.hbm.xml | 54 -
awsapi/src/com/cloud/bridge/model/SAcl.java | 106 +--
awsapi/src/com/cloud/bridge/model/SAclVO.java | 254 +++++
awsapi/src/com/cloud/bridge/model/SBucket.hbm.xml | 56 -
awsapi/src/com/cloud/bridge/model/SBucket.java | 11 +-
awsapi/src/com/cloud/bridge/model/SBucketVO.java | 169 +++
awsapi/src/com/cloud/bridge/model/SHost.hbm.xml | 60 -
awsapi/src/com/cloud/bridge/model/SHost.java | 18 +-
awsapi/src/com/cloud/bridge/model/SHostVO.java | 152 +++
awsapi/src/com/cloud/bridge/model/SMeta.hbm.xml | 41 -
awsapi/src/com/cloud/bridge/model/SMeta.java | 94 --
awsapi/src/com/cloud/bridge/model/SMetaVO.java | 112 ++
awsapi/src/com/cloud/bridge/model/SObject.hbm.xml | 59 -
awsapi/src/com/cloud/bridge/model/SObject.java | 206 ----
.../src/com/cloud/bridge/model/SObjectItem.hbm.xml | 62 -
awsapi/src/com/cloud/bridge/model/SObjectItem.java | 149 ---
.../src/com/cloud/bridge/model/SObjectItemVO.java | 191 ++++
awsapi/src/com/cloud/bridge/model/SObjectVO.java | 242 ++++
.../com/cloud/bridge/model/UserCredentials.hbm.xml | 38 -
.../com/cloud/bridge/model/UserCredentials.java | 95 --
.../com/cloud/bridge/model/UserCredentialsVO.java | 117 ++
awsapi/src/com/cloud/bridge/persist/EntityDao.java | 118 --
.../cloud/bridge/persist/GMTDateTimeUserType.java | 102 --
.../com/cloud/bridge/persist/PersistContext.java | 359 ------
.../com/cloud/bridge/persist/PersistException.java | 36 -
.../cloud/bridge/persist/dao/BucketPolicyDao.java | 157 +---
.../bridge/persist/dao/BucketPolicyDaoImpl.java | 72 ++
.../bridge/persist/dao/CloudStackAccountDao.java | 36 +-
.../persist/dao/CloudStackAccountDaoImpl.java | 39 +
.../persist/dao/CloudStackConfigurationDao.java | 41 +-
.../dao/CloudStackConfigurationDaoImpl.java | 45 +
.../persist/dao/CloudStackSvcOfferingDao.java | 39 +-
.../persist/dao/CloudStackSvcOfferingDaoImpl.java | 75 ++
.../src/com/cloud/bridge/persist/dao/MHostDao.java | 34 +-
.../com/cloud/bridge/persist/dao/MHostDaoImpl.java | 61 +
.../cloud/bridge/persist/dao/MHostMountDao.java | 33 +-
.../bridge/persist/dao/MHostMountDaoImpl.java | 48 +
.../bridge/persist/dao/MultiPartPartsDao.java | 18 +
.../bridge/persist/dao/MultiPartPartsDaoImpl.java | 101 ++
.../bridge/persist/dao/MultiPartUploadsDao.java | 21 +
.../persist/dao/MultiPartUploadsDaoImpl.java | 108 ++
.../cloud/bridge/persist/dao/MultipartLoadDao.java | 428 ++-----
.../cloud/bridge/persist/dao/MultipartMetaDao.java | 12 +
.../bridge/persist/dao/MultipartMetaDaoImpl.java | 34 +
.../com/cloud/bridge/persist/dao/OfferingDao.java | 167 +---
.../cloud/bridge/persist/dao/OfferingDaoImpl.java | 135 +++
.../src/com/cloud/bridge/persist/dao/SAclDao.java | 75 +--
.../com/cloud/bridge/persist/dao/SAclDaoImpl.java | 127 +++
.../com/cloud/bridge/persist/dao/SBucketDao.java | 37 +-
.../cloud/bridge/persist/dao/SBucketDaoImpl.java | 72 ++
.../src/com/cloud/bridge/persist/dao/SHostDao.java | 39 +-
.../com/cloud/bridge/persist/dao/SHostDaoImpl.java | 67 ++
.../src/com/cloud/bridge/persist/dao/SMetaDao.java | 54 +-
.../com/cloud/bridge/persist/dao/SMetaDaoImpl.java | 88 ++
.../com/cloud/bridge/persist/dao/SObjectDao.java | 77 +--
.../cloud/bridge/persist/dao/SObjectDaoImpl.java | 119 ++
.../cloud/bridge/persist/dao/SObjectItemDao.java | 36 +-
.../bridge/persist/dao/SObjectItemDaoImpl.java | 71 ++
.../bridge/persist/dao/UserCredentialsDao.java | 167 +---
.../bridge/persist/dao/UserCredentialsDaoImpl.java | 73 ++
.../com/cloud/bridge/service/EC2MainServlet.java | 20 +-
.../com/cloud/bridge/service/EC2RestServlet.java | 69 +-
.../com/cloud/bridge/service/S3RestServlet.java | 49 +-
.../service/controller/s3/S3BucketAction.java | 870 ++++++++-------
.../service/controller/s3/S3ObjectAction.java | 18 +-
.../service/controller/s3/ServiceProvider.java | 151 ++--
.../cloud/bridge/service/core/ec2/EC2Engine.java | 35 +-
.../com/cloud/bridge/service/core/s3/S3Engine.java | 812 +++++++-------
.../com/cloud/bridge/service/core/s3/S3Grant.java | 5 +-
.../com/cloud/bridge/util/CloudSessionFactory.java | 106 --
.../bridge/util/CloudStackSessionFactory.java | 106 --
awsapi/src/com/cloud/bridge/util/QueryHelper.java | 85 --
.../cloud/stack/models/CloudStackAccount.hbm.xml | 34 -
.../stack/models/CloudStackConfiguration.hbm.xml | 37 -
.../stack/models/CloudStackServiceOffering.hbm.xml | 34 -
build/build-aws-api.xml | 1 +
client/tomcatconf/components.xml.in | 29 +-
debian/cloud-deps.install | 1 -
debian/control | 2 +-
utils/src/com/cloud/utils/db/Transaction.java | 38 +-
100 files changed, 4796 insertions(+), 4582 deletions(-)
----------------------------------------------------------------------