[jboss-cvs] JBossAS SVN: r86013 - 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 14:15:31 EDT 2009
Author: petemuir
Date: 2009-03-17 14:15:31 -0400 (Tue, 17 Mar 2009)
New Revision: 86013
Added:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java
Removed:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbReference.java
Modified:
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java
Log:
Update SPI
Deleted: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbReference.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbReference.java 2009-03-17 17:48:53 UTC (rev 86012)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbReference.java 2009-03-17 18:15:31 UTC (rev 86013)
@@ -1,53 +0,0 @@
-package org.jboss.webbeans.integration.ejb;
-import java.util.Iterator;
-
-import org.jboss.webbeans.ejb.api.EjbReference;
-import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor;
-import org.jboss.webbeans.ejb.spi.EjbDescriptor;
-import org.jboss.webbeans.resources.spi.NamingContext;
-
-
-public abstract class JBossEjbReference<T> implements EjbReference<T>
-{
-
- private static final long serialVersionUID = 8227728506645839338L;
-
- // Hold a reference to the instance so EJB doesn't clean it up under us
- private Object instance;
-
- private final String jndiName;
-
- public JBossEjbReference(EjbDescriptor<T> descriptor)
- {
- Iterator<BusinessInterfaceDescriptor<?>> it = descriptor.getLocalBusinessInterfaces().iterator();
- if (!it.hasNext())
- {
- throw new IllegalStateException("No local interfaces for " + descriptor);
- }
- String fullJndiName = it.next().getJndiName();
- this.jndiName = fullJndiName.substring(0, fullJndiName.lastIndexOf("-"));
- }
-
- public void create()
- {
- if (instance == null)
- {
- instance = getNamingContext().lookup(jndiName, Object.class);
- }
- }
-
- public <S> S get(Class<S> businessInterfaceType)
- {
- create();
- return (S) instance;
- }
-
- public void remove()
- {
- // TODO Auto-generated method stub
-
- }
-
- protected abstract NamingContext getNamingContext();
-
-}
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-17 17:48:53 UTC (rev 86012)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-03-17 18:15:31 UTC (rev 86013)
@@ -24,6 +24,7 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+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.integration.ejb.util.JBossEjb;
@@ -134,9 +135,9 @@
return naming.lookup(jndiName, Object.class);
}
- public <T> org.jboss.webbeans.ejb.api.EjbReference<T> resolveEJB(EjbDescriptor<T> ejbDescriptor, final NamingContext naming)
+ public SessionObjectReference resolveEJB(EjbDescriptor<?> ejbDescriptor, final NamingContext naming)
{
- return new JBossEjbReference<T>(ejbDescriptor)
+ return new JBossSessionObjectReference(ejbDescriptor)
{
private static final long serialVersionUID = -5063126026455936612L;
Copied: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java (from rev 85971, projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbReference.java)
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java (rev 0)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java 2009-03-17 18:15:31 UTC (rev 86013)
@@ -0,0 +1,50 @@
+package org.jboss.webbeans.integration.ejb;
+import java.util.Iterator;
+
+import org.jboss.webbeans.ejb.api.SessionObjectReference;
+import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor;
+import org.jboss.webbeans.ejb.spi.EjbDescriptor;
+import org.jboss.webbeans.resources.spi.NamingContext;
+
+
+public abstract class JBossSessionObjectReference implements SessionObjectReference
+{
+
+ private static final long serialVersionUID = 8227728506645839338L;
+
+ private final Object reference;
+
+ public JBossSessionObjectReference(EjbDescriptor<?> descriptor)
+ {
+ Iterator<BusinessInterfaceDescriptor<?>> it = descriptor.getLocalBusinessInterfaces().iterator();
+ if (!it.hasNext())
+ {
+ throw new IllegalStateException("No local interfaces for " + descriptor);
+ }
+ String fullJndiName = it.next().getJndiName();
+ String jndiName = fullJndiName.substring(0, fullJndiName.lastIndexOf("-"));
+ reference = getNamingContext().lookup(jndiName, Object.class);
+ }
+
+ public void create()
+ {
+ if (reference == null)
+ {
+
+ }
+ }
+
+ public <S> S getReference(Class<S> businessInterfaceType)
+ {
+ return (S) reference;
+ }
+
+ public void remove()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ protected abstract NamingContext getNamingContext();
+
+}
Property changes on: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossSessionObjectReference.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-17 17:48:53 UTC (rev 86012)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/test/java/org/jboss/test/webbeans/deployers/support/MockEjbServices.java 2009-03-17 18:15:31 UTC (rev 86013)
@@ -27,7 +27,7 @@
import javax.inject.manager.InjectionPoint;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.webbeans.ejb.api.EjbReference;
+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;
@@ -75,7 +75,7 @@
{
}
- public <T> EjbReference<T> resolveEJB(EjbDescriptor<T> descriptor, NamingContext namingContext)
+ public SessionObjectReference resolveEJB(EjbDescriptor<?> descriptor, NamingContext namingContext)
{
return null;
}
More information about the jboss-cvs-commits
mailing list