[jboss-cvs] JBossAS SVN: r70063 - in projects/microcontainer/trunk: deployers-vfs/src/resources/tests/matchers/toplevel and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 25 09:12:36 EST 2008
Author: alesj
Date: 2008-02-25 09:12:36 -0500 (Mon, 25 Feb 2008)
New Revision: 70063
Added:
projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/
projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/dunno.txt
projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/my-beans.xml
projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/script.bsh
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/TestNameDeployer.java
Modified:
projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/FeedbackDeployer.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/FileMatchersTestCase.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/JarExtensionsTestCase.java
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/KernelHolderDeployersTest.java
Log:
Check exact name.
Test 2nd level files.
Added: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/dunno.txt
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/dunno.txt (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/dunno.txt 2008-02-25 14:12:36 UTC (rev 70063)
@@ -0,0 +1 @@
+Not recognized.
\ No newline at end of file
Added: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/my-beans.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/my-beans.xml (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/my-beans.xml 2008-02-25 14:12:36 UTC (rev 70063)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="Test" class="java.lang.Object"/>
+</deployment>
Added: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/script.bsh
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/script.bsh (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/resources/tests/matchers/toplevel/script.bsh 2008-02-25 14:12:36 UTC (rev 70063)
@@ -0,0 +1 @@
+Object object = new Object();
\ No newline at end of file
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/FeedbackDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/FeedbackDeployer.java 2008-02-25 14:08:49 UTC (rev 70062)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/FeedbackDeployer.java 2008-02-25 14:12:36 UTC (rev 70063)
@@ -22,7 +22,7 @@
package org.jboss.test.deployers.vfs.matchers.support;
import java.util.Set;
-import java.util.HashSet;
+import java.util.TreeSet;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -35,7 +35,7 @@
*/
public abstract class FeedbackDeployer extends AbstractVFSParsingDeployer<Object>
{
- private Set<String> files = new HashSet<String>();
+ private Set<String> files = new TreeSet<String>();
protected FeedbackDeployer()
{
Added: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/TestNameDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/TestNameDeployer.java (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/support/TestNameDeployer.java 2008-02-25 14:12:36 UTC (rev 70063)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.matchers.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class TestNameDeployer extends FeedbackDeployer
+{
+ public TestNameDeployer(String name)
+ {
+ setName(name);
+ }
+}
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/FileMatchersTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/FileMatchersTestCase.java 2008-02-25 14:08:49 UTC (rev 70062)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/FileMatchersTestCase.java 2008-02-25 14:12:36 UTC (rev 70063)
@@ -36,6 +36,7 @@
import org.jboss.test.deployers.vfs.matchers.support.FeedbackDeployer;
import org.jboss.test.deployers.vfs.matchers.support.TestBeanDeployer;
import org.jboss.test.deployers.vfs.matchers.support.TestBshDeployer;
+import org.jboss.test.deployers.vfs.matchers.support.TestNameDeployer;
/**
* File matchers tests.
@@ -90,28 +91,32 @@
controller.install(builder.getBeanMetaData());
assertEquals(2, matchers.size());
+ builder = BeanMetaDataBuilder.createBuilder("ExactNameDeployer", TestNameDeployer.class.getName());
+ builder.addConstructorParameter(String.class.getName(), "some.bsh");
+ controller.install(builder.getBeanMetaData());
+ assertEquals(3, matchers.size());
+
Deployers deployers = createDeployers();
main.setDeployers(deployers);
- ControllerContext bdContext = controller.getInstalledContext("BeanDeployer");
- assertNotNull(bdContext);
- FeedbackDeployer beanDeployer = (FeedbackDeployer)bdContext.getTarget();
- assertNotNull(beanDeployer);
- addDeployer(main, beanDeployer);
- ControllerContext bsContext = controller.getInstalledContext("BshDeployer");
- assertNotNull(bsContext);
- FeedbackDeployer shellDeployer = (FeedbackDeployer)bsContext.getTarget();
- assertNotNull(shellDeployer);
- addDeployer(main, shellDeployer);
- Deployment deploymentBean = createDeployment("/matchers", "qwert.beans");
- assertDeploy(main, deploymentBean);
+ FeedbackDeployer beanDeployer = addDeployer(main, "BeanDeployer");
+ FeedbackDeployer shellDeployer = addDeployer(main, "BshDeployer");
+ FeedbackDeployer nameDeployer = addDeployer(main, "ExactNameDeployer");
- Deployment deploymentShell = createDeployment("/matchers", "beanshell.jar");
- assertDeploy(main, deploymentShell);
+ Deployment deploymentBeans = createDeployment("/matchers", "qwert.beans");
+ assertDeploy(main, deploymentBeans);
+ Deployment deploymentShells = createDeployment("/matchers", "beanshell.jar");
+ assertDeploy(main, deploymentShells);
+ Deployment deploymentTopLevel = createDeployment("/matchers", "toplevel");
+ assertDeploy(main, deploymentTopLevel);
assertNotNull(beanDeployer.getFiles());
- assertEquals(new String[]{"some-beans.xml"}, beanDeployer.getFiles().toArray());
+ assertEquals(new String[]{"my-beans.xml", "some-beans.xml"}, beanDeployer.getFiles().toArray());
+
assertNotNull(shellDeployer.getFiles());
- assertEquals(new String[]{"some.bsh"}, shellDeployer.getFiles().toArray());
+ assertEquals(new String[]{"script.bsh", "some.bsh"}, shellDeployer.getFiles().toArray());
+
+ assertNotNull(nameDeployer.getFiles());
+ assertEquals(new String[]{"some.bsh"}, nameDeployer.getFiles().toArray());
}
}
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/JarExtensionsTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/JarExtensionsTestCase.java 2008-02-25 14:08:49 UTC (rev 70062)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/JarExtensionsTestCase.java 2008-02-25 14:12:36 UTC (rev 70063)
@@ -97,17 +97,10 @@
Deployers deployers = createDeployers();
main.setDeployers(deployers);
- ControllerContext rhtContext = controller.getInstalledContext("RhtDeployer");
- assertNotNull(rhtContext);
- FeedbackDeployer rhtDeployer = (FeedbackDeployer)rhtContext.getTarget();
- assertNotNull(rhtDeployer);
- addDeployer(main, rhtDeployer);
- ControllerContext jbsContext = controller.getInstalledContext("JbsDeployer");
- assertNotNull(jbsContext);
- FeedbackDeployer jbsDeployer = (FeedbackDeployer)jbsContext.getTarget();
- assertNotNull(jbsDeployer);
- addDeployer(main, jbsDeployer);
+ FeedbackDeployer rhtDeployer = addDeployer(main, "RhtDeployer");
+ FeedbackDeployer jbsDeployer = addDeployer(main, "JbsDeployer");
+
Deployment deploymentRHT = createDeployment("/matchers", "some.rhts");
assertDeploy(main, deploymentRHT);
assertTrue(jarStructure.getRecognized().contains("some.rhts"));
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/KernelHolderDeployersTest.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/KernelHolderDeployersTest.java 2008-02-25 14:08:49 UTC (rev 70062)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/matchers/test/KernelHolderDeployersTest.java 2008-02-25 14:12:36 UTC (rev 70063)
@@ -21,10 +21,14 @@
*/
package org.jboss.test.deployers.vfs.matchers.test;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.test.deployers.BaseDeployersVFSTest;
+import org.jboss.test.deployers.vfs.matchers.support.FeedbackDeployer;
/**
* Holds a Kernel instance
@@ -72,4 +76,17 @@
super.tearDown();
}
}
+
+ protected FeedbackDeployer addDeployer(DeployerClient main, String name)
+ {
+ ControllerContext context = controller.getInstalledContext(name);
+ assertNotNull("Missing deployer: " + name, context);
+ assertEquals(ControllerState.INSTALLED, context.getState());
+ Object target = context.getTarget();
+ assertNotNull(target);
+ assertInstanceOf(target, FeedbackDeployer.class);
+ FeedbackDeployer deployer = (FeedbackDeployer)target;
+ addDeployer(main, deployer);
+ return deployer;
+ }
}
Modified: projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java 2008-02-25 14:08:49 UTC (rev 70062)
+++ projects/microcontainer/trunk/deployers-vfs-spi/src/main/org/jboss/deployers/vfs/spi/deployer/AbstractVFSParsingDeployer.java 2008-02-25 14:12:36 UTC (rev 70063)
@@ -51,8 +51,12 @@
public boolean isDeployable(VirtualFile file)
{
+ String fileName = file.getName();
String suffix = getSuffix();
- return suffix != null && file.getName().endsWith(suffix);
+ if (suffix == null)
+ return fileName.equals(getName());
+ else
+ return fileName.endsWith(suffix);
}
/**
More information about the jboss-cvs-commits
mailing list