Updated Branches: refs/heads/javelin 6f5655cb0 -> f56b96ad1
merge: Fast forward merge branch 'javelin' FF merge commit due to recent merge of master and then Edison's commit. Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f56b96ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f56b96ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f56b96ad Branch: refs/heads/javelin Commit: f56b96ad199405452b2c0114997018ae1c904427 Parents: 356866c 6f5655c Author: Rohit Yadav <[email protected]> Authored: Thu Jan 24 19:30:07 2013 -0800 Committer: Rohit Yadav <[email protected]> Committed: Thu Jan 24 19:30:28 2013 -0800 ---------------------------------------------------------------------- .../cloudstack/storage/image/ImageServiceImpl.java | 12 +- .../driver/DefaultImageDataStoreDriverImpl.java | 7 + .../storage/image/store/HttpDataStoreImpl.java | 5 +- .../storage/image/store/TemplateObject.java | 53 ++- .../image/motion/DefaultImageMotionStrategy.java | 7 +- .../storage/test/ChildTestConfiguration.java | 23 +- .../cloudstack/storage/test/MockRpcCallBack.java | 8 +- .../cloudstack/storage/test/volumeServiceTest.java | 101 +++- .../apache/cloudstack/storage/command/CopyCmd.java | 21 +- .../storage/datastore/DataObjectManager.java | 37 ++ .../storage/datastore/DataObjectManagerImpl.java | 402 +++++++++++++++ .../datastore/ObjectInDataStoreManager.java | 9 +- .../datastore/ObjectInDataStoreManagerImpl.java | 40 ++- .../storage/db/ObjectInDataStoreDaoImpl.java | 22 +- .../storage/image/db/ImageDataDaoImpl.java | 74 ++- .../cloudstack/storage/image/db/ImageDataVO.java | 33 ++- .../storage/datastore/DefaultPrimaryDataStore.java | 22 +- .../driver/DefaultPrimaryDataStoreDriverImpl.java | 36 ++- .../volume/TemplateInstallStrategyImpl.java | 11 +- .../storage/volume/VolumeDataFactoryImpl.java | 3 +- .../cloudstack/storage/volume/VolumeObject.java | 22 +- .../storage/volume/VolumeServiceImpl.java | 70 ++- .../xen/resource/XenServerStorageResource.java | 135 +++--- .../storage/dao/VMTemplateDetailsDaoImpl.java | 2 +- setup/db/4.1-new-db-schema.sql | 4 +- 25 files changed, 927 insertions(+), 232 deletions(-) ----------------------------------------------------------------------
