Updated Branches: refs/heads/object_store 99dcb23b1 -> 7d2565c49
Fix MS startup exception. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/91c586ca Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/91c586ca Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/91c586ca Branch: refs/heads/object_store Commit: 91c586caa612a6f5838b0153ccb35c9a1106e4b4 Parents: 99dcb23 Author: Min Chen <[email protected]> Authored: Tue Apr 30 10:13:30 2013 -0700 Committer: Min Chen <[email protected]> Committed: Tue Apr 30 10:13:30 2013 -0700 ---------------------------------------------------------------------- client/pom.xml | 7 +++++- client/tomcatconf/applicationContext.xml.in | 1 - setup/db/db/schema-410to420.sql | 24 +++++++++++----------- 3 files changed, 18 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91c586ca/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 39f1cb0..aba46ce 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -191,6 +191,11 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-engine-storage-cache</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage-backup</artifactId> <version>${project.version}</version> </dependency> @@ -201,7 +206,7 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-engine-storage-imagemotion</artifactId> + <artifactId>cloud-engine-storage-datamotion</artifactId> <version>${project.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91c586ca/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 7bbcf09..9361e03 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -213,7 +213,6 @@ <bean id="guestOSCategoryDaoImpl" class="com.cloud.storage.dao.GuestOSCategoryDaoImpl" /> <bean id="guestOSDaoImpl" class="com.cloud.storage.dao.GuestOSDaoImpl" /> <bean id="guestOSHypervisorDaoImpl" class="com.cloud.storage.dao.GuestOSHypervisorDaoImpl" /> - <bean id="guestOSDaoImpl" class="com.cloud.storage.dao.GuestOSDaoImpl" /> <bean id="highAvailabilityDaoImpl" class="com.cloud.ha.dao.HighAvailabilityDaoImpl" /> <bean id="hostDaoImpl" class="com.cloud.host.dao.HostDaoImpl" /> <bean id="engineHostDetailsDaoImpl" class="org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDetailsDaoImpl" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/91c586ca/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index f54cf57..379c3fd 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -30,12 +30,12 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'Agent ALTER TABLE `cloud`.`load_balancer_vm_map` ADD state VARCHAR(40) NULL COMMENT 'service status updated by LB healthcheck manager'; alter table storage_pool change storage_provider_id storage_provider_name varchar(255); -alter table template_host_ref add state varchar(255); -alter table template_host_ref add update_count bigint unsigned; -alter table template_host_ref add updated datetime; -alter table volume_host_ref add state varchar(255); -alter table volume_host_ref add update_count bigint unsigned; -alter table volume_host_ref add updated datetime; +-- alter table template_host_ref add state varchar(255); +-- alter table template_host_ref add update_count bigint unsigned; +-- alter table template_host_ref add updated datetime; +-- alter table volume_host_ref add state varchar(255); +-- alter table volume_host_ref add update_count bigint unsigned; +-- alter table volume_host_ref add updated datetime; alter table template_spool_ref add updated datetime; CREATE TABLE `cloud`.`object_datastore_ref` ( `id` bigint unsigned NOT NULL auto_increment, @@ -652,12 +652,12 @@ CREATE VIEW `cloud`.`volume_view` AS vm_instance.state vm_state, vm_instance.vm_type, user_vm.display_name vm_display_name, - volume_host_ref.size volume_host_size, - volume_host_ref.created volume_host_created, - volume_host_ref.format, - volume_host_ref.download_pct, - volume_host_ref.download_state, - volume_host_ref.error_str, + volume_store_ref.size volume_host_size, + volume_store_ref.created volume_host_created, + volume_store_ref.format, + volume_store_ref.download_pct, + volume_store_ref.download_state, + volume_store_ref.error_str, disk_offering.id disk_offering_id, disk_offering.uuid disk_offering_uuid, disk_offering.name disk_offering_name,
