[jboss-cvs] JBossAS SVN: r81336 - in projects/jboss-deployers/trunk: deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 19 17:52:06 EST 2008


Author: alesj
Date: 2008-11-19 17:52:06 -0500 (Wed, 19 Nov 2008)
New Revision: 81336

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java
Removed:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaData.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaDataDeployer.java
Modified:
   projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml
Log:
Port real WarStructure.
Remove WBMD due to name+parser-deployer issue.
Add custom JWBMD.

Modified: projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java	2008-11-19 22:43:48 UTC (rev 81335)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -390,6 +390,4 @@
     * @throws Exception for any error
     */
    protected abstract T parse(DeploymentUnit unit, Set<String> names, String suffix, T root) throws Exception;
-
-
 }

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -0,0 +1,228 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.structure.war.support;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
+import org.jboss.deployers.vfs.spi.structure.StructureContext;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
+
+/**
+ * MockWarStructure.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MockWarStructureDeployer extends AbstractVFSStructureDeployer
+{
+   /** The default filter which allows jars/jar directories */
+   public static final VirtualFileFilter DEFAULT_WEB_INF_LIB_FILTER = new SuffixMatchFilter(".jar", VisitorAttributes.DEFAULT);
+
+   /** The web-inf/lib filter */
+   private VirtualFileFilter webInfLibFilter = DEFAULT_WEB_INF_LIB_FILTER;
+
+   /** The web-inf/lib/[some-archive]/META-INF filter */
+   private VirtualFileFilter webInfLibMetaDataFilter;
+
+   /**
+    * Sets the default relative order 1000.
+    *
+    */
+   public MockWarStructureDeployer()
+   {
+      setRelativeOrder(1000);
+   }
+
+   /**
+    * Get the webInfLibFilter.
+    *
+    * @return the webInfLibFilter.
+    */
+   public VirtualFileFilter getWebInfLibFilter()
+   {
+      return webInfLibFilter;
+   }
+
+   /**
+    * Set the webInfLibFilter.
+    *
+    * @param webInfLibFilter the webInfLibFilter.
+    * @throws IllegalArgumentException for a null filter
+    */
+   public void setWebInfLibFilter(VirtualFileFilter webInfLibFilter)
+   {
+      if (webInfLibFilter == null)
+         throw new IllegalArgumentException("Null filter");
+      this.webInfLibFilter = webInfLibFilter;
+   }
+
+   /**
+    * Get webInfLibMetaDataFilter
+    *
+    * @return the webInfLibMetaDataFilter
+    */
+   public VirtualFileFilter getWebInfLibMetaDataFilter()
+   {
+      return webInfLibMetaDataFilter;
+   }
+
+   /**
+    * Set the webInfLibMetaDataFilter.
+    *
+    * @param webInfLibMetaDataFilter the webInfLibFilter.
+    */
+   public void setWebInfLibMetaDataFilter(VirtualFileFilter webInfLibMetaDataFilter)
+   {
+      this.webInfLibMetaDataFilter = webInfLibMetaDataFilter;
+   }
+
+   public boolean determineStructure(StructureContext structureContext) throws DeploymentException
+   {
+      ContextInfo context = null;
+      VirtualFile file = structureContext.getFile();
+      try
+      {
+         boolean trace = log.isTraceEnabled();
+
+         if (isLeaf(file) == false)
+         {
+            // We require either a WEB-INF or the name ends in .war
+            if (file.getName().endsWith(".war") == false)
+            {
+               try
+               {
+                  VirtualFile child = file.getChild("WEB-INF");
+                  if (child != null)
+                  {
+                     if (trace)
+                        log.trace("... ok - directory has a WEB-INF subdirectory");
+                  }
+                  else
+                  {
+                     if (trace)
+                        log.trace("... no - doesn't look like a war and no WEB-INF subdirectory.");
+                     return false;
+                  }
+               }
+               catch (IOException e)
+               {
+                  log.warn("Exception while checking if file is a war: " + e);
+                  return false;
+               }
+            }
+            else if (trace)
+            {
+               log.trace("... ok - name ends in .war.");
+            }
+
+            List<String> metaDataLocations = new ArrayList<String>();
+            metaDataLocations.add("WEB-INF");
+
+            // Check for WEB-INF/classes
+            VirtualFile classes = null;
+            try
+            {
+               // The classpath contains WEB-INF/classes
+               classes = file.getChild("WEB-INF/classes");
+
+               // Check for a META-INF for metadata
+               if (classes != null)
+                  metaDataLocations.add("WEB-INF/classes/META-INF");
+            }
+            catch(IOException e)
+            {
+               log.warn("Exception while looking for classes, " + file.getPathName() + ", " + e);
+            }
+
+            // Check for jars in WEB-INF/lib
+            List<VirtualFile> archives = null;
+            try
+            {
+               VirtualFile webinfLib = file.getChild("WEB-INF/lib");
+               if (webinfLib != null)
+               {
+                  archives = webinfLib.getChildren(webInfLibFilter);
+                  // Add the jars' META-INF for metadata
+                  for (VirtualFile jar : archives)
+                  {
+                     // either same as plain lib filter, null or accepts the jar
+                     if (webInfLibMetaDataFilter == null || webInfLibMetaDataFilter == webInfLibFilter || webInfLibMetaDataFilter.accepts(jar))
+                        metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF");
+                  }
+               }
+            }
+            catch (IOException e)
+            {
+               log.warn("Exception looking for WEB-INF/lib, " + file.getPathName() + ", " + e);
+            }
+
+            // Create a context for this war file and all its metadata locations
+            context = createContext(structureContext, metaDataLocations.toArray(new String[metaDataLocations.size()]));
+
+            // Add the war manifest classpath entries
+            addClassPath(structureContext, file, false, true, context);
+
+            // Add WEB-INF/classes if present
+            if (classes != null)
+               addClassPath(structureContext, classes, true, false, context);
+            else if (trace)
+               log.trace("No WEB-INF/classes for: " + file.getPathName());
+
+            // and the top level jars in WEB-INF/lib
+            if (archives != null)
+            {
+               for (VirtualFile jar : archives)
+                  addClassPath(structureContext, jar, true, true, context);
+            }
+            else if (trace)
+            {
+               log.trace("No WEB-INF/lib for: " + file.getPathName());
+            }
+
+            // There are no subdeployments for wars
+            return true;
+         }
+         else
+         {
+            if (trace)
+               log.trace("... no - not a directory or an archive.");
+            return false;
+         }
+      }
+      catch (Exception e)
+      {
+         // Remove the invalid context
+         if (context != null)
+            structureContext.removeChild(context);
+
+         throw DeploymentException.rethrowAsDeploymentException("Error determining structure: " + file.getName(), e);
+      }
+   }
+}

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.webbeans.support;
+
+import java.io.Serializable;
+import java.net.URL;
+
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * JBoss WebBeans custom meta data
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class JBossWebBeansMetaData implements Serializable
+{
+   private static final long serialVersionUID = 1l;
+
+   private VirtualFile file;
+
+   public JBossWebBeansMetaData(VirtualFile file)
+   {
+      if (file == null)
+         throw new IllegalArgumentException("Null file");
+      this.file = file;
+   }
+
+   public URL getURL() throws Exception
+   {
+      return file.toURL();
+   }
+}
\ No newline at end of file

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.webbeans.support;
+
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * JBoss WBD deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class JBossWebBeansMetaDataDeployer extends AbstractVFSParsingDeployer<JBossWebBeansMetaData>  
+{
+   public JBossWebBeansMetaDataDeployer()
+   {
+      super(JBossWebBeansMetaData.class);
+      setName("jboss-web-beans.xml");
+   }
+
+   protected JBossWebBeansMetaData parse(VFSDeploymentUnit unit, VirtualFile file, JBossWebBeansMetaData root) throws Exception
+   {
+      return new JBossWebBeansMetaData(file);
+   }
+}
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java	2008-11-19 22:43:48 UTC (rev 81335)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -41,15 +41,15 @@
  *
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  */
-public class WebBeanDiscoveryDeployer extends AbstractOptionalVFSRealDeployer<WebBeansMetaData>
+public class WebBeanDiscoveryDeployer extends AbstractOptionalVFSRealDeployer<JBossWebBeansMetaData>
 {
    public WebBeanDiscoveryDeployer()
    {
-      super(WebBeansMetaData.class);
+      super(JBossWebBeansMetaData.class);
       addOutput(WebBeanDiscovery.class);
    }
 
-   public void deploy(VFSDeploymentUnit unit, WebBeansMetaData deployment) throws DeploymentException
+   public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
    {
       VFSDeploymentUnit topUnit = unit.getTopLevel();
       WebBeanDiscoveryImpl wbdi = topUnit.getAttachment(WebBeanDiscovery.class.getName(), WebBeanDiscoveryImpl.class);
@@ -63,8 +63,10 @@
 
       try
       {
-         if (deployment != null) // do some more stuff ...
-            wbdi.addWebBeansXmlURL(deployment.getURL());
+         if (deployment != null)
+         {
+            // do some custom stuff
+         }
 
          Iterable<VirtualFile> classpaths = getClassPaths(unit);
          for (VirtualFile cp : classpaths)
@@ -83,6 +85,8 @@
          VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
          if (warWbXml != null)
          {
+            wbdi.addWebBeansXmlURL(warWbXml.toURL());
+
             VirtualFile classes = unit.getFile("WEB-INF/classes");
             if (classes != null)
                urls.add(classes.toURL());

Deleted: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaData.java	2008-11-19 22:43:48 UTC (rev 81335)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaData.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.webbeans.support;
-
-import java.io.Serializable;
-import java.net.URL;
-
-import org.jboss.virtual.VirtualFile;
-
-/**
- * WBD deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeansMetaData implements Serializable
-{
-   private static final long serialVersionUID = 1l;
-
-   private VirtualFile file;
-
-   public WebBeansMetaData(VirtualFile file)
-   {
-      if (file == null)
-         throw new IllegalArgumentException("Null file");
-      this.file = file;
-   }
-
-   public URL getURL() throws Exception
-   {
-      return file.toURL();
-   }
-}
\ No newline at end of file

Deleted: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaDataDeployer.java	2008-11-19 22:43:48 UTC (rev 81335)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeansMetaDataDeployer.java	2008-11-19 22:52:06 UTC (rev 81336)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.webbeans.support;
-
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * WBD deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeansMetaDataDeployer extends AbstractVFSParsingDeployer<WebBeansMetaData>  
-{
-   public WebBeansMetaDataDeployer()
-   {
-      super(WebBeansMetaData.class);
-      setName("web-beans.xml");
-   }
-
-   protected WebBeansMetaData parse(VFSDeploymentUnit unit, VirtualFile file, WebBeansMetaData root) throws Exception
-   {
-      return new WebBeansMetaData(file);
-   }
-}
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml	2008-11-19 22:43:48 UTC (rev 81335)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml	2008-11-19 22:52:06 UTC (rev 81336)
@@ -1,9 +1,9 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
   <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
-  <bean name="WarStructure" class="org.jboss.deployers.vfs.plugins.structure.war.WARStructure"/>
+  <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
 
-  <bean name="WBMDDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.WebBeansMetaDataDeployer"/>
+  <bean name="JWBMDDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.JBossWebBeansMetaDataDeployer"/>
   <bean name="WBDiscoveryDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.WebBeanDiscoveryDeployer"/>
 
 </deployment>




More information about the jboss-cvs-commits mailing list