[jboss-cvs] JBossAS SVN: r82562 - in projects/webbeans-ri-int/trunk: jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 29 09:43:08 EST 2008
Author: alesj
Date: 2008-12-29 09:43:08 -0500 (Mon, 29 Dec 2008)
New Revision: 82562
Added:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansWebUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/
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/env/WebBeanDiscoveryDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryEnvironment.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/
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/PostFacesConfigDeployer.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/PostJBossMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossWebMetadataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.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
Removed:
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaData.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaDataDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java
projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansWebUrlIntegrationDeployer.java
Modified:
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/WebBeanDiscoveryImpl.java
projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/WebBeanDiscoveryEnvVDFConnector.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml
Log:
Move to proper packages.
[WBRI-86, WBRI-87]; add metadata defaults deployers, fix int urls
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/WebBeanDiscoveryImpl.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/WebBeanDiscoveryImpl.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/WebBeanDiscoveryImpl.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -8,7 +8,7 @@
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.integration.jbossas.ejb3.EjbDiscoveryEnvironment;
import org.jboss.webbeans.integration.jbossas.vdf.WebBeanDiscoveryEnvVDFConnector;
-import org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryEnvironment;
+import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
public class WebBeanDiscoveryImpl implements WebBeanDiscovery
{
Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/WebBeanDiscoveryEnvVDFConnector.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/WebBeanDiscoveryEnvVDFConnector.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/vdf/WebBeanDiscoveryEnvVDFConnector.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -23,7 +23,7 @@
import javax.servlet.ServletContext;
-import org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryEnvironment;
+import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
/**
* WebBeanDiscoveryEnv VDF connector.
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaData.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaData.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaData.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -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;
-
-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/JBossWebBeansMetaDataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaDataDeployer.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaDataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -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;
-
-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
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryDeployer.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -1,167 +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;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.classloading.spi.visitor.ClassFilter;
-import org.jboss.classloading.spi.visitor.ResourceContext;
-import org.jboss.classloading.spi.visitor.ResourceFilter;
-import org.jboss.classloading.spi.visitor.ResourceVisitor;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
-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 WebBeanDiscoveryDeployer extends AbstractOptionalVFSRealDeployer<JBossWebBeansMetaData>
-{
- public WebBeanDiscoveryDeployer()
- {
- super(JBossWebBeansMetaData.class);
- addOutput(WebBeanDiscoveryEnvironment.class);
- }
-
- public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
- {
- VFSDeploymentUnit topUnit = unit.getTopLevel();
- WebBeanDiscoveryEnvironment 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)
- {
- // 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
- environment.addWebBeansXmlURL(wbXml.toURL());
- // add classes
- urls.add(cp.toURL());
- }
- }
-
- // handle war slightly different
- VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
- if (warWbXml != null)
- {
- environment.addWebBeansXmlURL(warWbXml.toURL());
-
- VirtualFile classes = unit.getFile("WEB-INF/classes");
- if (classes != null)
- urls.add(classes.toURL());
- }
- }
- catch (Exception e)
- {
- throw DeploymentException.rethrowAsDeploymentException("Cannot deploy WBD.", 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;
-
- private WBDiscoveryVisitor(WebBeanDiscoveryEnvironment wbdi)
- {
- this.wbdi = wbdi;
- }
-
- public ResourceFilter getFilter()
- {
- return ClassFilter.INSTANCE;
- }
-
- public void visit(ResourceContext resource)
- {
- wbdi.addWebBeanClass(resource.loadClass());
- }
- }
-}
\ No newline at end of file
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -1,77 +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;
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * WBD env impl.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeanDiscoveryEnvironment
-{
- private Set<Class<?>> classes = new HashSet<Class<?>>();
- private Set<URL> urls = new HashSet<URL>();
-
- /**
- * Add wb class.
- *
- * @param clazz the wb class
- */
- void addWebBeanClass(Class<?> clazz)
- {
- classes.add(clazz);
- }
-
- /**
- * Add wb xml url.
- *
- * @param url the wb xml url
- */
- void addWebBeansXmlURL(URL url)
- {
- urls.add(url);
- }
-
- /**
- * Get wb classes.
- *
- * @return the wb classes
- */
- public Iterable<Class<?>> getWebBeanClasses()
- {
- return classes;
- }
-
- /**
- * Get wb xmls.
- *
- * @return the wb xmls
- */
- public Iterable<URL> getWebBeansXml()
- {
- return urls;
- }
-}
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -1,75 +0,0 @@
-package org.jboss.webbeans.integration.microcontainer;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.jboss.deployers.vfs.plugins.classloader.PathUrlIntegrationDeployer;
-import org.jboss.util.StringPropertyReplacer;
-
-/**
- * Web Beans RI integration deployer.
- *
- * @param <T> exact input type
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public abstract class WebBeansUrlIntegrationDeployer<T> extends PathUrlIntegrationDeployer<T>
-{
- protected WebBeansUrlIntegrationDeployer(Class<T> input)
- {
- super(input);
- setIntegrationURL(getURL());
- setFiles(new String[]{"META-INF/web-beans.xml", "WEB-INF/web-beans.xml"});
- }
-
- /**
- * Get the Seam integration url.
- *
- * @return the seam jbossas integration url
- */
- protected URL getURL()
- {
- try
- {
- String url = getServerHome() + getOptionalLib() + getIntegrationJar();
- url = StringPropertyReplacer.replaceProperties(url);
- if (log.isTraceEnabled())
- log.trace("Web Beans integration url: " + url);
- return new URL(url);
- }
- catch (MalformedURLException e)
- {
- throw new IllegalArgumentException("Unexpected error: " + e);
- }
- }
-
- /**
- * Get server home.
- *
- * @return the jboss server home location
- */
- protected String getServerHome()
- {
- return "${jboss.server.home.url}";
- }
-
- /**
- * Get the optinal lib path.
- *
- * @return the integration path
- */
- protected String getOptionalLib()
- {
- return "deployers/webbeans.deployer/lib-int/";
- }
-
- /**
- * Get the integration jar.
- *
- * @return the integration jar
- */
- protected String getIntegrationJar()
- {
- return "webbeans-ri.jar";
- }
-}
Deleted: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansWebUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansWebUrlIntegrationDeployer.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansWebUrlIntegrationDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -1,18 +0,0 @@
-package org.jboss.webbeans.integration.microcontainer;
-
-
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-
-/**
- * Web Beans RI integration deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class WebBeansWebUrlIntegrationDeployer extends WebBeansUrlIntegrationDeployer<JBossWebMetaData>
-{
- public WebBeansWebUrlIntegrationDeployer()
- {
- // we only look at wars
- super(JBossWebMetaData.class);
- }
-}
\ No newline at end of file
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java (from rev 82504, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansUrlIntegrationDeployer.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,72 @@
+package org.jboss.webbeans.integration.microcontainer.deployer.cl;
+
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Set;
+import java.util.HashSet;
+
+import org.jboss.deployers.vfs.plugins.classloader.PathUrlIntegrationDeployer;
+import org.jboss.util.StringPropertyReplacer;
+
+/**
+ * Web Beans RI integration deployer.
+ *
+ * @param <T> exact input type
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class WebBeansUrlIntegrationDeployer<T> extends PathUrlIntegrationDeployer<T>
+{
+ protected WebBeansUrlIntegrationDeployer(Class<T> input)
+ {
+ super(input);
+ setIntegrationURLs(getURLs());
+ setFiles(new String[]{"META-INF/web-beans.xml", "WEB-INF/web-beans.xml"});
+ }
+
+ /**
+ * Get the WebBeans integration urls.
+ *
+ * @return the webbeans jbossas integration urls
+ */
+ protected Set<URL> getURLs()
+ {
+ try
+ {
+ String libOpt = getServerHome() + getOptionalLib();
+ libOpt = StringPropertyReplacer.replaceProperties(libOpt);
+
+ Set<URL> urls = new HashSet<URL>(4);
+ urls.add(new URL(libOpt + "webbeans-api.jar"));
+ urls.add(new URL(libOpt + "webbeans-ri-spi.jar"));
+ urls.add(new URL(libOpt + "webbeans-ri.jar"));
+ urls.add(new URL(libOpt + "webbeans-ri-int-jbossas.jar"));
+
+ return urls;
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalArgumentException("Unexpected error: " + e);
+ }
+ }
+
+ /**
+ * Get server home.
+ *
+ * @return the jboss server home location
+ */
+ protected String getServerHome()
+ {
+ return "${jboss.server.home.url}";
+ }
+
+ /**
+ * Get the optinal lib path.
+ *
+ * @return the integration path
+ */
+ protected String getOptionalLib()
+ {
+ return "deployers/webbeans.deployer/lib-int/";
+ }
+}
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansWebUrlIntegrationDeployer.java (from rev 82504, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeansWebUrlIntegrationDeployer.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansWebUrlIntegrationDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansWebUrlIntegrationDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,18 @@
+package org.jboss.webbeans.integration.microcontainer.deployer.cl;
+
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
+/**
+ * Web Beans RI integration deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class WebBeansWebUrlIntegrationDeployer extends WebBeansUrlIntegrationDeployer<JBossWebMetaData>
+{
+ public WebBeansWebUrlIntegrationDeployer()
+ {
+ // we only look at wars
+ super(JBossWebMetaData.class);
+ }
+}
\ No newline at end of file
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java (from rev 82504, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaData.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -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.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
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaData.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java (from rev 82504, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/JBossWebBeansMetaDataDeployer.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -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.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
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/JBossWebBeansMetaDataDeployer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java (from rev 82504, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryDeployer.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,167 @@
+/*
+ * 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.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.classloading.spi.visitor.ClassFilter;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
+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 WebBeanDiscoveryDeployer extends AbstractOptionalVFSRealDeployer<JBossWebBeansMetaData>
+{
+ public WebBeanDiscoveryDeployer()
+ {
+ super(JBossWebBeansMetaData.class);
+ addOutput(WebBeanDiscoveryEnvironment.class);
+ }
+
+ public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
+ {
+ VFSDeploymentUnit topUnit = unit.getTopLevel();
+ WebBeanDiscoveryEnvironment 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)
+ {
+ // 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
+ environment.addWebBeansXmlURL(wbXml.toURL());
+ // add classes
+ urls.add(cp.toURL());
+ }
+ }
+
+ // handle war slightly different
+ VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
+ if (warWbXml != null)
+ {
+ environment.addWebBeansXmlURL(warWbXml.toURL());
+
+ VirtualFile classes = unit.getFile("WEB-INF/classes");
+ if (classes != null)
+ urls.add(classes.toURL());
+ }
+ }
+ catch (Exception e)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Cannot deploy WBD.", 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;
+
+ private WBDiscoveryVisitor(WebBeanDiscoveryEnvironment wbdi)
+ {
+ this.wbdi = wbdi;
+ }
+
+ public ResourceFilter getFilter()
+ {
+ return ClassFilter.INSTANCE;
+ }
+
+ public void visit(ResourceContext resource)
+ {
+ wbdi.addWebBeanClass(resource.loadClass());
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryDeployer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryEnvironment.java (from rev 82506, projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/WebBeanDiscoveryEnvironment.java)
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryEnvironment.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryEnvironment.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,77 @@
+/*
+ * 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.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * WBD env impl.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WebBeanDiscoveryEnvironment
+{
+ private Set<Class<?>> classes = new HashSet<Class<?>>();
+ private Set<URL> urls = new HashSet<URL>();
+
+ /**
+ * Add wb class.
+ *
+ * @param clazz the wb class
+ */
+ void addWebBeanClass(Class<?> clazz)
+ {
+ classes.add(clazz);
+ }
+
+ /**
+ * Add wb xml url.
+ *
+ * @param url the wb xml url
+ */
+ void addWebBeansXmlURL(URL url)
+ {
+ urls.add(url);
+ }
+
+ /**
+ * Get wb classes.
+ *
+ * @return the wb classes
+ */
+ public Iterable<Class<?>> getWebBeanClasses()
+ {
+ return classes;
+ }
+
+ /**
+ * Get wb xmls.
+ *
+ * @return the wb xmls
+ */
+ public Iterable<URL> getWebBeansXml()
+ {
+ return urls;
+ }
+}
Property changes on: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/env/WebBeanDiscoveryEnvironment.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: 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 (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostEjbJarMetadataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,61 @@
+/*
+ * 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);
+ }
+}
Added: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostFacesConfigDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostFacesConfigDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostFacesConfigDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,52 @@
+/*
+ * 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.AbstractSimpleVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Post faces-config.xml deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PostFacesConfigDeployer extends AbstractSimpleVFSRealDeployer<JBossWebMetaData>
+{
+ public PostFacesConfigDeployer()
+ {
+ super(JBossWebMetaData.class);
+ setStage(DeploymentStages.POST_PARSE);
+ }
+
+ public void deploy(VFSDeploymentUnit unit, JBossWebMetaData deployment) throws DeploymentException
+ {
+ VirtualFile facesConfigXml = unit.getMetaDataFile("faces-config.xml");
+ if (facesConfigXml != null)
+ {
+ // TODO - Pete or Stan
+ }
+ }
+}
Added: 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 (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossAppMetadataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,54 @@
+/*
+ * 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.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+
+/**
+ * Post jboss-app.xml webbeans deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PostJBossAppMetadataDeployer extends WebBeansClassloadingDeployer<JBossAppMetaData>
+{
+ public static final String BASE_EAR_DEPLOYMENT_NAME = "jboss.j2ee:service=EARDeployment";
+
+ public PostJBossAppMetadataDeployer()
+ {
+ super(JBossAppMetaData.class);
+ }
+
+ protected boolean isClassLoadingMetadataPresent(JBossAppMetaData deployment)
+ {
+ return deployment.getLoaderRepository() != null;
+ }
+
+ protected String getJMXName(JBossAppMetaData metaData, DeploymentUnit unit)
+ {
+ String name = metaData.getJmxName();
+ if( name == null )
+ name = BASE_EAR_DEPLOYMENT_NAME + ",url='" + unit.getSimpleName() + "'";
+
+ return name;
+ }
+}
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossMetadataDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossMetadataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,55 @@
+/*
+ * 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.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+
+/**
+ * Post jboss.xml webbeans deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PostJBossMetadataDeployer extends WebBeansClassloadingDeployer<JBossMetaData>
+{
+ public static final String BASE_EJB_DEPLOYMENT_NAME = "jboss.j2ee:service=EJBDeployment";
+
+ public PostJBossMetadataDeployer()
+ {
+ super(JBossMetaData.class);
+ setTopLevelOnly(true); // only check for top .jar files
+ }
+
+ protected boolean isClassLoadingMetadataPresent(JBossMetaData deployment)
+ {
+ return deployment.getLoaderRepository() != null;
+ }
+
+ protected String getJMXName(JBossMetaData metaData, DeploymentUnit unit)
+ {
+ String name = metaData.getJmxName();
+ if (name == null)
+ name = BASE_EJB_DEPLOYMENT_NAME + ",url='" + unit.getSimpleName() + "'";
+
+ return name;
+ }
+}
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossWebMetadataDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostJBossWebMetadataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -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.webbeans.integration.microcontainer.deployer.metadata;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+
+/**
+ * Post jboss-web.xml webbeans deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PostJBossWebMetadataDeployer extends WebBeansClassloadingDeployer<JBossWebMetaData>
+{
+ public static final String BASE_WAR_DEPLOYMENT_NAME = "jboss.j2ee:service=WARDeployment";
+
+ public PostJBossWebMetadataDeployer()
+ {
+ super(JBossWebMetaData.class);
+ setTopLevelOnly(true); // only check for top .war files
+ }
+
+ protected boolean isClassLoadingMetadataPresent(JBossWebMetaData deployment)
+ {
+ return deployment.getClassLoading() != null;
+ }
+
+ protected String getJMXName(JBossWebMetaData metaData, DeploymentUnit unit)
+ {
+ return BASE_WAR_DEPLOYMENT_NAME + ",url='" + unit.getSimpleName() + "'";
+ }
+}
\ No newline at end of file
Added: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/PostWebMetadataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,60 @@
+/*
+ * 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.List;
+import java.util.ArrayList;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.metadata.web.spec.ListenerMetaData;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Post web.xml webbeans deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PostWebMetadataDeployer extends WebBeansAwareMetadataDeployer<WebMetaData>
+{
+ private ListenerMetaData WBL;
+
+ public PostWebMetadataDeployer()
+ {
+ super(WebMetaData.class);
+ // create wbl listener
+ WBL = new ListenerMetaData();
+ WBL.setListenerClass("org.jboss.webbeans.servlet.WebBeansListener");
+ }
+
+ protected void internalDeploy(VFSDeploymentUnit unit, WebMetaData deployment, VirtualFile wbXml) throws DeploymentException
+ {
+ List<ListenerMetaData> listeners = deployment.getListeners();
+ if (listeners == null)
+ {
+ listeners = new ArrayList<ListenerMetaData>();
+ deployment.setListeners(listeners);
+ }
+ listeners.add(WBL);
+ }
+}
\ No newline at end of file
Added: 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 (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansAwareMetadataDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,61 @@
+/*
+ * 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.AbstractSimpleVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * WebBeans aware metadata deployer.
+ * It looks for webbeans.xml in metadata.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class WebBeansAwareMetadataDeployer<T> extends AbstractSimpleVFSRealDeployer<T>
+{
+ public WebBeansAwareMetadataDeployer(Class<T> input)
+ {
+ super(input);
+ setStage(DeploymentStages.POST_PARSE);
+ addOutput(input); // we just modify this
+ }
+
+ public void deploy(VFSDeploymentUnit unit, T deployment) throws DeploymentException
+ {
+ VirtualFile wbXml = unit.getMetaDataFile("web-beans.xml");
+ if (wbXml != null)
+ internalDeploy(unit, deployment, wbXml);
+ }
+
+ /**
+ * Deploy.
+ *
+ * @param unit the deployment unit
+ * @param deployment the deployment metadata
+ * @param wbXml web beans xml
+ * @throws DeploymentException for any deployment error
+ */
+ protected abstract void internalDeploy(VFSDeploymentUnit unit, T deployment, VirtualFile wbXml) throws DeploymentException;
+}
\ No newline at end of file
Added: 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 (rev 0)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/metadata/WebBeansClassloadingDeployer.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -0,0 +1,119 @@
+/*
+ * 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.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.ExportAll;
+import org.jboss.classloading.spi.version.Version;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * Handle classloading metadata creation.
+ *
+ * @param <T> exact metadata type
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class WebBeansClassloadingDeployer<T> extends WebBeansAwareMetadataDeployer<T>
+{
+ /** Whether to isolated deployments */
+ private boolean isolated = true;
+
+ public WebBeansClassloadingDeployer(Class<T> input)
+ {
+ super(input);
+ addInput(ClassLoadingMetaData.class);
+ addOutput(ClassLoadingMetaData.class);
+ }
+
+ protected void internalDeploy(VFSDeploymentUnit unit, T deployment, VirtualFile wbXml) throws DeploymentException
+ {
+ ClassLoadingMetaData classLoadingMetaData = unit.getAttachment(ClassLoadingMetaData.class);
+ if (classLoadingMetaData != null)
+ return;
+
+ if (isClassLoadingMetadataPresent(deployment))
+ return;
+
+
+ if (isIsolated(unit, wbXml) == false)
+ return;
+
+ String domain = getJMXName(deployment, unit) + ",extension=LoaderRepository";
+ classLoadingMetaData = new ClassLoadingMetaData();
+ classLoadingMetaData.setName(unit.getName());
+ classLoadingMetaData.setDomain(domain);
+ classLoadingMetaData.setExportAll(ExportAll.NON_EMPTY);
+ classLoadingMetaData.setImportAll(true);
+ classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
+ classLoadingMetaData.setJ2seClassLoadingCompliance(false);
+
+ unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
+ }
+
+ /**
+ * Is cl metadata already present.
+ *
+ * @param deployment the metadata deployment
+ * @return true if cl metadata already exists
+ */
+ protected abstract boolean isClassLoadingMetadataPresent(T deployment);
+
+ /**
+ * Should we isolate deployment.
+ *
+ * @param unit the deployment unit
+ * @param wbXml webbeans xml
+ * @return true is deployment shouold be isolated, false otherwise
+ */
+ protected boolean isIsolated(VFSDeploymentUnit unit, VirtualFile wbXml)
+ {
+ return isIsolated();
+ }
+
+ /**
+ * Get jmx name.
+ *
+ * @param metaData the metadata
+ * @param unit the deployment unit
+ * @return deployment's jmx name
+ */
+ protected abstract String getJMXName(T metaData, DeploymentUnit unit);
+
+ /**
+ * @return whether ear deployments should be isolated
+ */
+ public boolean isIsolated()
+ {
+ return isolated;
+ }
+
+ /**
+ * @param isolated whether ear deployments should be isolated
+ */
+ public void setIsolated(boolean isolated)
+ {
+ this.isolated = isolated;
+ }
+}
\ No newline at end of file
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.java 2008-12-29 14:43:08 UTC (rev 82562)
@@ -29,7 +29,7 @@
import junit.framework.Test;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryEnvironment;
+import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
import org.jboss.test.webbeans.deployers.support.crm.CrmWebBean;
import org.jboss.test.webbeans.deployers.support.ejb.BusinessInterface;
import org.jboss.test.webbeans.deployers.support.ejb.MySLSBean;
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 2008-12-29 13:12:49 UTC (rev 82561)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/resources/org/jboss/test/webbeans/deployers/test/WBDiscoveryEnvTestCase.xml 2008-12-29 14:43:08 UTC (rev 82562)
@@ -3,7 +3,7 @@
<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.JBossWebBeansMetaDataDeployer"/>
- <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
+ <bean name="JWBMDDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryDeployer"/>
</deployment>
More information about the jboss-cvs-commits
mailing list