[jboss-cvs] JBossAS SVN: r109183 - in trunk/weld-int: deployer/src/main/java/org/jboss/weld/integration/deployer/env and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 5 15:41:23 EDT 2010
Author: marius.bogoevici
Date: 2010-11-05 15:41:22 -0400 (Fri, 05 Nov 2010)
New Revision: 109183
Added:
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JBossBeanManagerObjectFactory.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinder.java
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinder.java
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinder.java
Removed:
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java
Modified:
trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockBootDeployer.java
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BasicEarJBossDeploymentTestCase.xml
trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml
trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/FlatDeploymentTestCase.xml
trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentSmokeTestCase.xml
trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml
Log:
Changing the way in which BeanManager is registered under a unique name
- not using a deployer, but a callback on BootstrapBean (guarantees that global names are available only after bootstrap, helps integration with Switchboard and that BM is unbound when BootstrapBean is uninstalled);
- using an ObjectFactory to ensure that the BeanManager for the current activity is returned;
- fix so that JavaCompJndiBinder is registered under a unique name;
Modified: trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml 2010-11-05 19:41:22 UTC (rev 109183)
@@ -101,10 +101,9 @@
<!-- Responsible for binding bean managers -->
- <bean name="JndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.JndiBinderDeployer">
+ <bean name="JndiBinder" class="org.jboss.weld.integration.deployer.jndi.JndiBinder">
<depends>jboss:service=Naming</depends>
<property name="nameSpaces"><inject bean="NameSpaces"/></property>
- <property name="beanDeploymentArchiveLocator"><inject bean="BeanDeploymentArchiveLocator"/></property>
<property name="moduleInformer"><inject bean="NamingJavaEEModuleInformer"/></property>
</bean>
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -23,6 +23,8 @@
import org.jboss.beans.metadata.api.annotations.Start;
import org.jboss.beans.metadata.api.annotations.Stop;
+import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -37,6 +39,7 @@
import org.jboss.weld.integration.deployer.env.bda.DUTopLevelClassLoaderGetter;
import org.jboss.weld.integration.deployer.env.bda.DeploymentImpl;
+import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
import org.jboss.weld.integration.provider.JBossSingletonProvider;
@@ -150,6 +153,12 @@
install.addParameterMetaData(String.class.getName(), "Start");
install.addParameterMetaData(String.class.getName(), "Create");
+ ParameterMetaDataBuilder jndiInstall = bootstrap.addInstallWithParameters("bind", "JndiBinder");
+ jndiInstall.addParameterMetaData(DeploymentUnit.class.getName(), unit);
+
+ ParameterMetaDataBuilder jndiUninstall = bootstrap.addUninstallWithParameters("unbind", "JndiBinder");
+ jndiUninstall.addParameterMetaData(DeploymentUnit.class.getName(), unit);
+
unit.addAttachment(DeployersUtils.getBootstrapBeanAttachmentName(unit), bootstrap.getBeanMetaData());
}
Deleted: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -1,159 +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.weld.integration.deployer.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.model.FromContext;
-import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.beans.metadata.spi.builder.ParameterMetaDataBuilder;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.reloaded.naming.service.NameSpaces;
-import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.weld.integration.deployer.DeployersUtils;
-
-/**
- * Extract binding logic to an abstract binder deployer.
- *
- * @param <T> exact bootstrap bean
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public abstract class AbstractJndiBinderDeployer<T> extends AbstractDeployer
-{
- public static final String BEAN_MANAGER_JNDI_SUBCONTEXT = "BeanManagers";
-
- private Class<T> bootstrapClass;
- private Object thisName;
- private Hashtable<String, String> jndiEnvironment = new Hashtable<String, String>();
- private Context beanManagerContext;
- private NameSpaces nameSpaces;
-
- protected AbstractJndiBinderDeployer(Class<T> bootstrapClass)
- {
- if (bootstrapClass == null)
- throw new IllegalArgumentException("Null bootstrap class");
-
- addInput(BeanMetaData.class);
- setStage(DeploymentStages.PRE_REAL);
-
- this.bootstrapClass = bootstrapClass;
- }
-
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- String bootstrapName = DeployersUtils.getBootstrapBeanName(unit);
- String bbAttachmentName = bootstrapName + "_" + BeanMetaData.class.getSimpleName();
-
- BeanMetaData bbBMD = unit.getTopLevel().getAttachment(DeployersUtils.getBootstrapBeanAttachmentName(unit), BeanMetaData.class);
- if (bbBMD != null)
- {
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(bbBMD);
-
- ParameterMetaDataBuilder pmdb = builder.addInstallWithParameters("bind", thisName.toString(), ControllerState.INSTALLED, ControllerState.INSTALLED);
- pmdb.addParameterMetaData(bootstrapClass.getName(), builder.createThis());
- pmdb.addParameterMetaData(DeploymentUnit.class.getName(), unit);
-
- pmdb = builder.addUninstallWithParameters("unbind", thisName.toString(), ControllerState.INSTALLED, ControllerState.INSTALLED);
- pmdb.addParameterMetaData(bootstrapClass.getName(), builder.createThis());
- pmdb.addParameterMetaData(DeploymentUnit.class.getName(), unit);
- }
- }
-
- @Inject(fromContext = FromContext.NAME)
- public void setThisName(Object thisName)
- {
- this.thisName = thisName;
- }
-
- public void setNameSpaces(NameSpaces nameSpaces)
- {
- this.nameSpaces = nameSpaces;
- }
-
- protected Context createContext() throws NamingException
- {
- return nameSpaces.getGlobalContext();
- }
-
- public void create() throws Exception
- {
- if (jndiEnvironment != null)
- addNonSerializableFactory(jndiEnvironment); // is here OK?
-
- Context context = createContext();
- beanManagerContext = context.createSubcontext(BEAN_MANAGER_JNDI_SUBCONTEXT);
- }
-
- protected Context getBeanManagerContext()
- {
- return beanManagerContext;
- }
-
- public void destroy()
- {
- try
- {
- Context context = createContext();
- context.destroySubcontext(BEAN_MANAGER_JNDI_SUBCONTEXT);
- }
- catch (Exception ignore)
- {
- }
- }
-
- public void setJndiEnvironment(Hashtable<String, String> jndiEnvironment)
- {
- this.jndiEnvironment = jndiEnvironment;
- }
-
-// --- binding logic ---
-
- public abstract void bind(T bootstrapBean, DeploymentUnit deploymentUnit) throws NamingException;
-
- public abstract void unbind(T bootstrapBean, DeploymentUnit deploymentUnit) throws NamingException;
-
- protected static void addNonSerializableFactory(Hashtable<String, String> environment)
- {
- String nonSerializableFactory = NonSerializableFactory.class.getName();
- String objFactory = environment.get(Context.OBJECT_FACTORIES);
- if (objFactory != null)
- {
- objFactory = nonSerializableFactory + ":" + objFactory;
- }
- else
- {
- objFactory = nonSerializableFactory;
- }
-
- environment.put(Context.OBJECT_FACTORIES, objFactory);
- }
-}
\ No newline at end of file
Added: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JBossBeanManagerObjectFactory.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JBossBeanManagerObjectFactory.java (rev 0)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JBossBeanManagerObjectFactory.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.weld.integration.deployer.jndi;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.spi.ObjectFactory;
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.jboss.weld.Container;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.integration.util.IdFactory;
+import org.jboss.weld.manager.BeanManagerImpl;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class JBossBeanManagerObjectFactory implements ObjectFactory
+{
+ public Object getObjectInstance(Object o, Name name, Context context, Hashtable<?, ?> hashtable) throws Exception
+ {
+ ClassLoader tccl = Thread.currentThread().getContextClassLoader();
+ Container container = Container.instance();
+ if (Container.available() && tccl != null)
+ {
+ String beanManagerId = IdFactory.getIdFromClassLoader(tccl);
+ for (Map.Entry<BeanDeploymentArchive, BeanManagerImpl> mapElement : container.beanDeploymentArchives().entrySet())
+ {
+ if (mapElement.getKey().getId().equals(beanManagerId))
+ {
+ return mapElement.getValue().getCurrent();
+ }
+ }
+ }
+ throw new NamingException("Cannot resolve BeanManager");
+ }
+}
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -65,7 +65,7 @@
if (beanManagerContext == null)
{
String path = applicationName == null? applicationName : (applicationName + "/" + moduleName);
- compContext.bind("BeanManager", new LinkRef("java:global/BeanManagers/" + path));
+ compContext.bind("BeanManager", new LinkRef("java:global/cdi/" + path +"/BeanManager"));
}
}
catch (NamingException e)
@@ -91,4 +91,4 @@
}
-}
\ No newline at end of file
+}
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -24,12 +24,18 @@
import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.jpa.javaee.JavaEEModuleInformer;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBean31MetaData;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.metadata.ejb.jboss.*;
import org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer;
import org.jboss.reloaded.naming.spi.JavaEEComponent;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -73,18 +79,19 @@
builder.addDependency(getJndiBinderName(deploymentUnit));
builder.addDependency(DeployersUtils.getBootstrapBeanName(deploymentUnit));
}
-
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(getJndiBinderName(deploymentUnit), JavaEEComponentJndiBinder.class.getName());
+
+ String jndiBinderName = getJndiBinderName(deploymentUnit);
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(jndiBinderName, JavaEEComponentJndiBinder.class.getName());
AbstractInjectionValueMetaData javaComponent = new AbstractInjectionValueMetaData(getComponentBeanName(deploymentUnit));
builder.addConstructorParameter(JavaEEComponent.class.getName(), javaComponent);
builder.addInstall("bindToJavaComp");
- deploymentUnit.getParent().addAttachment(deploymentUnit.getName() + "_JavaCompBinder", builder.getBeanMetaData());
+ deploymentUnit.getParent().addAttachment(jndiBinderName, builder.getBeanMetaData());
}
}
private String getJndiBinderName(DeploymentUnit deploymentUnit)
{
- return deploymentUnit.getName() + "_CompJndiBinder";
+ return getComponentBeanName(deploymentUnit) + "_CompJndiBinder";
}
private BeanMetaData getBootstrapBeanAttachment(DeploymentUnit deploymentUnit)
Copied: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinder.java (from rev 109130, trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java)
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinder.java (rev 0)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinder.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -0,0 +1,201 @@
+/*
+ * 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.weld.integration.deployer.jndi;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnitVisitor;
+import org.jboss.naming.Util;
+import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer;
+import org.jboss.reloaded.naming.service.NameSpaces;
+import org.jboss.weld.integration.deployer.DeployersUtils;
+import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
+
+/**
+ * This deployer intercepts BootstrapBean metadata,
+ * and adds JndiBinder invocations to it.
+ *
+ * @author Pete Muir
+ * @author <a href="mailto:stan.silvert at jboss.org">Stan Silvert</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ * @author Marius Bogoevici
+ */
+public class JndiBinder
+{
+ public static final String BEAN_MANAGER_JNDI_SUBCONTEXT = "cdi";
+ private Context beanManagerContext;
+ private NameSpaces nameSpaces;
+ private JavaEEModuleInformer moduleInformer;
+
+ public void setModuleInformer(JavaEEModuleInformer moduleInformer)
+ {
+ this.moduleInformer = moduleInformer;
+ }
+
+ public void setNameSpaces(NameSpaces nameSpaces)
+ {
+ this.nameSpaces = nameSpaces;
+ }
+
+ // --- binding logic ---
+
+
+ public void bind(DeploymentUnit unit) throws DeploymentException
+ {
+ if (DeployersUtils.checkForWeldFilesAcrossDeployment(unit))
+ {
+ unit.visit(new BinderVisitor(getBeanManagerContext()));
+ }
+ }
+
+ public void unbind(DeploymentUnit unit)
+ {
+ BeanMetaData bbBMD = unit.getTopLevel().getAttachment(DeployersUtils.getBootstrapBeanAttachmentName(unit), BeanMetaData.class);
+
+ if (bbBMD != null)
+ {
+ try
+ {
+ unit.visit(new UnbinderVisitor(getBeanManagerContext()));
+ }
+ catch (DeploymentException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ protected Context createContext() throws NamingException
+ {
+ return nameSpaces.getGlobalContext();
+ }
+
+ public void create() throws Exception
+ {
+ Context context = createContext();
+ beanManagerContext = context.createSubcontext(BEAN_MANAGER_JNDI_SUBCONTEXT);
+ }
+
+ protected Context getBeanManagerContext()
+ {
+ return beanManagerContext;
+ }
+
+ public void destroy()
+ {
+ try
+ {
+ Context context = createContext();
+ context.destroySubcontext(BEAN_MANAGER_JNDI_SUBCONTEXT);
+ }
+ catch (Exception ignore)
+ {
+ }
+ }
+
+ private boolean hasJndiBoundBeanManager(DeploymentUnit deploymentUnit)
+ {
+ return DeployersUtils.checkForWeldFiles(deploymentUnit, false) && (moduleInformer.getModuleType(deploymentUnit).equals(JavaEEModuleInformer.ModuleType.EJB) ||
+ moduleInformer.getModuleType(deploymentUnit).equals(JavaEEModuleInformer.ModuleType.WEB));
+ }
+
+ private String getJndiPath(DeploymentUnit deploymentUnit)
+ {
+ String applicationName = moduleInformer.getApplicationName(deploymentUnit);
+ String path = (applicationName == null) ? "" : applicationName + "/";
+ path += moduleInformer.getModuleName(deploymentUnit);
+ return path;
+ }
+
+ private class BinderVisitor implements DeploymentUnitVisitor
+ {
+ private final Context rootContext;
+
+ private BinderVisitor(Context rootContext)
+ {
+ this.rootContext = rootContext;
+ }
+
+ public void visit(DeploymentUnit unit) throws DeploymentException
+ {
+ try
+ {
+ if (hasJndiBoundBeanManager(unit))
+ {
+ String path = getJndiPath(unit);
+ Context subcontext = Util.createSubcontext(rootContext, path);
+ subcontext.bind("BeanManager", new Reference(BeanManager.class.getName(), "org.jboss.weld.integration.deployer.jndi.JBossBeanManagerObjectFactory", null));
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new DeploymentException(e);
+ }
+ }
+
+ public void error(DeploymentUnit unit)
+ {
+ // do nothing
+ }
+ }
+
+ private class UnbinderVisitor implements DeploymentUnitVisitor
+ {
+ private final Context rootContext;
+
+ private UnbinderVisitor(Context rootContext)
+ {
+ this.rootContext = rootContext;
+ }
+
+ public void visit(DeploymentUnit unit) throws DeploymentException
+ {
+ try
+ {
+ if (hasJndiBoundBeanManager(unit))
+ {
+ String path = getJndiPath(unit);
+ Context subcontext = (Context) rootContext.lookup(path);
+ subcontext.unbind("BeanManager");
+ rootContext.destroySubcontext(path);
+ }
+ }
+ catch (NamingException e)
+ {
+ throw new DeploymentException(e);
+ }
+ }
+
+ public void error(DeploymentUnit unit)
+ {
+ // do nothing
+ }
+ }
+
+
+}
Property changes on: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinder.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Deleted: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -1,151 +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.weld.integration.deployer.jndi;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.BeanManager;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer;
-import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
-import org.jboss.weld.manager.api.WeldManager;
-
-/**
- * This deployer intercepts BootstrapBean metadata,
- * and adds JndiBinder invocations to it.
- *
- * @author Pete Muir
- * @author <a href="mailto:stan.silvert at jboss.org">Stan Silvert</a>
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class JndiBinderDeployer extends AbstractJndiBinderDeployer<BootstrapBean>
-{
- public JndiBinderDeployer()
- {
- super(BootstrapBean.class);
- this.setWantComponents(false);
- }
-
- private BeanDeploymentArchiveLocator beanDeploymentArchiveLocator;
-
- private JavaEEModuleInformer moduleInformer;
-
- public void setBeanDeploymentArchiveLocator(BeanDeploymentArchiveLocator beanDeploymentArchiveLocator)
- {
- this.beanDeploymentArchiveLocator = beanDeploymentArchiveLocator;
- }
-
- public void setModuleInformer(JavaEEModuleInformer moduleInformer)
- {
- this.moduleInformer = moduleInformer;
- }
-
- // --- binding logic ---
-
- public void bind(BootstrapBean bootstrapBean, DeploymentUnit deploymentUnit) throws NamingException
- {
- Context context = getBeanManagerContext();
-
- if (moduleInformer.getModuleType(deploymentUnit).equals(JavaEEModuleInformer.ModuleType.EJB) ||
- moduleInformer.getModuleType(deploymentUnit).equals(JavaEEModuleInformer.ModuleType.WEB))
- {
- BeanDeploymentArchive beanDeploymentArchive = beanDeploymentArchiveLocator.getBeanDeploymentArchive(bootstrapBean, deploymentUnit);
- if (beanDeploymentArchive != null)
- {
- String applicationName = moduleInformer.getApplicationName(deploymentUnit);
- String name = (applicationName == null) ? "" : applicationName + "/";
- name += moduleInformer.getModuleName(deploymentUnit);
- NonSerializableFactory.rebind(context, name, bootstrapBean.getBootstrap().getManager(beanDeploymentArchive), true);
- }
- }
- }
-
- public void unbind(BootstrapBean bootstrapBean, DeploymentUnit deploymentUnit) throws NamingException
- {
- Map<String, BeanManager> beanManagers = new DeploymentVisitor(bootstrapBean).visit().getBeanManagers();
- Context context = (Context)getBeanManagerContext();
- String applicationName = moduleInformer.getApplicationName(deploymentUnit);
- String topContext = applicationName != null? applicationName: moduleInformer.getModuleName(deploymentUnit);
- try
- {
- Context appContext = (Context) context.lookup(topContext);
- context.destroySubcontext(topContext);
- }
- catch (NamingException e)
- {
- // ignore if missing
- }
-
- }
-
- protected static class DeploymentVisitor
- {
- private final Map<String, BeanManager> beanManagers;
- private final BootstrapBean bootstrapBean;
-
- public DeploymentVisitor(BootstrapBean bootstrapBean)
- {
- this.beanManagers = new HashMap<String, BeanManager>();
- this.bootstrapBean = bootstrapBean;
- }
-
- public Map<String, BeanManager> getBeanManagers()
- {
- return Collections.unmodifiableMap(beanManagers);
- }
-
- public DeploymentVisitor visit()
- {
- for (BeanDeploymentArchive bda : bootstrapBean.getDeployment().getBeanDeploymentArchives())
- {
- visit(bda, new HashSet<BeanDeploymentArchive>());
- }
- return this;
- }
-
- private void visit(BeanDeploymentArchive bda, Set<BeanDeploymentArchive> seenBdas)
- {
- WeldManager beanManager = bootstrapBean.getBootstrap().getManager(bda);
- // BeanManager id is simply the BDA ID
- String key = beanManager.getId();
- beanManagers.put(key, beanManager);
- seenBdas.add(bda);
- for (BeanDeploymentArchive child : bda.getBeanDeploymentArchives())
- {
- if (!seenBdas.contains(child))
- {
- visit(child, seenBdas);
- }
- }
- }
-
- }
-}
Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -55,19 +55,20 @@
{
AbstractInjectionValueMetaData javaModule = new AbstractInjectionValueMetaData(getModuleBeanName(deploymentUnit));
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(deploymentUnit.getName() + "_WebCompJndiBinder", SimpleCompJndiBinder.class.getName());
+ String beanMetaDataMcNamespace = getModuleBeanName(deploymentUnit);
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanMetaDataMcNamespace + "_WebCompJndiBinder", SimpleCompJndiBinder.class.getName());
builder.addConstructorParameter(DeploymentUnit.class.getName(), deploymentUnit);
builder.addConstructorParameter(JavaEEModule.class.getName(), javaModule);
builder.addInstall("bindToJavaComp");
// no uninstall method for SimpleCompJndiBinder (context will be destroyed by Tomcat)
//builder.addUninstall("unbind");
- deploymentUnit.getTopLevel().addAttachment(deploymentUnit.getName() + "_WebCompJndiBinder", builder.getBeanMetaData());
+ deploymentUnit.getTopLevel().addAttachment(beanMetaDataMcNamespace + "_WebCompJndiBinder", builder.getBeanMetaData());
- BeanMetaDataBuilder moduleBinderBuilder = BeanMetaDataBuilder.createBuilder(deploymentUnit.getName() + "_JavaModuleJndiBinder", JavaEEModuleJndiBinder.class.getName());
+ BeanMetaDataBuilder moduleBinderBuilder = BeanMetaDataBuilder.createBuilder(beanMetaDataMcNamespace + "_JavaModuleJndiBinder", JavaEEModuleJndiBinder.class.getName());
moduleBinderBuilder.addConstructorParameter(JavaEEModule.class.getName(), javaModule);
moduleBinderBuilder.addInstall("bindToJavaComp");
moduleBinderBuilder.addUninstall("unbind");
- deploymentUnit.getTopLevel().addAttachment(deploymentUnit.getName() + "_JavaModuleJndiBinder", moduleBinderBuilder.getBeanMetaData());
+ deploymentUnit.getTopLevel().addAttachment(beanMetaDataMcNamespace + "_JavaModuleJndiBinder", moduleBinderBuilder.getBeanMetaData());
}
}
Copied: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinder.java (from rev 109130, trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java)
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinder.java (rev 0)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinder.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.support.deployer;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.weld.integration.deployer.jndi.JndiBinder;
+
+/**
+ * Mock checkable jndi binder deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class CheckableJndiBinder extends JndiBinder
+{
+ public static Context ROOT = new MockContext();
+
+ @Override
+ protected Context createContext() throws NamingException
+ {
+ return ROOT;
+ }
+
+ @Override
+ public void bind(DeploymentUnit unit) throws DeploymentException
+ {
+ try
+ {
+ Context context = getBeanManagerContext().createSubcontext(unit.getSimpleName());
+ context.bind("bootstrap", "Bootstrap Dummy");
+ }
+ catch (NamingException e)
+ {
+ new DeploymentException(e);
+ }
+ }
+
+ @Override
+ public void unbind(DeploymentUnit unit)
+ {
+ try
+ {
+ Context context = (Context)getBeanManagerContext().lookup(unit.getSimpleName());
+ context.unbind("bootstrap");
+
+ getBeanManagerContext().destroySubcontext(unit.getSimpleName());
+ }
+ catch (NamingException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
\ No newline at end of file
Deleted: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.support.deployer;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.weld.integration.deployer.jndi.AbstractJndiBinderDeployer;
-
-/**
- * Mock checkable jndi binder deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class CheckableJndiBinderDeployer extends AbstractJndiBinderDeployer<Object>
-{
- public static Context ROOT = new MockContext();
-
- public CheckableJndiBinderDeployer()
- {
- super(Object.class);
- }
-
- @Override
- protected Context createContext() throws NamingException
- {
- return ROOT;
- }
-
- public void bind(Object bootstrapBean, DeploymentUnit deploymentUnit) throws NamingException
- {
- Context context = getBeanManagerContext().createSubcontext(deploymentUnit.getSimpleName());
- context.bind("bootstrap", bootstrapBean);
- }
-
- public void unbind(Object bootstrapBean, DeploymentUnit deploymentUnit) throws NamingException
- {
- Context context = (Context)getBeanManagerContext().lookup(deploymentUnit.getSimpleName());
- context.unbind("bootstrap");
-
- getBeanManagerContext().destroySubcontext(deploymentUnit.getSimpleName());
- }
-}
\ No newline at end of file
Modified: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockBootDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockBootDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockBootDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -21,6 +21,9 @@
*/
package org.jboss.test.deployers.support.deployer;
+import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -32,6 +35,7 @@
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.AbstractBootstrapInfoDeployer;
import org.jboss.weld.integration.deployer.env.BootstrapInfo;
+import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
/**
* Mock wb boot deployer.
@@ -76,6 +80,12 @@
install.addParameterMetaData(String.class.getName(), "Start");
install.addParameterMetaData(String.class.getName(), "Start");
+ ParameterMetaDataBuilder jndiInstall = bootstrap.addInstallWithParameters("bind", "JndiBinder");
+ jndiInstall.addParameterMetaData(DeploymentUnit.class.getName(), unit);
+
+ ParameterMetaDataBuilder jndiUninstall = bootstrap.addUninstallWithParameters("unbind", "JndiBinder");
+ jndiUninstall.addParameterMetaData(DeploymentUnit.class.getName(), unit);
+
unit.addAttachment(bootstrapName + "_" + BeanMetaData.class.getSimpleName(), bootstrap.getBeanMetaData());
}
Copied: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinder.java (from rev 109130, trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java)
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinder.java (rev 0)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinder.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -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.test.deployers.support.deployer;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.weld.integration.deployer.jndi.JndiBinder;
+
+/**
+ * Mock jndi binder deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MockJndiBinder extends JndiBinder
+{
+ @Override
+ protected Context createContext() throws NamingException
+ {
+ return new MockContext();
+ }
+
+ @Override
+ public void bind(DeploymentUnit unit) throws DeploymentException
+ {
+ // do nothing
+ }
+
+ @Override
+ public void unbind(DeploymentUnit unit)
+ {
+ // do nothing
+ }
+}
\ No newline at end of file
Deleted: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers.support.deployer;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.jboss.weld.integration.deployer.jndi.JndiBinderDeployer;
-
-/**
- * Mock jndi binder deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class MockJndiBinderDeployer extends JndiBinderDeployer
-{
- @Override
- protected Context createContext() throws NamingException
- {
- return new MockContext();
- }
-}
\ No newline at end of file
Modified: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-11-05 19:41:22 UTC (rev 109183)
@@ -39,7 +39,7 @@
import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.test.deployers.support.deployer.CheckableJndiBinderDeployer;
+import org.jboss.test.deployers.support.deployer.CheckableJndiBinder;
import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -73,7 +73,7 @@
{
// should already be on the deployer
Context bmContext = assertInstanceOf(
- CheckableJndiBinderDeployer.ROOT.lookup(CheckableJndiBinderDeployer.BEAN_MANAGER_JNDI_SUBCONTEXT),
+ CheckableJndiBinder.ROOT.lookup(CheckableJndiBinder.BEAN_MANAGER_JNDI_SUBCONTEXT),
Context.class,
false
);
@@ -108,7 +108,7 @@
// test jndi binding
duSimpleName = earDU.getSimpleName();
Context context = assertInstanceOf(bmContext.lookup(duSimpleName), Context.class, false);
- assertSame(bootstrap, context.lookup("bootstrap"));
+ assertSame("Bootstrap Dummy", context.lookup("bootstrap"));
Class<?> wbClass = earDU.getClassLoader().loadClass("org.jboss.test.deployers.support.CheckableBootstrap");
wbContext = controller.getContextByClass(wbClass);
@@ -163,4 +163,4 @@
{
testBootstrap(createWarInEar());
}
-}
\ No newline at end of file
+}
Modified: trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BasicEarJBossDeploymentTestCase.xml
===================================================================
--- trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BasicEarJBossDeploymentTestCase.xml 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BasicEarJBossDeploymentTestCase.xml 2010-11-05 19:41:22 UTC (rev 109183)
@@ -32,4 +32,7 @@
<bean name="RealTransactionManager" class="java.lang.Object"/>
+ <bean name="JndiBinder" class="org.jboss.test.deployers.support.deployer.MockJndiBinder"/>
+
+
</deployment>
Modified: trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml
===================================================================
--- trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml 2010-11-05 19:41:22 UTC (rev 109183)
@@ -26,7 +26,7 @@
<bean name="BootDeployer" class="org.jboss.test.deployers.support.deployer.MockBootDeployer"/>
- <bean name="JndiBinderDeployer" class="org.jboss.test.deployers.support.deployer.CheckableJndiBinderDeployer"/>
+ <bean name="JndiBinder" class="org.jboss.test.deployers.support.deployer.CheckableJndiBinder"/>
<!-- Mock EJB utils -->
Modified: trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/FlatDeploymentTestCase.xml
===================================================================
--- trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/FlatDeploymentTestCase.xml 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/FlatDeploymentTestCase.xml 2010-11-05 19:41:22 UTC (rev 109183)
@@ -29,4 +29,6 @@
<bean name="RealTransactionManager" class="java.lang.Object"/>
+ <bean name="JndiBinder" class="org.jboss.test.deployers.support.deployer.MockJndiBinder"/>
+
</deployment>
Modified: trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentSmokeTestCase.xml
===================================================================
--- trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentSmokeTestCase.xml 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/JBossDeploymentSmokeTestCase.xml 2010-11-05 19:41:22 UTC (rev 109183)
@@ -41,7 +41,7 @@
<bean name="WeldBootstrapDeployer" class="org.jboss.weld.integration.deployer.env.WeldBootstrapDeployer"/>
<!-- Binds bootstrap to jndi -->
- <bean name="JndiBinderDeployer" class="org.jboss.test.deployers.support.deployer.MockJndiBinderDeployer"/>
+ <bean name="JndiBinderDeployer" class="org.jboss.test.deployers.support.deployer.MockJndiBinder"/>
<!-- Missing real URL integration tests-->
Modified: trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml
===================================================================
--- trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml 2010-11-05 19:24:13 UTC (rev 109182)
+++ trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/SmokeTestCase.xml 2010-11-05 19:41:22 UTC (rev 109183)
@@ -38,7 +38,7 @@
<bean name="WeldBootstrapDeployer" class="org.jboss.weld.integration.deployer.env.WeldBootstrapDeployer"/>
<!-- Binds bootstrap to jndi -->
- <bean name="JndiBinderDeployer" class="org.jboss.test.deployers.support.deployer.MockJndiBinderDeployer"/>
+ <bean name="JndiBinderDeployer" class="org.jboss.test.deployers.support.deployer.MockJndiBinder"/>
<!-- Missing real URL integration tests-->
More information about the jboss-cvs-commits
mailing list