[jboss-cvs] JBossAS SVN: r75808 - in projects/demos/trunk: models/src/resources/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-07-14 17:58:40 -0400 (Mon, 14 Jul 2008)
New Revision: 75808

Modified:
   projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml
   projects/demos/trunk/models/src/resources/META-INF/spring-beans.xml
Log:
Move SpringAnnotationPlugin to spring-beans.xml, keeping jmx module deployable.

Modified: projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml
===================================================================
--- projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml	2008-07-14 20:45:32 UTC (rev 75807)
+++ projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml	2008-07-14 21:58:40 UTC (rev 75808)
@@ -15,9 +15,6 @@
      <uncallback method="removeAnnotationPlugin" />
   </bean>
 
-  <!-- Adding @Spring annotation handler -->
-  <bean name="SpringAnnotationPlugin" class="org.jboss.spring.annotations.SpringBeanAnnotationPlugin" />
-
   <!-- Adding @JMX annotation handler -->
   <bean name="JmxFieldAnnotationPlugin" class="org.jboss.system.microcontainer.jmx.JMXFieldAnnotationPlugin" />
   <bean name="JmxPropertyAnnotationPlugin" class="org.jboss.system.microcontainer.jmx.JMXPropertyAnnotationPlugin" />

Modified: projects/demos/trunk/models/src/resources/META-INF/spring-beans.xml
===================================================================
--- projects/demos/trunk/models/src/resources/META-INF/spring-beans.xml	2008-07-14 20:45:32 UTC (rev 75807)
+++ projects/demos/trunk/models/src/resources/META-INF/spring-beans.xml	2008-07-14 21:58:40 UTC (rev 75808)
@@ -1,5 +1,8 @@
 <beans xmlns="urn:jboss:spring-beans:2.0">
 
-   <bean id="SpringPojo" class="org.jboss.demos.models.spring.Pojo"/>
+  <!-- Adding @Spring annotation handler -->
+  <bean id="SpringAnnotationPlugin" class="org.jboss.spring.annotations.SpringBeanAnnotationPlugin" />
 
+  <bean id="SpringPojo" class="org.jboss.demos.models.spring.Pojo"/>
+
 </beans>
\ No newline at end of file