mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
38eaa04b98
- Disables simulator plugin, breaks build, available via simulator profile - Fixes spring injections - Fix api,acl plugins, ApiServer, ApiDispatcher - Fix other merge conflicts Conflicts: docs/en-US/external-firewalls-and-load-balancers.xml plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java server/src/com/cloud/api/ApiDispatcher.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
53 lines
2.3 KiB
XML
53 lines
2.3 KiB
XML
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xmlns:context="http://www.springframework.org/schema/context"
|
|
xmlns:tx="http://www.springframework.org/schema/tx"
|
|
xmlns:aop="http://www.springframework.org/schema/aop"
|
|
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
|
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
|
http://www.springframework.org/schema/tx
|
|
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
|
|
http://www.springframework.org/schema/aop
|
|
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
|
http://www.springframework.org/schema/context
|
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
|
|
|
|
|
|
<!--
|
|
Configurable components
|
|
-->
|
|
<bean id="management-server" class ="com.cloud.server.ManagementServerExtImpl" />
|
|
<bean id="configuration-server" class="com.cloud.server.ConfigurationServerImpl" />
|
|
|
|
<!--
|
|
Network Elements
|
|
-->
|
|
<bean id="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement">
|
|
<property name="name" value="VirtualRouter"/>
|
|
</bean>
|
|
<bean id="Ovs" class="com.cloud.network.element.OvsElement">
|
|
<property name="name" value="Ovs"/>
|
|
</bean>
|
|
<bean id="ExternalDhcpServer" class="com.cloud.network.element.ExternalDhcpElement">
|
|
<property name="name" value="ExternalDhcpServer"/>
|
|
</bean>
|
|
<bean id="BareMetal" class="com.cloud.network.element.BareMetalElement">
|
|
<property name="name" value="BareMetal"/>
|
|
</bean>
|
|
<bean id="SecurityGroupProvider" class="com.cloud.network.element.SecurityGroupElement">
|
|
<property name="name" value="SecurityGroupProvider"/>
|
|
</bean>
|
|
<bean id="VpcVirtualRouter" class="com.cloud.network.element.VpcVirtualRouterElement">
|
|
<property name="name" value="VpcVirtualRouter"/>
|
|
</bean>
|
|
<bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
|
|
<property name="name" value="NiciraNvp"/>
|
|
</bean>
|
|
|
|
<!--
|
|
Adapters
|
|
-->
|
|
<bean id="StaticRoleBasedAPIAccessChecker" class="org.apache.cloudstack.acl.StaticRoleBasedAPIAccessChecker"/>
|
|
|
|
</beans>
|