[jboss-cvs] JBossAS SVN: r75176 - in trunk: testsuite and 2 other directories.

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

Author: alesj
Date: 2008-06-28 18:57:35 -0400 (Sat, 28 Jun 2008)
New Revision: 75176

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/build.xml
   trunk/testsuite/src/main/org/jboss/test/spring/beans/CalculatorImpl.java
   trunk/testsuite/src/main/org/jboss/test/spring/beans/LogManager.java
   trunk/testsuite/src/resources/spring/ejb/META-INF/ejb-spring.xml
Log:
Update VFS to 2.0.0.Beta20.
Use @Component in Spring tests.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-06-28 22:34:00 UTC (rev 75175)
+++ trunk/component-matrix/pom.xml	2008-06-28 22:57:35 UTC (rev 75176)
@@ -41,7 +41,7 @@
     <version.org.jboss.aop>2.0.0.CR13</version.org.jboss.aop>
     <version.org.jboss.ejb3>0.1.6</version.org.jboss.ejb3>
     <version.org.jboss.mdr>2.0.0.Beta15</version.org.jboss.mdr>
-    <version.org.jboss.vfs>2.0.0.Beta19</version.org.jboss.vfs>
+    <version.org.jboss.vfs>2.0.0.Beta20</version.org.jboss.vfs>
     <version.org.jboss.cl>2.0.0.Beta12</version.org.jboss.cl>
     <version.org.jboss.cluster>1.1.0.CR1</version.org.jboss.cluster>
     <version.org.jboss.deployers>2.0.0.Beta18</version.org.jboss.deployers>

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-06-28 22:34:00 UTC (rev 75175)
+++ trunk/testsuite/build.xml	2008-06-28 22:57:35 UTC (rev 75176)
@@ -151,6 +151,8 @@
       <path refid="hibernate3.classpath"/>
       <path refid="odmg.classpath"/>
       <path refid="cglib.classpath"/>
+     <!-- Need spring jar for spring-based tests -->
+     <path refid="spring.classpath"/>
 
       <!-- xml binding -->
       <path refid="xmlunit.xmlunit.classpath"/>

Modified: trunk/testsuite/src/main/org/jboss/test/spring/beans/CalculatorImpl.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/spring/beans/CalculatorImpl.java	2008-06-28 22:34:00 UTC (rev 75175)
+++ trunk/testsuite/src/main/org/jboss/test/spring/beans/CalculatorImpl.java	2008-06-28 22:57:35 UTC (rev 75176)
@@ -21,9 +21,12 @@
 */
 package org.jboss.test.spring.beans;
 
+import org.springframework.stereotype.Component;
+
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
+ at Component("calculator")
 public class CalculatorImpl implements Calculator
 {
    public int add(int a, int b)

Modified: trunk/testsuite/src/main/org/jboss/test/spring/beans/LogManager.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/spring/beans/LogManager.java	2008-06-28 22:34:00 UTC (rev 75175)
+++ trunk/testsuite/src/main/org/jboss/test/spring/beans/LogManager.java	2008-06-28 22:57:35 UTC (rev 75176)
@@ -22,10 +22,12 @@
 package org.jboss.test.spring.beans;
 
 import org.jboss.logging.Logger;
+import org.springframework.stereotype.Component;
 
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
+ at Component
 public class LogManager
 {
    private Logger log = Logger.getLogger(getClass());

Modified: trunk/testsuite/src/resources/spring/ejb/META-INF/ejb-spring.xml
===================================================================
--- trunk/testsuite/src/resources/spring/ejb/META-INF/ejb-spring.xml	2008-06-28 22:34:00 UTC (rev 75175)
+++ trunk/testsuite/src/resources/spring/ejb/META-INF/ejb-spring.xml	2008-06-28 22:57:35 UTC (rev 75176)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-<beans>
+  <context:component-scan base-package="org.jboss.test.spring"/>
 
-   <bean id="calculator" class="org.jboss.test.spring.beans.CalculatorImpl"/>
-
-   <bean id="logManager" class="org.jboss.test.spring.beans.LogManager"/>
-
 </beans>