[jboss-cvs] JBossAS SVN: r102901 - in trunk/ejb3/src/main/java/org/jboss: as/ejb3/naming and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 24 12:17:57 EDT 2010
Author: wolfc
Date: 2010-03-24 12:17:56 -0400 (Wed, 24 Mar 2010)
New Revision: 102901
Added:
trunk/ejb3/src/main/java/org/jboss/as/ejb3/naming/
trunk/ejb3/src/main/java/org/jboss/as/ejb3/naming/NamingComponentEjbEncFactory.java
Modified:
trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java
Log:
JBAS-7556: inject NamingComponentEjbEncFactory into an EJBContainer
Added: trunk/ejb3/src/main/java/org/jboss/as/ejb3/naming/NamingComponentEjbEncFactory.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/as/ejb3/naming/NamingComponentEjbEncFactory.java (rev 0)
+++ trunk/ejb3/src/main/java/org/jboss/as/ejb3/naming/NamingComponentEjbEncFactory.java 2010-03-24 16:17:56 UTC (rev 102901)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2010, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.as.ejb3.naming;
+
+import org.jboss.ejb3.EJBContainer;
+import org.jboss.ejb3.EjbEncFactory;
+import org.jboss.logging.Logger;
+import org.jboss.reloaded.naming.CurrentComponent;
+import org.jboss.reloaded.naming.spi.JavaEEComponent;
+
+import javax.naming.Context;
+
+/**
+ * As opposed to the DefaultEjbEncFactory, the NamingComponentEjbEncFactory has a one-one association
+ * with the container.
+ *
+ * @author <a href="cdewolf at redhat.com">Carlo de Wolf</a>
+ */
+public class NamingComponentEjbEncFactory implements EjbEncFactory
+{
+ private static final Logger log = Logger.getLogger(NamingComponentEjbEncFactory.class);
+
+ private JavaEEComponent component;
+
+ public NamingComponentEjbEncFactory(JavaEEComponent component)
+ {
+ this.component = component;
+ }
+
+ public Context getEnc(final EJBContainer container)
+ {
+ return component.getContext();
+ }
+
+ public void pushEnc(EJBContainer container)
+ {
+ CurrentComponent.push(component);
+ }
+
+ public void popEnc(EJBContainer container)
+ {
+ JavaEEComponent previous = CurrentComponent.pop();
+ assert previous == component;
+ }
+
+ public void cleanupEnc(EJBContainer container)
+ {
+ // do nothing, naming-deployers will take care of it
+ }
+}
Property changes on: trunk/ejb3/src/main/java/org/jboss/as/ejb3/naming/NamingComponentEjbEncFactory.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java 2010-03-24 16:17:50 UTC (rev 102900)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java 2010-03-24 16:17:56 UTC (rev 102901)
@@ -21,34 +21,41 @@
*/
package org.jboss.ejb3.deployers;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
+import org.jboss.as.ejb3.naming.NamingComponentEjbEncFactory;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
+import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.ejb3.DependencyPolicy;
import org.jboss.ejb3.DeploymentUnit;
+import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.KernelAbstraction;
import org.jboss.ejb3.MCDependencyPolicy;
+import org.jboss.ejb3.javaee.JavaEEApplication;
+import org.jboss.ejb3.javaee.JavaEEModule;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.logging.Logger;
+import org.jboss.reloaded.naming.spi.JavaEEComponent;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* The JBossAS implementation of the ejb3 KernelAbstraction integration api
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
@@ -130,6 +137,29 @@
log.info("\t" + smd.getSupply());
}
+ if(service instanceof EJBContainer)
+ {
+ EJBContainer container = EJBContainer.class.cast(service);
+ // TODO: use a resolver
+ JavaEEModule module = container.getModule();
+ JavaEEApplication app = module.getApplication();
+ String encFactoryBeanName = "jboss.ejb3:" + (app != null ? "application=" + stripSuffix(app.getName()) + "," : "") + "module=" + stripSuffix(module.getName()) + ",component=" + container.getEjbName() + ",service=EjbEncFactory";
+ // create an EjbEncFactory for this container
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(encFactoryBeanName, NamingComponentEjbEncFactory.class.getName());
+ String componentBeanName = "jboss.naming:" + (app != null ? "application=" + stripSuffix(app.getName()) + "," : "") + "module=" + stripSuffix(module.getName()) + ",component=" + container.getEjbName();
+ builder.addConstructorParameter(JavaEEComponent.class.getName(), new AbstractInjectionValueMetaData(componentBeanName));
+ // TODO: is deployment always available at this stage?
+ deployment.getBeanFactories().add(builder.getBeanMetaDataFactory());
+ }
+ // modify the container bean meta data to inject the EjbEncFactory
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(bean);
+ //builder.addPropertyMetaData("namingComponent", new AbstractInjectionValueMetaData("java:comp"));
+ builder.addPropertyMetaData("ejbEncFactory", new AbstractInjectionValueMetaData(encFactoryBeanName));
+ }
+ }
+
if(unit != null)
{
// Just add the mc bean metadata to the unit
@@ -174,6 +204,13 @@
}
}
+ private static String stripSuffix(String s)
+ {
+ if(s == null || s.length() < 4)
+ return s;
+ return s.substring(0, s.length() - 4);
+ }
+
public void uninstall(String name)
{
More information about the jboss-cvs-commits
mailing list