From 1f7ef652cf4be2d2a7ab184e08ac212c6469df81 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren.s.shepherd@gmail.com>
Date: Thu, 14 Nov 2013 00:34:58 -0700
Subject: [PATCH] Make com.cloud.network.vpn.RemoteAccessVpnService an
 extensible type

---
 .../core/spring-core-registry-core-context.xml    | 10 ++++++++++
 ...core-lifecycle-network-context-inheritable.xml |  6 ++++++
 .../core/spring-server-core-managers-context.xml  |  4 +++-
 .../network/vpn/RemoteAccessVpnManagerImpl.java   | 15 +++++++++++++--
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index a8b2e2954af..be11a1f711f 100644
--- a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++ b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -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">
diff --git a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
index 3388ca41284..a54d58818bc 100644
--- a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
+++ b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
@@ -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>
\ No newline at end of file
diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index f7a8d6795cd..2a080f90f18 100644
--- a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -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" />
 
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 94834650c3f..dd18f74988e 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -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;
+	}
+
 }