[jboss-cvs] jboss-seam/src/main/org/jboss/seam/remoting ...

[Gavin King]

  User: gavin   
  Date: 06/10/31 20:52:09

  Modified:    src/main/org/jboss/seam/remoting   Call.java
                        InterfaceGenerator.java
  Log:
  insulate core from EJB dependencies JBSEAM-414
  
  Revision  Changes    Path
  1.12      +2 -2      jboss-seam/src/main/org/jboss/seam/remoting/Call.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Call.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/Call.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- Call.java	4 Aug 2006 00:14:49 -0000	1.11
  +++ Call.java	1 Nov 2006 01:52:09 -0000	1.12
  @@ -7,13 +7,13 @@
   import java.util.HashMap;
   import java.util.List;
   import java.util.Map;
  -import javax.ejb.Local;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.annotations.WebRemote;
   import org.jboss.seam.remoting.wrapper.ConversionException;
   import org.jboss.seam.remoting.wrapper.ConversionScore;
   import org.jboss.seam.remoting.wrapper.Wrapper;
  +import org.jboss.seam.util.EJB;
   
   /**
    *
  @@ -122,7 +122,7 @@
         // going to assume we're invoking against.
         for (Class c : component.getBusinessInterfaces())
         {
  -        if (c.isAnnotationPresent(Local.class))
  +        if (c.isAnnotationPresent(EJB.LOCAL))
           {
             type = component.getBusinessInterfaces().iterator().next();
             break;
  
  
  
  1.25      +2 -2      jboss-seam/src/main/org/jboss/seam/remoting/InterfaceGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterfaceGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/InterfaceGenerator.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- InterfaceGenerator.java	25 Oct 2006 15:14:36 -0000	1.24
  +++ InterfaceGenerator.java	1 Nov 2006 01:52:09 -0000	1.25
  @@ -16,7 +16,6 @@
   import java.util.HashSet;
   import java.util.Map;
   import java.util.Set;
  -import javax.ejb.Local;
   import javax.faces.event.PhaseId;
   import javax.servlet.ServletContext;
   import javax.servlet.ServletException;
  @@ -32,6 +31,7 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.WebRemote;
   import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.util.EJB;
   import org.jboss.seam.util.Reflections;
   
   /**
  @@ -273,7 +273,7 @@
       {
         for (Class c : component.getBusinessInterfaces())
         {
  -        if (c.isAnnotationPresent(Local.class))
  +        if (c.isAnnotationPresent(EJB.LOCAL))
           {
             type = component.getBusinessInterfaces().iterator().next();
             break;