[parancoe] push by lucio.be...@gmail.com - Fixed component-service conflicts (old fix, never committed, but alrea... on 2014-02-06 17:14 GMT

[para...@googlecode.com]

Revision: 5e282a9b89ff
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Thu Feb 6 17:13:36 2014 UTC
Log: Fixed component-service conflicts (old fix, never committed, but
already deployed).
http://code.google.com/p/parancoe/source/detail?r=5e282a9b89ff

Modified:

/plugins/parancoe-plugin-configuration/src/main/java/org/parancoe/plugin/configuration/InitializerContextListener.java

/plugins/parancoe-plugin-configuration/src/main/java/org/parancoe/plugin/configuration/controllers/ConfigurationController.java

/plugins/parancoe-plugin-configuration/src/main/resources/applicationContext-plugin.xml

/plugins/parancoe-plugin-configuration/src/main/resources/parancoe-plugin.xml

=======================================
---
/plugins/parancoe-plugin-configuration/src/main/java/org/parancoe/plugin/configuration/InitializerContextListener.java
Fri Mar 1 12:03:24 2013 UTC
+++
/plugins/parancoe-plugin-configuration/src/main/java/org/parancoe/plugin/configuration/InitializerContextListener.java
Thu Feb 6 17:13:36 2014 UTC
@@ -41,7 +41,7 @@

private static final Logger log =
LoggerFactory.getLogger(InitializerContextListener.class);

- @Resource
+ @Resource(name = "configurationManager")
private ConfigurationService configurationService;

@Override
=======================================
---
/plugins/parancoe-plugin-configuration/src/main/java/org/parancoe/plugin/configuration/controllers/ConfigurationController.java
Fri Mar 1 12:03:24 2013 UTC
+++
/plugins/parancoe-plugin-configuration/src/main/java/org/parancoe/plugin/configuration/controllers/ConfigurationController.java
Thu Feb 6 17:13:36 2014 UTC
@@ -48,7 +48,7 @@

private static final Logger logger =
LoggerFactory.getLogger(ConfigurationController.class);

- @Resource
+ @Resource(name = "configurationManager")
private ConfigurationService configurationService;

@RequestMapping(method= RequestMethod.GET)
=======================================
---
/plugins/parancoe-plugin-configuration/src/main/resources/applicationContext-plugin.xml
Thu May 3 13:29:42 2012 UTC
+++
/plugins/parancoe-plugin-configuration/src/main/resources/applicationContext-plugin.xml
Thu Feb 6 17:13:36 2014 UTC
@@ -52,7 +52,7 @@
<!-- fixtures da caricare all'avvio del plugin -->
<property name="fixtureClassNames">
<list>
- <value>org.parancoe.plugin.configuration.Sample</value>
+
<!--<value>org.parancoe.plugin.configuration.Sample</value>-->
</list>
</property>

=======================================
---
/plugins/parancoe-plugin-configuration/src/main/resources/parancoe-plugin.xml
Thu May 3 13:29:42 2012 UTC
+++
/plugins/parancoe-plugin-configuration/src/main/resources/parancoe-plugin.xml
Thu Feb 6 17:13:36 2014 UTC
@@ -29,7 +29,7 @@
<context:component-scan
base-package="org.parancoe.plugin.configuration.controllers"/>

<!-- Interceptor specifico per questo plugin -->
- <bean id="parancoe-plugin-configurationSampleInterceptor"
class="org.parancoe.plugin.configuration.SampleInterceptor"/>
+ <!-- bean id="parancoe-plugin-configurationSampleInterceptor"
class="org.parancoe.plugin.configuration.SampleInterceptor"/ -->

<!-- -->
<!-- Plugin configuration -->