Improve impl-blueprint layout

We have two independent beans here, cluster their dependencies
accordingly.

JIRA: AAA-205
Change-Id: I58f6d1111023d8adea2455366c79568680542343
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 0140ec49036fd74908db836f258e5533209ef823..5b914c2923cf9a3a0588d98b0b77072b5ed0b794 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
@@ -9,23 +9,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
-
-  <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"/>
+  <reference id="passwordCredentialAuth" interface="org.opendaylight.aaa.api.PasswordCredentialAuth"/>
+  <reference id="idmStore" interface ="org.opendaylight.aaa.api.IIDMStore"/>
 
   <odl:clustered-app-config id="datastoreConfig"
-        default-config-file-name="aaa-datastore-config.xml"
-        binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.DatastoreConfig" />
-
-  <reference id="authService" interface="org.opendaylight.aaa.api.AuthenticationService"/>
-  <reference id="passwordService" interface="org.opendaylight.aaa.api.password.service.PasswordHashService"/>
-  <reference id="idmStore" interface ="org.opendaylight.aaa.api.IIDMStore"/>
-  <reference id="passwordCredentialAuth" interface="org.opendaylight.aaa.api.PasswordCredentialAuth"/>
-  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
-  <reference id="certManager" interface="org.opendaylight.aaa.cert.api.ICertificateManager"/>
-  <reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport"/>
+    default-config-file-name="aaa-datastore-config.xml"
+    binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.DatastoreConfig"/>
 
   <bean id="provider" class="org.opendaylight.aaa.AAAShiroProvider" destroy-method="close">
     <argument ref="passwordCredentialAuth"/>
@@ -33,6 +22,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <argument ref="idmStore"/>
   </bean>
 
+  <reference id="authService" interface="org.opendaylight.aaa.api.AuthenticationService"/>
+  <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+  <reference id="certManager" interface="org.opendaylight.aaa.cert.api.ICertificateManager"/>
+  <reference id="passwordService" interface="org.opendaylight.aaa.api.password.service.PasswordHashService"/>
+  <reference id="servletSupport" interface="org.opendaylight.aaa.web.servlet.ServletSupport"/>
+
+  <odl:clustered-app-config id="shiroConfiguration"
+    default-config-file-name="aaa-app-config.xml"
+    binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.aaa.app.config.rev170619.ShiroConfiguration"/>
+
   <bean id="webEnvironment" class="org.opendaylight.aaa.shiro.web.env.AAAWebEnvironment">
     <argument ref="shiroConfiguration"/>
     <argument ref="dataBroker"/>