Inject ServletSupport into MoonRealm

[aaa.git] / aaa-shiro / impl / src / main / resources / OSGI-INF / blueprint / impl-blueprint.xml

diff --git a/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
index 5d10c7356793f52c42eae42b4bd666e73ed870e6..e79a652b28c11ada9c33b70393b947dc58ad7c0e 100644 (file)
--- a/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
+++ b/aaa-shiro/impl/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -12,7 +12,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <odl:clustered-app-config
           binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.ShiroConfiguration"
-          id="shiroConfiguration" default-config-file-name="aaa-app-config.xml" />
+          id="shiroConfiguration"
+          default-config-file-name="aaa-app-config.xml"/>
 
   <odl:clustered-app-config id="datastoreConfig"
         default-config-file-name="aaa-datastore-config.xml"
@@ -30,23 +31,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <reference id="certManager" interface="org.opendaylight.aaa.cert.api.ICertificateManager"/>
 
   <bean id="provider" class="org.opendaylight.aaa.AAAShiroProvider" init-method="init" destroy-method="close">
-    <argument ref="passwordCredentialAuth" />
-    <argument ref="datastoreConfig" />
-    <argument ref="idmStore" />
+    <argument ref="passwordCredentialAuth"/>
+    <argument ref="datastoreConfig"/>
+    <argument ref="idmStore"/>
   </bean>
 
+  <reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport"/>
+
   <bean id="shiroWebEnvLoader" class="org.opendaylight.aaa.shiro.web.env.ShiroWebEnvironmentLoaderListener">
     <argument ref="shiroConfiguration"/>
     <argument ref="dataBroker"/>
     <argument ref="certManager"/>
-    <argument ref="authService" />
+    <argument ref="authService"/>
     <argument>
       <bean factory-ref="provider" factory-method="getTokenAuthenticators"/>
     </argument>
     <argument>
       <bean factory-ref="provider" factory-method="getTokenStore"/>
     </argument>
-    <argument ref="passwordService" />
+    <argument ref="passwordService"/>
+    <argument ref="servletSupport"/>
   </bean>
   <service ref="shiroWebEnvLoader" interface="javax.servlet.ServletContextListener"/>
 
@@ -60,8 +64,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <reference id="webServer" interface="org.opendaylight.aaa.web.WebServer" />
 
-  <reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport" />
-
   <bean id="webInitializer" class="org.opendaylight.aaa.shiro.web.env.WebInitializer" destroy-method="close">
     <argument ref="webServer"/>
     <argument ref="claimCache"/>