merged develop

symbiote-h2020 · Apr 4, 2018 · 69d60f3 · 69d60f3
2 parents 6cf3b4a + 96aa22b
commit 69d60f3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/eu/h2020/symbiote/rapplugin/RapPluginConfiguration.java b/src/main/java/eu/h2020/symbiote/rapplugin/RapPluginConfiguration.java
@@ -17,14 +17,16 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
 
 import eu.h2020.symbiote.rapplugin.messaging.RabbitManager;
+import eu.h2020.symbiote.rapplugin.messaging.rap.RapPlugin;
 import eu.h2020.symbiote.rapplugin.properties.RabbitConnectionProperties;
+import eu.h2020.symbiote.rapplugin.properties.RapPluginProperties;
 import eu.h2020.symbiote.rapplugin.properties.RapProperties;
 
 
 @Configuration
-@ComponentScan(basePackages = {"eu.h2020.symbiote.rapplugin"})
 @EnableConfigurationProperties({
     RabbitConnectionProperties.class, 
     RapProperties.class})
@@ -36,6 +38,16 @@ public RabbitManager rapRabbitManager(RabbitTemplate template) {
     	return new RabbitManager(template);
     }
 
+    @Bean
+    public RapPlugin rapPlugin(RabbitManager manager, RapPluginProperties props) {
+    	return new RapPlugin(manager, props);
+    }
+
+    @Bean
+    public RapPluginProperties rapPluginProperties(RabbitConnectionProperties rabbitConnection, RapProperties pluginProperties) {
+    	return new RapPluginProperties(rabbitConnection, pluginProperties);
+    }
+
     @Autowired
     private SimpleRabbitListenerContainerFactory simpleRabbitListenerContainerFactory;
 

diff --git a/src/main/java/eu/h2020/symbiote/rapplugin/messaging/rap/RapPlugin.java b/src/main/java/eu/h2020/symbiote/rapplugin/messaging/rap/RapPlugin.java
@@ -60,7 +60,6 @@
  * @author Mario Kušek <mario.kusek@fer.hr>
  * 
  */
-@Service
 public class RapPlugin implements SmartLifecycle {
     private static final Logger LOG = LoggerFactory.getLogger(RapPlugin.class);
 

diff --git a/src/main/java/eu/h2020/symbiote/rapplugin/properties/RapPluginProperties.java b/src/main/java/eu/h2020/symbiote/rapplugin/properties/RapPluginProperties.java
@@ -12,7 +12,6 @@
  * @author Mario Kušek <mario.kusek@fer.hr>
  *
  */
-@Component("rapPluginProperties")
 public class RapPluginProperties {
     /**
      * The name of RAP plugin.