Fixed error in loader blueprint

Change-Id: I77afb75d571f8b90680d751e4f6b9b01655c6405
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>

diff --git a/loader/impl/pom.xml b/loader/impl/pom.xml
index d7db3e210c1e8314c93b5e8997f94bfd47752480..46b5d09ba20928cdf7c43835bd92db38c746400c 100644 (file)
--- a/loader/impl/pom.xml
+++ b/loader/impl/pom.xml
@@ -45,7 +45,10 @@
     <resources>
       <resource>
         <directory>target/generated-resources</directory>
-      </resource>   
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
     </resources>
     <plugins>
       <!--Clean extracted resources-->
@@ -154,6 +157,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/loader/impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/loader/impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 0e6180eadb7d47ea8f32ff26a1434bb24dd5033c..36944a07ce8f4e03f679d58470ab22ed76c49c17 100644 (file)
--- a/loader/impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/loader/impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -1,11 +1,10 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-    <!--bean id="bundle-onbind" class="org.opendaylight.dlux.bootstrapper.implementation.DluxBootstrapper"/-->
-    <bean id="bootstrapperImpl" class="org.opendaylight.dlux.bootstrapper.implementation.DluxBootstrapper"/>
+    <bean id="loaderImpl" class="org.opendaylight.dlux.loader.implementation.DluxLoader"/>
 
     <reference id="onBindService" availability="mandatory" activation="eager" interface="org.osgi.service.http.HttpService">
-      <reference-listener ref="bootstrapperImpl" bind-method="onBindService" unbind-method="onUnbindService"/>
+      <reference-listener ref="loaderImpl" bind-method="onBindService" unbind-method="onUnbindService"/>
     </reference>
 
-    <service id="serviceRegistration" interface="org.opendaylight.dlux.bootstrapper.IDluxBootstrapperRegistration" ref="bootstrapperImpl"/>
+    <service id="serviceRegistration" interface="org.opendaylight.dlux.loader.IDluxLoaderRegistration" ref="loaderImpl"/>
 
 </blueprint>
\ No newline at end of file