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

Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type

Browse Source
This commit is contained in:
Darren Shepherd 2013-11-14 00:34:58 -07:00 committed by Sheng Yang
parent 5e2e27dea6
commit 1f7ef652cf
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
View File

@ -213,6 +213,16 @@
</list>
</property>
</bean>
<bean id="remoteAccessVPNServiceProviderRegistry"
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">
<property name="excludeKey" value="remote.access.vpn.service.provider.exclude" />
<property name="preRegistered">
<list>
<ref bean="VpcVirtualRouter" />
</list>
</property>
</bean>
<bean id="affinityProcessorsRegistry"
class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry">

6
core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
View File

@ -90,5 +90,11 @@
<property name="typeClass"
value="com.cloud.network.element.Site2SiteVpnServiceProvider" />
</bean>
<bean class="org.apache.cloudstack.spring.lifecycle.registry.RegistryLifecycle">
<property name="registry" ref="remoteAccessVPNServiceProviderRegistry" />
<property name="typeClass"
value="com.cloud.network.element.RemoteAccessVPNServiceProvider" />
</bean>
</beans>

4
server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
View File

@ -144,7 +144,9 @@
<bean id="regionServiceImpl" class="org.apache.cloudstack.region.RegionServiceImpl" />
<bean id="remoteAccessVpnManagerImpl" class="com.cloud.network.vpn.RemoteAccessVpnManagerImpl" />
<bean id="remoteAccessVpnManagerImpl" class="com.cloud.network.vpn.RemoteAccessVpnManagerImpl" >
<property name="vpnServiceProviders" value="#{remoteAccessVPNServiceProviderRegistry.registered}" />
</bean>
<bean id="resourceLimitManagerImpl" class="com.cloud.resourcelimit.ResourceLimitManagerImpl" />

15
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
View File

@ -109,8 +109,9 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
@Inject FirewallManager _firewallMgr;
@Inject UsageEventDao _usageEventDao;
@Inject ConfigurationDao _configDao;
@Inject List<RemoteAccessVPNServiceProvider> _vpnServiceProviders;
@Inject ConfigurationServer _configServer;
List<RemoteAccessVPNServiceProvider> _vpnServiceProviders;
@Inject ConfigurationServer _configServer;
@Inject VpcDao _vpcDao;
int _userLimit;
@ -695,4 +696,14 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {RemoteAccessVpnClientIpRange};
}
public List<RemoteAccessVPNServiceProvider> getVpnServiceProviders() {
return _vpnServiceProviders;
}
public void setVpnServiceProviders(
List<RemoteAccessVPNServiceProvider> vpnServiceProviders) {
this._vpnServiceProviders = vpnServiceProviders;
}
}