[jboss-cvs] JBossAS SVN: r82627 - in projects/webbeans-ri-int/trunk/microcontainer/src: main/java/org/jboss/webbeans/integration/microcontainer/deployer/env and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 6 07:44:34 EST 2009
Author: alesj
Date: 2009-01-06 07:44:33 -0500 (Tue, 06 Jan 2009)
New Revision: 82627
Added:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaDataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansFilesDeployer.java
Removed:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostEjbJarMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/web-beans.xml
Modified:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
Log:
Split files lookup and wb env discovery.
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -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.webbeans.integration.microcontainer.deployer.env;
-
-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
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -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.webbeans.integration.microcontainer.deployer.env;
-
-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/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -22,9 +22,7 @@
package org.jboss.webbeans.integration.microcontainer.deployer.env;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.Collection;
import org.jboss.classloading.spi.dependency.Module;
import org.jboss.classloading.spi.visitor.ClassFilter;
@@ -32,9 +30,11 @@
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.classloading.spi.visitor.ResourceVisitor;
import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
+import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
/**
* WBD deployer.
@@ -46,105 +46,74 @@
public WebBeanDiscoveryDeployer()
{
super(JBossWebBeansMetaData.class);
+ addInput(JBossWebBeansMetaData.WEB_BEANS_FILES);
+ addInput(JBossWebBeansMetaData.WEB_BEANS_CLASSPATH);
addOutput(WebBeanDiscoveryEnvironment.class);
+ setStage(DeploymentStages.PRE_REAL);
}
public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
{
- VFSDeploymentUnit topUnit = unit.getTopLevel();
- WebBeanDiscoveryEnvironment environment = topUnit.getAttachment(WebBeanDiscoveryEnvironment.class);
- if (environment == null)
+ @SuppressWarnings("unchecked")
+ Collection<VirtualFile> wbFiles = unit.getAttachment(JBossWebBeansMetaData.WEB_BEANS_FILES, Collection.class);
+ boolean hasWB = (wbFiles != null && wbFiles.isEmpty() == false);
+
+ @SuppressWarnings("unchecked")
+ Collection<VirtualFile> cpFiles = unit.getAttachment(JBossWebBeansMetaData.WEB_BEANS_CLASSPATH, Collection.class);
+ boolean hasCp = (cpFiles != null && cpFiles.isEmpty() == false);
+
+ WebBeanDiscoveryEnvironment environment = null;
+ if (hasWB || hasCp)
{
- environment = new WebBeanDiscoveryEnvironment();
- topUnit.addAttachment(WebBeanDiscoveryEnvironment.class, environment);
+ VFSDeploymentUnit topUnit = unit.getTopLevel();
+ environment = topUnit.getAttachment(WebBeanDiscoveryEnvironment.class);
+ if (environment == null)
+ {
+ environment = new WebBeanDiscoveryEnvironment();
+ topUnit.addAttachment(WebBeanDiscoveryEnvironment.class, environment);
+ }
}
- List<URL> urls = new ArrayList<URL>();
-
try
{
- if (deployment != null)
+ if (hasWB)
{
- // do some custom stuff
+ for (VirtualFile file : wbFiles)
+ environment.addWebBeansXmlURL(file.toURL());
}
- Iterable<VirtualFile> classpaths = getClassPaths(unit);
- for (VirtualFile cp : classpaths)
+ if (hasCp)
{
- VirtualFile wbXml = cp.getChild("META-INF/web-beans.xml");
- if (wbXml != null)
+ Module module = unit.getAttachment(Module.class);
+ if (module == null)
{
- // add url
- environment.addWebBeansXmlURL(wbXml.toURL());
- // add classes
- urls.add(cp.toURL());
+ VFSDeploymentUnit parent = unit.getParent();
+ while (parent != null && module == null)
+ {
+ module = parent.getAttachment(Module.class);
+ parent = parent.getParent();
+ }
+ if (module == null)
+ throw new DeploymentException("No module in deployment unit's hierarchy: " + unit.getName());
}
- }
- // handle war slightly different
- VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
- if (warWbXml != null)
- {
- environment.addWebBeansXmlURL(warWbXml.toURL());
+ URL[] urls = new URL[cpFiles.size()];
+ int i = 0;
+ for (VirtualFile file : cpFiles)
+ {
+ urls[i++] = file.toURL();
+ }
- VirtualFile classes = unit.getFile("WEB-INF/classes");
- if (classes != null)
- urls.add(classes.toURL());
+ WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(environment);
+ module.visit(visitor, ClassFilter.INSTANCE, null, urls);
}
}
catch (Exception e)
{
- throw DeploymentException.rethrowAsDeploymentException("Cannot deploy WBD.", e);
+ throw DeploymentException.rethrowAsDeploymentException("Cannot build WB env.", e);
}
-
- if (urls.isEmpty() == false)
- {
- Module module = unit.getAttachment(Module.class);
- if (module == null)
- {
- VFSDeploymentUnit parent = unit.getParent();
- while (parent != null && module == null)
- {
- module = parent.getAttachment(Module.class);
- parent = parent.getParent();
- }
- if (module == null)
- throw new DeploymentException("No module in deployment unit's hierarchy: " + unit.getName());
- }
-
- WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(environment);
- module.visit(visitor, ClassFilter.INSTANCE, null, urls.toArray(new URL[urls.size()]));
- }
}
- /**
- * Get the matching class paths that belong to this deployment unit.
- *
- * @param unit the deployment unit
- * @return matching class paths
- * @throws Exception for any error
- */
- protected Iterable<VirtualFile> getClassPaths(VFSDeploymentUnit unit) throws Exception
- {
- List<VirtualFile> classpath = unit.getClassPath();
- if (classpath != null && classpath.isEmpty() == false)
- {
- List<VirtualFile> matching = new ArrayList<VirtualFile>();
- VirtualFile root = unit.getRoot();
- for (VirtualFile cp : classpath)
- {
- VirtualFile check = cp;
- while (check != null && check.equals(root) == false)
- check = check.getParent();
-
- if (check != null)
- matching.add(cp);
- }
- return matching;
- }
- return Collections.emptySet();
- }
-
private class WBDiscoveryVisitor implements ResourceVisitor
{
private WebBeanDiscoveryEnvironment wbdi;
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java (from rev 82565, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -0,0 +1,53 @@
+/*
+ * 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.webbeans.integration.microcontainer.deployer.ext;
+
+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;
+ public static final String WEB_BEANS_FILES = "WEB_BEANS_FILES";
+ public static final String WEB_BEANS_CLASSPATH = "WEB_BEANS_CLASSPATH";
+
+ 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
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaData.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaDataDeployer.java (from rev 82565, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaDataDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaDataDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -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.webbeans.integration.microcontainer.deployer.ext;
+
+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
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/ext/JBossWebBeansMetaDataDeployer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostEjbJarMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostEjbJarMetadataDeployer.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostEjbJarMetadataDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -1,61 +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.webbeans.integration.microcontainer.deployer.metadata;
-
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorMetaData;
-import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
-import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * Post ejb-jar.xml webbeans deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class PostEjbJarMetadataDeployer extends WebBeansAwareMetadataDeployer<EjbJarMetaData>
-{
- private InterceptorMetaData SBI;
-
- public PostEjbJarMetadataDeployer()
- {
- super(EjbJarMetaData.class);
- // create interceptor metadata instance
- SBI = new InterceptorMetaData();
- SBI.setInterceptorClass("org.jboss.webbeans.ejb.SessionBeanInterceptor");
- }
-
- protected void internalDeploy(VFSDeploymentUnit unit, EjbJarMetaData deployment, VirtualFile wbXml)
- {
- InterceptorsMetaData interceptors = deployment.getInterceptors();
- if (interceptors == null)
- {
- if (deployment instanceof EjbJar3xMetaData == false)
- return;
-
- interceptors = new InterceptorsMetaData();
- EjbJar3xMetaData.class.cast(deployment).setInterceptors(interceptors);
- }
- interceptors.add(SBI);
- }
-}
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -21,8 +21,14 @@
*/
package org.jboss.webbeans.integration.microcontainer.deployer.metadata;
+import java.util.Collection;
+import java.util.List;
+
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
/**
* Post jboss-app.xml webbeans deployer.
@@ -36,6 +42,9 @@
public PostJBossAppMetadataDeployer()
{
super(JBossAppMetaData.class);
+ setParentFirst(false); // after all (sub)-deployments have been checked for wb files
+ addInput(JBossWebBeansMetaData.WEB_BEANS_FILES);
+ setOptionalWebBeansXml(true);
}
protected boolean isClassLoadingMetadataPresent(JBossAppMetaData deployment)
@@ -43,6 +52,43 @@
return deployment.getLoaderRepository() != null;
}
+ @Override
+ protected boolean isIsolated(VFSDeploymentUnit unit, VirtualFile wbXml)
+ {
+ boolean superIsIsolated = super.isIsolated(unit, wbXml);
+
+ if (wbXml != null)
+ return superIsIsolated;
+
+ boolean result = checkHierarchy(unit);
+ return result || superIsIsolated;
+ }
+
+ /**
+ * Check deployment hierarchy for web-beans.xml files.
+ *
+ * @param unit the deployment unit
+ * @return true if web-beans.xml files exist, false otherwise
+ */
+ protected boolean checkHierarchy(DeploymentUnit unit)
+ {
+ Collection files = unit.getAttachment(JBossWebBeansMetaData.WEB_BEANS_FILES, Collection.class);
+ if (files != null && files.isEmpty() == false)
+ return true;
+
+ List<DeploymentUnit> children = unit.getChildren();
+ if (children != null && children.isEmpty() == false)
+ {
+ for (DeploymentUnit child : children)
+ {
+ boolean result = checkHierarchy(child);
+ if (result)
+ return true;
+ }
+ }
+ return false;
+ }
+
protected String getJMXName(JBossAppMetaData metaData, DeploymentUnit unit)
{
String name = metaData.getJmxName();
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java (from rev 82565, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostEjbJarMetadataDeployer.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -0,0 +1,94 @@
+/*
+ * 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.webbeans.integration.microcontainer.deployer.metadata;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
+import org.jboss.metadata.ejb.spec.EjbJar3xMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
+
+/**
+ * Adds wb custom interceptor to ejb deployments.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+ at SuppressWarnings("deprecation")
+public class WBEjbInterceptorMetadataDeployer extends AbstractVFSRealDeployer
+{
+ private InterceptorMetaData SBI;
+
+ public WBEjbInterceptorMetadataDeployer()
+ {
+ addInput(EjbJarMetaData.class);
+ addOutput(EjbJarMetaData.class);
+ addInput(JBossMetaData.class);
+ addOutput(JBossMetaData.class);
+ setStage(DeploymentStages.POST_PARSE);
+ // create interceptor metadata instance
+ SBI = new InterceptorMetaData();
+ SBI.setInterceptorClass("org.jboss.webbeans.ejb.SessionBeanInterceptor");
+ }
+
+ public void deploy(VFSDeploymentUnit unit) throws DeploymentException
+ {
+ EjbJarMetaData ejbjar = unit.getAttachment(EjbJarMetaData.class);
+ if (ejbjar != null && unit.getMetaDataFile("web-beans.xml") != null)
+ {
+ InterceptorsMetaData interceptors = ejbjar.getInterceptors();
+ if (interceptors == null && ejbjar instanceof EjbJar3xMetaData)
+ {
+ interceptors = new InterceptorsMetaData();
+ EjbJar3xMetaData.class.cast(ejbjar).setInterceptors(interceptors);
+ }
+
+ if (interceptors != null)
+ {
+ interceptors.add(SBI);
+ return;
+ }
+ }
+
+ JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
+ if (jbmd != null && unit.getMetaDataFile("web-beans.xml") != null)
+ {
+ InterceptorsMetaData interceptors = jbmd.getInterceptors();
+ if (interceptors == null)
+ {
+ InterceptorsMetaData imd = new InterceptorsMetaData();
+ imd.add(SBI);
+ EjbJar3xMetaData ejmd = new EjbJar30MetaData();
+ ejmd.setInterceptors(imd);
+ jbmd.merge(null, ejmd);
+ }
+ else
+ {
+ interceptors.add(SBI);
+ }
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WBEjbInterceptorMetadataDeployer.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -36,6 +36,9 @@
*/
public abstract class WebBeansAwareMetadataDeployer<T> extends AbstractSimpleVFSRealDeployer<T>
{
+ /** Do we allow null wb xml file */
+ private boolean optionalWebBeansXml;
+
public WebBeansAwareMetadataDeployer(Class<T> input)
{
super(input);
@@ -46,7 +49,7 @@
public void deploy(VFSDeploymentUnit unit, T deployment) throws DeploymentException
{
VirtualFile wbXml = unit.getMetaDataFile("web-beans.xml");
- if (wbXml != null)
+ if (wbXml != null || optionalWebBeansXml)
internalDeploy(unit, deployment, wbXml);
}
@@ -59,4 +62,14 @@
* @throws DeploymentException for any deployment error
*/
protected abstract void internalDeploy(VFSDeploymentUnit unit, T deployment, VirtualFile wbXml) throws DeploymentException;
+
+ /**
+ * Set optional wb xml file.
+ *
+ * @param optionalWebBeansXml the optional wb xml file flag
+ */
+ public void setOptionalWebBeansXml(boolean optionalWebBeansXml)
+ {
+ this.optionalWebBeansXml = optionalWebBeansXml;
+ }
}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -56,7 +56,6 @@
if (isClassLoadingMetadataPresent(deployment))
return;
-
if (isIsolated(unit, wbXml) == false)
return;
Added: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansFilesDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansFilesDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansFilesDeployer.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -0,0 +1,127 @@
+/*
+ * 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.webbeans.integration.microcontainer.deployer.metadata;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaData;
+
+/**
+ * A deployer that collects all web-beans.xml files in deployment unit
+ * and keeps them under WEB_BEANS_FILES constant.
+ * It also collects wb's matching classpaths, under WEB_BEANS_CLASSPATH const.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WebBeansFilesDeployer extends AbstractOptionalVFSRealDeployer<JBossWebBeansMetaData>
+{
+ public WebBeansFilesDeployer()
+ {
+ super(JBossWebBeansMetaData.class);
+ addOutput(JBossWebBeansMetaData.WEB_BEANS_FILES);
+ addOutput(JBossWebBeansMetaData.WEB_BEANS_CLASSPATH);
+ setStage(DeploymentStages.POST_PARSE);
+ }
+
+ public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
+ {
+ List<VirtualFile> wbFiles = new ArrayList<VirtualFile>();
+ List<VirtualFile> cpFiles = new ArrayList<VirtualFile>();
+ try
+ {
+ if (deployment != null)
+ {
+ // do some custom stuff
+ }
+
+ Iterable<VirtualFile> classpaths = getClassPaths(unit);
+ for (VirtualFile cp : classpaths)
+ {
+ VirtualFile wbXml = cp.getChild("META-INF/web-beans.xml");
+ if (wbXml != null)
+ {
+ // add url
+ wbFiles.add(wbXml);
+ // add classes
+ cpFiles.add(cp);
+ }
+ }
+
+ // handle war slightly different
+ VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
+ if (warWbXml != null)
+ {
+ wbFiles.add(warWbXml);
+
+ VirtualFile classes = unit.getFile("WEB-INF/classes");
+ if (classes != null)
+ cpFiles.add(classes);
+ }
+
+ if (wbFiles.isEmpty() == false)
+ unit.addAttachment(JBossWebBeansMetaData.WEB_BEANS_FILES, wbFiles, Collection.class);
+ if (cpFiles.isEmpty() == false)
+ unit.addAttachment(JBossWebBeansMetaData.WEB_BEANS_CLASSPATH, cpFiles, Collection.class);
+ }
+ catch (Exception e)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Cannot WBD files/classpath.", e);
+ }
+
+ }
+
+ /**
+ * Get the matching class paths that belong to this deployment unit.
+ *
+ * @param unit the deployment unit
+ * @return matching class paths
+ * @throws Exception for any error
+ */
+ protected Iterable<VirtualFile> getClassPaths(VFSDeploymentUnit unit) throws Exception
+ {
+ List<VirtualFile> classpath = unit.getClassPath();
+ if (classpath != null && classpath.isEmpty() == false)
+ {
+ List<VirtualFile> matching = new ArrayList<VirtualFile>();
+ VirtualFile root = unit.getRoot();
+ for (VirtualFile cp : classpath)
+ {
+ VirtualFile check = cp;
+ while (check != null && check.equals(root) == false)
+ check = check.getParent();
+
+ if (check != null)
+ matching.add(cp);
+ }
+ return matching;
+ }
+ return Collections.emptySet();
+ }
+}
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.java 2009-01-06 12:44:33 UTC (rev 82627)
@@ -28,6 +28,8 @@
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.version.Version;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.common.ejb.IEjbJarMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
@@ -55,12 +57,12 @@
public void testSimpleJar() throws Exception
{
- testJar("simple", false, true);
+ testJar("simple", false, EjbJarMetaData.class);
}
public void testPostJar() throws Exception
{
- testJar("post", true, false);
+ testJar("post", true, JBossMetaData.class);
}
public void testSimpleWar() throws Exception
@@ -79,10 +81,10 @@
DeploymentUnit earDU = assertDeploy(ear);
try
{
- assertClassLoading(earDU);
+ assertClassLoading(true, earDU);
DeploymentUnit jarDU = assertChild(earDU, "ejbs.jar");
- assertWBInterceptor(jarDU);
+ assertWBInterceptor(jarDU, EjbJarMetaData.class);
DeploymentUnit webDU = assertChild(earDU, "simple.war");
assertWBListener(webDU);
@@ -93,7 +95,7 @@
}
}
- protected void testJar(String type, boolean testCL, boolean testInterceptor) throws Exception
+ protected void testJar(String type, boolean testCL, Class<? extends IEjbJarMetaData> clazz) throws Exception
{
AssembledDirectory topLevel = createAssembledDirectory("ejbs.jar", "ejbs.jar");
addPath(topLevel, "/webbeans/" + type + "/ejb", "META-INF");
@@ -101,10 +103,8 @@
DeploymentUnit topDU = assertDeploy(topLevel);
try
{
- if (testCL)
- assertClassLoading(topDU);
- if (testInterceptor)
- assertWBInterceptor(topDU);
+ assertClassLoading(testCL, topDU);
+ assertWBInterceptor(topDU, clazz);
}
finally
{
@@ -121,7 +121,7 @@
try
{
if (testCL)
- assertClassLoading(topDU);
+ assertClassLoading(testCL, topDU);
if (testListner)
assertWBListener(topDU);
}
@@ -131,7 +131,7 @@
}
}
- protected void assertClassLoading(DeploymentUnit unit)
+ protected void assertClassLoading(boolean equals, DeploymentUnit unit)
{
ClassLoadingMetaData clmd = unit.getAttachment(ClassLoadingMetaData.class);
assertNotNull(clmd);
@@ -144,12 +144,12 @@
classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
classLoadingMetaData.setJ2seClassLoadingCompliance(false);
- assertEquals(clmd, classLoadingMetaData);
+ assertEquals(equals, clmd.equals(classLoadingMetaData));
}
- protected void assertWBInterceptor(DeploymentUnit unit)
+ protected void assertWBInterceptor(DeploymentUnit unit, Class<? extends IEjbJarMetaData> clazz)
{
- EjbJarMetaData ejbmd = unit.getAttachment(EjbJarMetaData.class);
+ IEjbJarMetaData ejbmd = unit.getAttachment(clazz);
assertNotNull(ejbmd);
InterceptorsMetaData interceptors = ejbmd.getInterceptors();
assertNotNull(interceptors);
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/PostDeployersTestCase.xml 2009-01-06 12:44:33 UTC (rev 82627)
@@ -9,7 +9,9 @@
<bean name="MockJBossWeb" class="org.jboss.test.webbeans.deployers.support.deployer.MockJBossWebDeployer"/>
<bean name="MockWeb" class="org.jboss.test.webbeans.deployers.support.deployer.MockWebDeployer"/>
- <bean name="PostEjbJar" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostEjbJarMetadataDeployer"/>
+ <bean name="WBFiles" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
+
+ <bean name="PostEjbJar" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>
<bean name="PostJBossApp" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossAppMetadataDeployer"/>
<bean name="PostJBoss" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossMetadataDeployer"/>
<bean name="PostJBossWeb" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.PostJBossWebMetadataDeployer"/>
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2009-01-06 12:44:33 UTC (rev 82627)
@@ -3,7 +3,8 @@
<bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
<bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
- <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.JBossWebBeansMetaDataDeployer"/>
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.ext.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBFilesDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.metadata.WebBeansFilesDeployer"/>
<bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
</deployment>
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/web-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/web-beans.xml 2009-01-06 12:05:20 UTC (rev 82626)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/webbeans/simple/META-INF/web-beans.xml 2009-01-06 12:44:33 UTC (rev 82627)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
More information about the jboss-cvs-commits
mailing list