[jboss-cvs] JBossAS SVN: r95926 - in projects/weld-int/trunk/deployer/src: main/java/org/jboss/weld/integration/deployer/jndi and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 2 12:23:55 EST 2009
Author: alesj
Date: 2009-11-02 12:23:53 -0500 (Mon, 02 Nov 2009)
New Revision: 95926
Added:
projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java
projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java
projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockContext.java
Modified:
projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java
projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java
projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
projects/weld-int/trunk/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml
Log:
Test jndi binder.
Modified: projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java 2009-11-02 17:22:32 UTC (rev 95925)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -59,9 +59,7 @@
ValueMetaData deploymentValue = info.getDeployment();
if (deploymentValue == null)
throw new DeploymentException("Missing deployment: " + unit);
-
-
String bootstrapName = DeployersUtils.getBootstrapBeanName(unit);
BeanMetaDataBuilder bootstrap = BeanMetaDataBuilder.createBuilder(bootstrapName, "org.jboss.weld.integration.deployer.env.helpers.BootstrapBean");
Copied: projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java (from rev 95920, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java)
===================================================================
--- projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java (rev 0)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/AbstractJndiBinderDeployer.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -0,0 +1,153 @@
+/*
+ * 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.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;
+
+ protected AbstractJndiBinderDeployer(Class<T> bootstrapClass)
+ {
+ if (bootstrapClass == null)
+ throw new IllegalArgumentException("Null bootstrap class");
+
+ setTopLevelOnly(true);
+ 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.getAttachment(bbAttachmentName, 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(String.class.getName(), unit.getSimpleName());
+
+ pmdb = builder.addUninstallWithParameters("unbind", thisName.toString(), ControllerState.INSTALLED, ControllerState.INSTALLED);
+ pmdb.addParameterMetaData(bootstrapClass.getName(), builder.createThis());
+ pmdb.addParameterMetaData(String.class.getName(), unit.getSimpleName());
+ }
+ }
+
+ @Inject(fromContext = FromContext.NAME)
+ public void setThisName(Object thisName)
+ {
+ this.thisName = thisName;
+ }
+
+ protected Context createContext() throws NamingException
+ {
+ return new InitialContext(jndiEnvironment);
+ }
+
+ 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, String deploymentUnitName) throws NamingException;
+
+ public abstract void unbind(T bootstrapBean, String deploymentUnitName) 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
Modified: projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java 2009-11-02 17:22:32 UTC (rev 95925)
+++ projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JndiBinderDeployer.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -24,28 +24,15 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
import javax.enterprise.inject.spi.BeanManager;
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.util.naming.NonSerializableFactory;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
import org.jboss.weld.manager.api.WeldManager;
@@ -57,84 +44,19 @@
* @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 AbstractDeployer
+public class JndiBinderDeployer extends AbstractJndiBinderDeployer<BootstrapBean>
{
- public static final String BEAN_MANAGER_JNDI_SUBCONTEXT = "BeanManagers";
-
- private Object thisName;
- private Hashtable<String, String> jndiEnvironment = new Hashtable<String, String>();
- private Context beanManagerContext;
-
public JndiBinderDeployer()
{
- setTopLevelOnly(true);
- addInput(BeanMetaData.class);
- setStage(DeploymentStages.PRE_REAL);
+ super(BootstrapBean.class);
}
- public void deploy(DeploymentUnit unit) throws DeploymentException
- {
- String bootstrapName = DeployersUtils.getBootstrapBeanName(unit);
- String bbAttachmentName = bootstrapName + "_" + BeanMetaData.class.getSimpleName();
-
- BeanMetaData bbBMD = unit.getAttachment(bbAttachmentName, BeanMetaData.class);
- if (bbBMD != null)
- {
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(bbBMD);
-
- ParameterMetaDataBuilder pmdb = builder.addInstallWithParameters("bind", thisName.toString(), ControllerState.INSTALLED, ControllerState.INSTALLED);
- pmdb.addParameterMetaData(BootstrapBean.class.getName(), builder.createThis());
- pmdb.addParameterMetaData(String.class.getName(), unit.getSimpleName());
-
- pmdb = builder.addUninstallWithParameters("unbind", thisName.toString(), ControllerState.INSTALLED, ControllerState.INSTALLED);
- pmdb.addParameterMetaData(BootstrapBean.class.getName(), builder.createThis());
- pmdb.addParameterMetaData(String.class.getName(), unit.getSimpleName());
- }
- }
-
- @Inject(fromContext = FromContext.NAME)
- public void setThisName(Object thisName)
- {
- this.thisName = thisName;
- }
-
- protected Context createContext() throws NamingException
- {
- return new InitialContext(jndiEnvironment);
- }
-
- public void create() throws Exception
- {
- if (jndiEnvironment != null)
- addNonSerializableFactory(jndiEnvironment); // is here OK?
-
- Context context = createContext();
- beanManagerContext = context.createSubcontext(BEAN_MANAGER_JNDI_SUBCONTEXT);
- }
-
- 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 void bind(BootstrapBean bootstrapBean, String deploymentUnitName) throws NamingException
{
Map<String, BeanManager> beanManagers = new DeploymentVisitor(bootstrapBean).visit().getBeanManagers();
- Context context = beanManagerContext.createSubcontext(deploymentUnitName);
+ Context context = getBeanManagerContext().createSubcontext(deploymentUnitName);
for (Map.Entry<String, BeanManager> entry : beanManagers.entrySet())
{
@@ -145,7 +67,7 @@
public void unbind(BootstrapBean bootstrapBean, String deploymentUnitName) throws NamingException
{
Map<String, BeanManager> beanManagers = new DeploymentVisitor(bootstrapBean).visit().getBeanManagers();
- Context context = (Context)beanManagerContext.lookup(deploymentUnitName); // or how do I get existing sub-context
+ Context context = (Context)getBeanManagerContext().lookup(deploymentUnitName); // or how do I get existing sub-context
for (Map.Entry<String, BeanManager> entry : beanManagers.entrySet())
{
@@ -153,7 +75,7 @@
NonSerializableFactory.unbind(entry.getKey());
}
- beanManagerContext.destroySubcontext(deploymentUnitName);
+ getBeanManagerContext().destroySubcontext(deploymentUnitName);
}
protected static class DeploymentVisitor
@@ -197,20 +119,4 @@
}
}
-
- 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
Copied: projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java (from rev 95924, projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java)
===================================================================
--- projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java (rev 0)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -0,0 +1,62 @@
+/*
+ * 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.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, String deploymentUnitName) throws NamingException
+ {
+ Context context = ROOT.createSubcontext(deploymentUnitName);
+ context.bind("bootstrap", bootstrapBean);
+ }
+
+ public void unbind(Object bootstrapBean, String deploymentUnitName) throws NamingException
+ {
+ Context context = (Context)ROOT.lookup(deploymentUnitName);
+ context.unbind("bootstrap");
+
+ ROOT.destroySubcontext(deploymentUnitName);
+ }
+}
\ No newline at end of file
Added: projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockContext.java
===================================================================
--- projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockContext.java (rev 0)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockContext.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -0,0 +1,227 @@
+/*
+ * 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 java.util.Hashtable;
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NamingException;
+import javax.naming.NamingEnumeration;
+import javax.naming.NameClassPair;
+import javax.naming.Binding;
+import javax.naming.NameParser;
+import javax.naming.CompositeName;
+
+/**
+ * Pure mock, no logic used when hacking this ;-)
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MockContext implements Context
+{
+ private Hashtable<Object, Object> env = new Hashtable<Object, Object>();
+ private Map<Object, Object> map = new HashMap<Object, Object>();
+
+ public Object lookup(Name name) throws NamingException
+ {
+ return map.get(name);
+ }
+
+ public Object lookup(String name) throws NamingException
+ {
+ return map.get(name);
+ }
+
+ public void bind(Name name, Object obj) throws NamingException
+ {
+ map.put(name, obj);
+ }
+
+ public void bind(String name, Object obj) throws NamingException
+ {
+ map.put(name, obj);
+ }
+
+ public void rebind(Name name, Object obj) throws NamingException
+ {
+ map.put(name, obj);
+ }
+
+ public void rebind(String name, Object obj) throws NamingException
+ {
+ map.put(name, obj);
+ }
+
+ public void unbind(Name name) throws NamingException
+ {
+ map.remove(name);
+ }
+
+ public void unbind(String name) throws NamingException
+ {
+ map.remove(name);
+ }
+
+ public void rename(Name oldName, Name newName) throws NamingException
+ {
+ Object previous = map.remove(oldName);
+ map.put(newName, previous);
+ }
+
+ public void rename(String oldName, String newName) throws NamingException
+ {
+ Object previous = map.remove(oldName);
+ map.put(newName, previous);
+ }
+
+ private <T> NamingEnumeration<T> empty()
+ {
+ return new NamingEnumeration<T>()
+ {
+ public T next() throws NamingException
+ {
+ return null;
+ }
+
+ public boolean hasMore() throws NamingException
+ {
+ return false;
+ }
+
+ public void close() throws NamingException
+ {
+ }
+
+ public boolean hasMoreElements()
+ {
+ return false;
+ }
+
+ public T nextElement()
+ {
+ return null;
+ }
+ };
+ }
+
+ public NamingEnumeration<NameClassPair> list(Name name) throws NamingException
+ {
+ return empty();
+ }
+
+ public NamingEnumeration<NameClassPair> list(String name) throws NamingException
+ {
+ return empty();
+ }
+
+ public NamingEnumeration<Binding> listBindings(Name name) throws NamingException
+ {
+ return empty();
+ }
+
+ public NamingEnumeration<Binding> listBindings(String name) throws NamingException
+ {
+ return empty();
+ }
+
+ public void destroySubcontext(Name name) throws NamingException
+ {
+ map.remove(name);
+ }
+
+ public void destroySubcontext(String name) throws NamingException
+ {
+ map.remove(name);
+ }
+
+ public Context createSubcontext(Name name) throws NamingException
+ {
+ Context context = new MockContext();
+ map.put(name, context);
+ return context;
+ }
+
+ public Context createSubcontext(String name) throws NamingException
+ {
+ Context context = new MockContext();
+ map.put(name, context);
+ return context;
+ }
+
+ public Object lookupLink(Name name) throws NamingException
+ {
+ return map.get(name);
+ }
+
+ public Object lookupLink(String name) throws NamingException
+ {
+ return map.get(name);
+ }
+
+ public NameParser getNameParser(Name name) throws NamingException
+ {
+ return NameParser.class.cast(map.get(name));
+ }
+
+ public NameParser getNameParser(String name) throws NamingException
+ {
+ return NameParser.class.cast(map.get(name));
+ }
+
+ public Name composeName(Name name, Name prefix) throws NamingException
+ {
+ return new CompositeName().addAll(prefix).addAll(name);
+ }
+
+ public String composeName(String name, String prefix) throws NamingException
+ {
+ return prefix + "/" + name;
+ }
+
+ public Object addToEnvironment(String propName, Object propVal) throws NamingException
+ {
+ return env.put(propName, propVal);
+ }
+
+ public Object removeFromEnvironment(String propName) throws NamingException
+ {
+ return env.remove(propName);
+ }
+
+ public Hashtable<?, ?> getEnvironment() throws NamingException
+ {
+ return env;
+ }
+
+ public void close() throws NamingException
+ {
+ map.clear();
+ }
+
+ public String getNameInNamespace() throws NamingException
+ {
+ return null;
+ }
+}
Modified: projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java 2009-11-02 17:22:32 UTC (rev 95925)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJndiBinderDeployer.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -21,18 +21,8 @@
*/
package org.jboss.test.deployers.support.deployer;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.naming.Binding;
import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
-import javax.naming.CompositeName;
import org.jboss.weld.integration.deployer.jndi.JndiBinderDeployer;
@@ -48,192 +38,4 @@
{
return new MockContext();
}
-
- // pure mock, no logic used when hacking this ;-)
- private class MockContext implements Context
- {
- private Hashtable<Object, Object> env = new Hashtable<Object, Object>();
- private Map<Object, Object> map = new HashMap<Object, Object>();
-
- public Object lookup(Name name) throws NamingException
- {
- return map.get(name);
- }
-
- public Object lookup(String name) throws NamingException
- {
- return map.get(name);
- }
-
- public void bind(Name name, Object obj) throws NamingException
- {
- map.put(name, obj);
- }
-
- public void bind(String name, Object obj) throws NamingException
- {
- map.put(name, obj);
- }
-
- public void rebind(Name name, Object obj) throws NamingException
- {
- map.put(name, obj);
- }
-
- public void rebind(String name, Object obj) throws NamingException
- {
- map.put(name, obj);
- }
-
- public void unbind(Name name) throws NamingException
- {
- map.remove(name);
- }
-
- public void unbind(String name) throws NamingException
- {
- map.remove(name);
- }
-
- public void rename(Name oldName, Name newName) throws NamingException
- {
- Object previous = map.remove(oldName);
- map.put(newName, previous);
- }
-
- public void rename(String oldName, String newName) throws NamingException
- {
- Object previous = map.remove(oldName);
- map.put(newName, previous);
- }
-
- private <T> NamingEnumeration<T> empty()
- {
- return new NamingEnumeration<T>()
- {
- public T next() throws NamingException
- {
- return null;
- }
-
- public boolean hasMore() throws NamingException
- {
- return false;
- }
-
- public void close() throws NamingException
- {
- }
-
- public boolean hasMoreElements()
- {
- return false;
- }
-
- public T nextElement()
- {
- return null;
- }
- };
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException
- {
- return empty();
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException
- {
- return empty();
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException
- {
- return empty();
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException
- {
- return empty();
- }
-
- public void destroySubcontext(Name name) throws NamingException
- {
- map.remove(name);
- }
-
- public void destroySubcontext(String name) throws NamingException
- {
- map.remove(name);
- }
-
- public Context createSubcontext(Name name) throws NamingException
- {
- Context context = new MockContext();
- map.put(name, context);
- return context;
- }
-
- public Context createSubcontext(String name) throws NamingException
- {
- Context context = new MockContext();
- map.put(name, context);
- return context;
- }
-
- public Object lookupLink(Name name) throws NamingException
- {
- return map.get(name);
- }
-
- public Object lookupLink(String name) throws NamingException
- {
- return map.get(name);
- }
-
- public NameParser getNameParser(Name name) throws NamingException
- {
- return NameParser.class.cast(map.get(name));
- }
-
- public NameParser getNameParser(String name) throws NamingException
- {
- return NameParser.class.cast(map.get(name));
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException
- {
- return new CompositeName().addAll(prefix).addAll(name);
- }
-
- public String composeName(String name, String prefix) throws NamingException
- {
- return prefix + "/" + name;
- }
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException
- {
- return env.put(propName, propVal);
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException
- {
- return env.remove(propName);
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException
- {
- return env;
- }
-
- public void close() throws NamingException
- {
- map.clear();
- }
-
- public String getNameInNamespace() throws NamingException
- {
- return null;
- }
- }
}
Modified: projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2009-11-02 17:22:32 UTC (rev 95925)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2009-11-02 17:23:53 UTC (rev 95926)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.deployers.test;
+import javax.naming.Context;
+
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
@@ -29,6 +31,7 @@
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.deployers.support.deployer.CheckableJndiBinderDeployer;
import org.jboss.virtual.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -52,6 +55,7 @@
protected void testBootstrap(VirtualFile ear) throws Exception
{
Object bootstrap;
+ String duSimpleName = null;
Deployment deployment = createVFSDeployment(ear);
DeployerClient mainDeployer = getDeployerClient();
mainDeployer.addDeployment(deployment);
@@ -75,6 +79,11 @@
assertTrue(invoke(bootstrap, "Create"));
assertTrue(invoke(bootstrap, "Boot"));
assertFalse(invoke(bootstrap, "Shutdown"));
+
+ // test jndi binding
+ duSimpleName = earDU.getSimpleName();
+ Context context = assertInstanceOf(CheckableJndiBinderDeployer.ROOT.lookup(duSimpleName), Context.class, false);
+ assertSame(bootstrap, context.lookup("bootstrap"));
}
finally
{
@@ -85,6 +94,9 @@
{
mainDeployer.removeDeployment(deployment);
mainDeployer.process();
+
+ // clear binding
+ assertNull(CheckableJndiBinderDeployer.ROOT.lookup(duSimpleName));
}
assertTrue(invoke(bootstrap, "Shutdown"));
}
Modified: projects/weld-int/trunk/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml
===================================================================
--- projects/weld-int/trunk/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml 2009-11-02 17:22:32 UTC (rev 95925)
+++ projects/weld-int/trunk/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml 2009-11-02 17:23:53 UTC (rev 95926)
@@ -25,6 +25,8 @@
<bean name="BootDeployer" class="org.jboss.test.deployers.support.deployer.MockBootDeployer"/>
+ <bean name="JndiBinderDeployer" class="org.jboss.test.deployers.support.deployer.CheckableJndiBinderDeployer"/>
+
<!-- Mock EJB utils -->
<beanfactory name="JBossEjbServices" class="org.jboss.test.deployers.support.MockEjbServices"/>
More information about the jboss-cvs-commits
mailing list