Of course, I forgot changes in the xml configuration again
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c48553c3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c48553c3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c48553c3 Branch: refs/heads/master Commit: c48553c36fda06a65da1d43a26de505c4f5ee852 Parents: a673d17 Author: Alex Huang <alex.hu...@citrix.com> Authored: Fri Aug 2 09:25:22 2013 -0700 Committer: Alex Huang <alex.hu...@citrix.com> Committed: Fri Aug 2 11:07:56 2013 -0700 ---------------------------------------------------------------------- client/tomcatconf/applicationContext.xml.in | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c48553c3/client/tomcatconf/applicationContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index 1642844..3d06630 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -174,7 +174,6 @@ <bean id="accountGuestVlanMapDaoImpl" class="com.cloud.network.dao.AccountGuestVlanMapDaoImpl" /> <bean id="accountVlanMapDaoImpl" class="com.cloud.dc.dao.AccountVlanMapDaoImpl" /> <bean id="alertDaoImpl" class="com.cloud.alert.dao.AlertDaoImpl" /> - <bean id="asyncJobDaoImpl" class="com.cloud.async.dao.AsyncJobDaoImpl" /> <bean id="asyncJobJoinDaoImpl" class="com.cloud.api.query.dao.AsyncJobJoinDaoImpl" /> <bean id="autoScalePolicyConditionMapDaoImpl" class="com.cloud.network.as.dao.AutoScalePolicyConditionMapDaoImpl" /> <bean id="autoScalePolicyDaoImpl" class="com.cloud.network.as.dao.AutoScalePolicyDaoImpl" /> @@ -316,8 +315,6 @@ <bean id="storagePoolHostDaoImpl" class="com.cloud.storage.dao.StoragePoolHostDaoImpl" /> <bean id="storagePoolJoinDaoImpl" class="com.cloud.api.query.dao.StoragePoolJoinDaoImpl" /> <bean id="storagePoolWorkDaoImpl" class="com.cloud.storage.dao.StoragePoolWorkDaoImpl" /> - <bean id="syncQueueDaoImpl" class="com.cloud.async.dao.SyncQueueDaoImpl" /> - <bean id="syncQueueItemDaoImpl" class="com.cloud.async.dao.SyncQueueItemDaoImpl" /> <bean id="templatePrimaryDataStoreDaoImpl" class="org.apache.cloudstack.storage.volume.db.TemplatePrimaryDataStoreDaoImpl" /> <bean id="uploadDaoImpl" class="com.cloud.storage.dao.UploadDaoImpl" /> <bean id="usageDaoImpl" class="com.cloud.usage.dao.UsageDaoImpl" /> @@ -756,8 +753,6 @@ <bean id="apiRateLimitServiceImpl" class="org.apache.cloudstack.ratelimit.ApiRateLimitServiceImpl"/> <bean id="alertManagerImpl" class="com.cloud.alert.AlertManagerImpl" /> - <bean id="asyncJobExecutorContextImpl" class="com.cloud.async.AsyncJobExecutorContextImpl" /> - <bean id="asyncJobManagerImpl" class="com.cloud.async.AsyncJobManagerImpl" /> <bean id="autoScaleManagerImpl" class="com.cloud.network.as.AutoScaleManagerImpl" /> <bean id="capacityManagerImpl" class="com.cloud.capacity.CapacityManagerImpl" /> <bean id="clusterFenceManagerImpl" class="com.cloud.cluster.ClusterFenceManagerImpl" /> @@ -789,7 +784,6 @@ <bean id="snapshotManagerImpl" class="com.cloud.storage.snapshot.SnapshotManagerImpl" /> <bean id="snapshotSchedulerImpl" class="com.cloud.storage.snapshot.SnapshotSchedulerImpl" /> <bean id="storageNetworkManagerImpl" class="com.cloud.network.StorageNetworkManagerImpl" /> - <bean id="syncQueueManagerImpl" class="com.cloud.async.SyncQueueManagerImpl" /> <bean id="taggedResourceManagerImpl" class="com.cloud.tags.TaggedResourceManagerImpl" /> <bean id="resourceMetaDataManagerImpl" class="com.cloud.metadata.ResourceMetaDataManagerImpl" /> <bean id="templateManagerImpl" class="com.cloud.template.TemplateManagerImpl" /> @@ -799,6 +793,19 @@ <bean id="vpcManagerImpl" class="com.cloud.network.vpc.VpcManagerImpl" /> <bean id="vpcVirtualNetworkApplianceManagerImpl" class="com.cloud.network.router.VpcVirtualNetworkApplianceManagerImpl" /> + <!-- Async management --> + <bean id="asyncJobDaoImpl" class="org.apache.cloudstack.framework.jobs.dao.AsyncJobDaoImpl" /> + <bean id="asyncJobJournalDaoImpl" class="org.apache.cloudstack.framework.jobs.dao.AsyncJobJournalDaoImpl" /> + <bean id="asyncJobJoinMapDaoImpl" class="org.apache.cloudstack.framework.jobs.dao.AsyncJobJoinMapDaoImpl" /> + <bean id="asyncJobManagerImpl" class="org.apache.cloudstack.framework.jobs.impl.AsyncJobManagerImpl"/> + <bean id="asyncJobMonitor" class="org.apache.cloudstack.framework.jobs.impl.AsyncJobMonitor"/> + <bean id="syncQueueDaoImpl" class="org.apache.cloudstack.framework.jobs.dao.SyncQueueDaoImpl" /> + <bean id="syncQueueItemDaoImpl" class="org.apache.cloudstack.framework.jobs.dao.SyncQueueItemDaoImpl" /> + <bean id="syncQueueManagerImpl" class="org.apache.cloudstack.framework.jobs.impl.SyncQueueManagerImpl" /> + + <bean id="ApiAsyncJobDispatcher" class="com.cloud.api.ApiAsyncJobDispatcher"> + <property name="name" value="ApiAsyncJobDispatcher" /> + </bean> <!--