[jboss-cvs] JBossAS SVN: r86019 - in projects/webbeans-ri-int/trunk: microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 17 21:37:52 EDT 2009
Author: petemuir
Date: 2009-03-17 21:37:52 -0400 (Tue, 17 Mar 2009)
New Revision: 86019
Modified:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
Log:
More fixes to SPI and oterh cleanups
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-03-18 00:15:50 UTC (rev 86018)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-03-18 01:37:52 UTC (rev 86019)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.integration.ejb;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -9,6 +8,9 @@
import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.inject.manager.InjectionPoint;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.persistence.PersistenceContext;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -31,6 +33,7 @@
import org.jboss.webbeans.integration.ejb.util.Reflections;
import org.jboss.webbeans.integration.vdf.DeploymentUnitAware;
import org.jboss.webbeans.resources.spi.NamingContext;
+import org.jboss.webbeans.resources.spi.helpers.AbstractNamingContext;
/**
* An implementation of EjbServices for JBoss EJB3
@@ -47,6 +50,25 @@
protected PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
protected JBossEjb jbossEjb;
private List<EjbDescriptor<?>> ejbs = new ArrayList<EjbDescriptor<?>>();
+
+ // TODO replace this with a JBoss equivalent :-)
+ private final NamingContext naming;
+
+ public JBossEjbServices() throws NamingException
+ {
+ final Context context = new InitialContext();
+ this.naming = new AbstractNamingContext()
+ {
+
+
+ @Override
+ public Context getContext()
+ {
+ return context;
+ }
+
+ };
+ }
public void setDeploymentUnit(DeploymentUnit du)
{
@@ -97,7 +119,7 @@
return null;
}
- public Object resolveEjb(InjectionPoint injectionPoint, NamingContext naming)
+ public Object resolveEjb(InjectionPoint injectionPoint)
{
if (!injectionPoint.isAnnotationPresent(EJB.class))
{
@@ -127,7 +149,7 @@
}
}
- String jndiName = resolver.resolveEjb(topLevelDeploymentUnit, new EjbReference(beanName, beanInterface, mappedName));
+ String jndiName = resolver.resolveEjb(topLevelDeploymentUnit, new EjbReference(beanName, beanInterface, null));
if (jndiName == null)
{
throw new IllegalStateException("No EJBs available which can be injected into " + injectionPoint);
@@ -135,7 +157,7 @@
return naming.lookup(jndiName, Object.class);
}
- public SessionObjectReference resolveEJB(EjbDescriptor<?> ejbDescriptor, final NamingContext naming)
+ public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor)
{
return new JBossSessionObjectReference(ejbDescriptor)
{
@@ -151,7 +173,7 @@
};
}
- public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext naming)
+ public Object resolvePersistenceContext(InjectionPoint injectionPoint)
{
if (!injectionPoint.isAnnotationPresent(PersistenceContext.class))
{
@@ -172,7 +194,7 @@
return new InjectedEntityManagerFactory(managedFactory).createEntityManager();
}
- public Object resolveResource(InjectionPoint injectionPoint, NamingContext naming)
+ public Object resolveResource(InjectionPoint injectionPoint)
{
if (!injectionPoint.isAnnotationPresent(Resource.class))
{
@@ -186,23 +208,6 @@
return naming.lookup(name, Object.class);
}
-
-
- public Class<? extends Annotation> getEJBAnnotation()
- {
- return EJB.class;
- }
-
- public Class<? extends Annotation> getPersistenceContextAnnotation()
- {
- return PersistenceContext.class;
- }
-
- public Class<? extends Annotation> getResourceAnnotation()
- {
- return Resource.class;
- }
-
private static String getResourceName(InjectionPoint injectionPoint)
{
Resource resource = injectionPoint.getAnnotation(Resource.class);
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java 2009-03-18 00:15:50 UTC (rev 86018)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java 2009-03-18 01:37:52 UTC (rev 86019)
@@ -34,7 +34,7 @@
}
}
- public <S> S getReference(Class<S> businessInterfaceType)
+ public <S> S getBusinessObject(Class<S> businessInterfaceType)
{
return (S) reference;
}
Modified: projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java 2009-03-18 00:15:50 UTC (rev 86018)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java 2009-03-18 01:37:52 UTC (rev 86019)
@@ -21,7 +21,6 @@
*/
package org.jboss.test.webbeans.deployers.support;
-import java.lang.annotation.Annotation;
import java.util.Collections;
import javax.inject.manager.InjectionPoint;
@@ -30,7 +29,6 @@
import org.jboss.webbeans.ejb.api.SessionObjectReference;
import org.jboss.webbeans.ejb.spi.EjbDescriptor;
import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.resources.spi.NamingContext;
/**
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
@@ -41,41 +39,26 @@
{
}
- public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext)
+ public Object resolveEjb(InjectionPoint injectionPoint)
{
return null;
}
- public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext)
+ public Object resolvePersistenceContext(InjectionPoint injectionPoint)
{
return null;
}
- public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext)
+ public Object resolveResource(InjectionPoint injectionPoint)
{
return null;
}
-
- public Class<? extends Annotation> getEJBAnnotation()
- {
- return null;
- }
-
- public Class<? extends Annotation> getPersistenceContextAnnotation()
- {
- return null;
- }
-
- public Class<? extends Annotation> getResourceAnnotation()
- {
- return null;
- }
public void removeEjb(Object instance)
{
}
- public SessionObjectReference resolveEJB(EjbDescriptor<?> descriptor, NamingContext namingContext)
+ public SessionObjectReference resolveEjb(EjbDescriptor<?> descriptor)
{
return null;
}
More information about the jboss-cvs-commits
mailing list