apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix MS startup exception.

Browse Source
This commit is contained in:
Min Chen 2013-04-30 10:13:30 -07:00
parent 99dcb23b1c
commit 91c586caa6
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/pom.xml
View File

@ -189,6 +189,11 @@
<artifactId>cloud-engine-storage</artifactId> <artifactId>cloud-engine-storage</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine-storage-cache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine-storage-backup</artifactId> <artifactId>cloud-engine-storage-backup</artifactId>
@ -201,7 +206,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine-storage-imagemotion</artifactId> <artifactId>cloud-engine-storage-datamotion</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

1
client/tomcatconf/applicationContext.xml.in
View File

@ -213,7 +213,6 @@
<bean id="guestOSCategoryDaoImpl" class="com.cloud.storage.dao.GuestOSCategoryDaoImpl" /> <bean id="guestOSCategoryDaoImpl" class="com.cloud.storage.dao.GuestOSCategoryDaoImpl" />
<bean id="guestOSDaoImpl" class="com.cloud.storage.dao.GuestOSDaoImpl" /> <bean id="guestOSDaoImpl" class="com.cloud.storage.dao.GuestOSDaoImpl" />
<bean id="guestOSHypervisorDaoImpl" class="com.cloud.storage.dao.GuestOSHypervisorDaoImpl" /> <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="highAvailabilityDaoImpl" class="com.cloud.ha.dao.HighAvailabilityDaoImpl" />
<bean id="hostDaoImpl" class="com.cloud.host.dao.HostDaoImpl" /> <bean id="hostDaoImpl" class="com.cloud.host.dao.HostDaoImpl" />
<bean id="engineHostDetailsDaoImpl" class="org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDetailsDaoImpl" /> <bean id="engineHostDetailsDaoImpl" class="org.apache.cloudstack.engine.datacenter.entity.api.db.dao.HostDetailsDaoImpl" />

24
setup/db/db/schema-410to420.sql
View File

@ -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 `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 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 state varchar(255);
alter table template_host_ref add update_count bigint unsigned; -- alter table template_host_ref add update_count bigint unsigned;
alter table template_host_ref add updated datetime; -- alter table template_host_ref add updated datetime;
alter table volume_host_ref add state varchar(255); -- 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 update_count bigint unsigned;
alter table volume_host_ref add updated datetime; -- alter table volume_host_ref add updated datetime;
alter table template_spool_ref add updated datetime; alter table template_spool_ref add updated datetime;
CREATE TABLE `cloud`.`object_datastore_ref` ( CREATE TABLE `cloud`.`object_datastore_ref` (
`id` bigint unsigned NOT NULL auto_increment, `id` bigint unsigned NOT NULL auto_increment,
@ -652,12 +652,12 @@ CREATE VIEW `cloud`.`volume_view` AS
vm_instance.state vm_state, vm_instance.state vm_state,
vm_instance.vm_type, vm_instance.vm_type,
user_vm.display_name vm_display_name, user_vm.display_name vm_display_name,
volume_host_ref.size volume_host_size, volume_store_ref.size volume_host_size,
volume_host_ref.created volume_host_created, volume_store_ref.created volume_host_created,
volume_host_ref.format, volume_store_ref.format,
volume_host_ref.download_pct, volume_store_ref.download_pct,
volume_host_ref.download_state, volume_store_ref.download_state,
volume_host_ref.error_str, volume_store_ref.error_str,
disk_offering.id disk_offering_id, disk_offering.id disk_offering_id,
disk_offering.uuid disk_offering_uuid, disk_offering.uuid disk_offering_uuid,
disk_offering.name disk_offering_name, disk_offering.name disk_offering_name,