[jboss-cvs] JBossAS SVN: r72091 - in trunk: varia/src/main/org/jboss/varia/deployment and 1 other directory.

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

Author: alesj
Date: 2008-04-12 13:29:07 -0400 (Sat, 12 Apr 2008)
New Revision: 72091

Modified:
   trunk/spring-int/src/main/org/jboss/spring/deployers/SpringParserDeployer.java
   trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellDeployer.java
   trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellScriptDeployer.java
Log:
Remove FileMatcher, it's already implemented in VFSParserDeployer.

Modified: trunk/spring-int/src/main/org/jboss/spring/deployers/SpringParserDeployer.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/deployers/SpringParserDeployer.java	2008-04-12 16:41:06 UTC (rev 72090)
+++ trunk/spring-int/src/main/org/jboss/spring/deployers/SpringParserDeployer.java	2008-04-12 17:29:07 UTC (rev 72091)
@@ -22,7 +22,6 @@
 package org.jboss.spring.deployers;
 
 import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.deployer.FileMatcher;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VirtualFile;
 
@@ -32,7 +31,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class SpringParserDeployer extends AbstractVFSParsingDeployer<SpringMetaData> implements FileMatcher
+public class SpringParserDeployer extends AbstractVFSParsingDeployer<SpringMetaData>
 {
    private boolean useLegacyDefaultName;
 
@@ -105,9 +104,4 @@
 
       return new SpringMetaData(file.toURL(), defaultName);
    }
-
-   public boolean isDeployable(VirtualFile virtualFile)
-   {
-      return virtualFile.getName().endsWith(getSuffix());
-   }
 }

Modified: trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellDeployer.java
===================================================================
--- trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellDeployer.java	2008-04-12 16:41:06 UTC (rev 72090)
+++ trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellDeployer.java	2008-04-12 17:29:07 UTC (rev 72091)
@@ -22,7 +22,6 @@
 package org.jboss.varia.deployment;
 
 import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.deployer.FileMatcher;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.virtual.VirtualFile;
 
@@ -31,7 +30,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class LegacyBeanShellDeployer extends AbstractVFSParsingDeployer<BeanShellScript> implements FileMatcher
+public class LegacyBeanShellDeployer extends AbstractVFSParsingDeployer<BeanShellScript>
 {
    public LegacyBeanShellDeployer()
    {
@@ -46,9 +45,4 @@
 
       return new BeanShellScript(virtualFile.toURL());
    }
-
-   public boolean isDeployable(VirtualFile file)
-   {
-      return file.getName().endsWith(getSuffix());
-   }
 }

Modified: trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellScriptDeployer.java
===================================================================
--- trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellScriptDeployer.java	2008-04-12 16:41:06 UTC (rev 72090)
+++ trunk/varia/src/main/org/jboss/varia/deployment/LegacyBeanShellScriptDeployer.java	2008-04-12 17:29:07 UTC (rev 72091)
@@ -142,6 +142,6 @@
     */
    public void setMode(String mode)
    {
-      this.mode = ControllerMode.getInstance(mode);;
+      this.mode = ControllerMode.getInstance(mode);
    }
 }