Fix unnecessary changes Spring contexts
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d9e4407 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d9e4407 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d9e4407 Branch: refs/heads/vpc-refactor Commit: 9d9e4407a4118dde619b00cd2f7281fc69acf6e5 Parents: 9289f31 Author: Antonio Fornie <afor...@schubergphilis.com> Authored: Mon Aug 18 07:24:38 2014 -0500 Committer: Wilder Rodrigues <wrodrig...@schubergphilis.com> Committed: Fri Oct 3 06:21:27 2014 +0200 ---------------------------------------------------------------------- .../META-INF/cloudstack/core/spring-server-core-misc-context.xml | 4 ---- .../cloudstack/server-network/spring-server-network-context.xml | 4 ---- 2 files changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d9e4407/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml ---------------------------------------------------------------------- diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml b/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml index d3f020e..479dc9c 100644 --- a/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml +++ b/server/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml @@ -37,10 +37,6 @@ <property name="name" value="VpcVirtualRouter" /> </bean> - <bean id="RouterDeploymentDefinitionBuilder" class="org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder"> - <property name="name" value="RouterDeploymentDefinitionBuilder" /> - </bean> - <bean id="actionEventUtils" class="com.cloud.event.ActionEventUtils" /> <bean id="alertGenerator" class="com.cloud.event.AlertGenerator" /> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d9e4407/server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml ---------------------------------------------------------------------- diff --git a/server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml b/server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml index 831ca1f..553ae44 100644 --- a/server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml +++ b/server/resources/META-INF/cloudstack/server-network/spring-server-network-context.xml @@ -61,8 +61,4 @@ <property name="name" value="VirtualRouter" /> </bean> - <bean id="RouterDeploymentDefinitionBuilder" class="org.cloud.network.router.deployment.RouterDeploymentDefinitionBuilder"> - <property name="name" value="RouterDeploymentDefinitionBuilder" /> - </bean> - </beans>