[jboss-cvs] JBossAS SVN: r75302 - in trunk: server/src/etc/conf/default and 2 other directories.

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

Author: alesj
Date: 2008-07-02 07:48:50 -0400 (Wed, 02 Jul 2008)
New Revision: 75302

Added:
   trunk/server/src/etc/deployers/alias-deployers-beans.xml
Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/conf/default/deployers.xml
   trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java
Log:
Update Spring to 2.5.5.
Move alias deployers to separate file.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-07-02 09:54:40 UTC (rev 75301)
+++ trunk/component-matrix/pom.xml	2008-07-02 11:48:50 UTC (rev 75302)
@@ -53,7 +53,7 @@
     <version.org.jboss.security>2.0.2.CR6</version.org.jboss.security>
     <version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
     <version.suffix.org.jboss.javaee>.CR1</version.suffix.org.jboss.javaee>
-    <version.org.springframework>2.5</version.org.springframework>
+    <version.org.springframework>2.5.5</version.org.springframework>
     <version.sun-jaxws>2.1.1</version.sun-jaxws>
     <version.xdoclet>1.2.3</version.xdoclet>
   </properties>

Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml	2008-07-02 09:54:40 UTC (rev 75301)
+++ trunk/server/src/etc/conf/default/deployers.xml	2008-07-02 11:48:50 UTC (rev 75302)
@@ -169,9 +169,6 @@
    <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
       <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
    </bean>
-   <bean name="DeploymentAliasDeployer" class="org.jboss.deployers.vfs.deployer.kernel.DeploymentAliasMetaDataDeployer">
-      <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
-   </bean>
 
    <!-- JMX Deployment -->
    <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">

Copied: trunk/server/src/etc/deployers/alias-deployers-beans.xml (from rev 75209, trunk/server/src/etc/deployers/metadata-deployer-beans.xml)
===================================================================
--- trunk/server/src/etc/deployers/alias-deployers-beans.xml	                        (rev 0)
+++ trunk/server/src/etc/deployers/alias-deployers-beans.xml	2008-07-02 11:48:50 UTC (rev 75302)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Deployers that know how to handle direct aliases in deployment
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean name="AliasComponentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.AliasDeploymentDeployer" />
+
+  <bean name="DeploymentAliasDeployer" class="org.jboss.deployers.vfs.deployer.kernel.DeploymentAliasMetaDataDeployer">
+     <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+  </bean>
+
+</deployment>

Modified: trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java	2008-07-02 09:54:40 UTC (rev 75301)
+++ trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java	2008-07-02 11:48:50 UTC (rev 75302)
@@ -65,6 +65,30 @@
       return false;
    }
 
+   public boolean isReadable()
+   {
+      try
+      {
+         return file.getSize() > 0;
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public long lastModified()
+   {
+      try
+      {
+         return file.getLastModified();
+      }
+      catch (IOException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
    public URL getURL() throws IOException
    {
       try