[jboss-cvs] JBossAS SVN: r75158 - in trunk/spring-int: src/main/org/jboss/spring/factory and 1 other directory.

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

Author: alesj
Date: 2008-06-27 09:35:12 -0400 (Fri, 27 Jun 2008)
New Revision: 75158

Modified:
   trunk/spring-int/build.xml
   trunk/spring-int/src/main/org/jboss/spring/factory/Instantiable.java
   trunk/spring-int/src/main/org/jboss/spring/factory/Nameable.java
   trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlApplicationContext.java
   trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlBeanDefinitionReader.java
Log:
Old tests work, so I'll commit - see VFSResourcePatternResolver usage.

Modified: trunk/spring-int/build.xml
===================================================================
--- trunk/spring-int/build.xml	2008-06-27 13:21:49 UTC (rev 75157)
+++ trunk/spring-int/build.xml	2008-06-27 13:35:12 UTC (rev 75158)
@@ -172,6 +172,7 @@
          <include name="org/jboss/spring/factory/**"/>
          <include name="org/jboss/spring/interceptor/**"/>
          <include name="org/jboss/spring/support/**"/>
+         <include name="org/jboss/spring/io/**"/>
       </fileset>
     </jar>
 
@@ -238,6 +239,7 @@
        <include name="org/jboss/spring/interceptor/**"/>
        <include name="org/jboss/spring/factory/**"/>
        <include name="org/jboss/spring/support/**"/>
+       <include name="org/jboss/spring/io/**"/>
     </javac>
   </target>
 
@@ -391,6 +393,7 @@
             <exclude name="org/jboss/spring/deployers/**"/>
             <exclude name="org/jboss/spring/factory/**"/>
             <exclude name="org/jboss/spring/interceptor/**"/>
+            <exclude name="org/jboss/spring/io/**"/>
         </javac>
         <copy todir="${module.output}/example/classes">
             <fileset dir="${source.resources}/test/dd">

Modified: trunk/spring-int/src/main/org/jboss/spring/factory/Instantiable.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/factory/Instantiable.java	2008-06-27 13:21:49 UTC (rev 75157)
+++ trunk/spring-int/src/main/org/jboss/spring/factory/Instantiable.java	2008-06-27 13:35:12 UTC (rev 75158)
@@ -23,6 +23,8 @@
 package org.jboss.spring.factory;
 
 /**
+ * Instatiable.
+ * 
  * @author <a href="mailto:ales.justin at genera-lynx.com">Ales Justin</a>
  */
 public interface Instantiable

Modified: trunk/spring-int/src/main/org/jboss/spring/factory/Nameable.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/factory/Nameable.java	2008-06-27 13:21:49 UTC (rev 75157)
+++ trunk/spring-int/src/main/org/jboss/spring/factory/Nameable.java	2008-06-27 13:35:12 UTC (rev 75158)
@@ -23,11 +23,16 @@
 package org.jboss.spring.factory;
 
 /**
+ * Nameable.
+ * 
  * @author <a href="mailto:ales.justin at genera-lynx.com">Ales Justin</a>
  */
 public interface Nameable
 {
-
+   /**
+    * Get the name.
+    *
+    * @return the name
+    */
    String getName();
-
 }

Modified: trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlApplicationContext.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlApplicationContext.java	2008-06-27 13:21:49 UTC (rev 75157)
+++ trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlApplicationContext.java	2008-06-27 13:35:12 UTC (rev 75158)
@@ -30,21 +30,18 @@
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.jboss.spring.io.VFSResourcePatternResolver;
 
 /**
  * @author <a href="mailto:ales.justin at genera-lynx.com">Ales Justin</a>
  */
-public class NamedXmlApplicationContext extends ClassPathXmlApplicationContext
-      implements Nameable
+public class NamedXmlApplicationContext extends ClassPathXmlApplicationContext implements Nameable
 {
-
    private String defaultName;
    private Resource resource;
    private NamedXmlBeanDefinitionReader beanDefinitionReader;
 
-   /**
-    * @see org.springframework.beans.factory.xml.XmlBeanFactory
-    */
    public NamedXmlApplicationContext(String defaultName, Resource resource) throws BeansException
    {
       this(defaultName, resource, true);
@@ -97,4 +94,8 @@
       return name;
    }
 
+   protected ResourcePatternResolver getResourcePatternResolver()
+   {
+      return new VFSResourcePatternResolver(getClassLoader());
+   }
 }

Modified: trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlBeanDefinitionReader.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlBeanDefinitionReader.java	2008-06-27 13:21:49 UTC (rev 75157)
+++ trunk/spring-int/src/main/org/jboss/spring/factory/NamedXmlBeanDefinitionReader.java	2008-06-27 13:35:12 UTC (rev 75158)
@@ -32,10 +32,8 @@
 /**
  * @author <a href="mailto:ales.justin at genera-lynx.com">Ales Justin</a>
  */
-public class NamedXmlBeanDefinitionReader extends XmlBeanDefinitionReader
-      implements Nameable, Instantiable
+public class NamedXmlBeanDefinitionReader extends XmlBeanDefinitionReader implements Nameable, Instantiable
 {
-
    private NamedXmlBeanDefinitionParser parser;
 
    public NamedXmlBeanDefinitionReader(BeanDefinitionRegistry beanFactory)
@@ -64,5 +62,4 @@
    {
       return parser.doInstantiate();
    }
-
 }