[jboss-cvs] jboss-ejb3/src/main/org/jboss/ejb3/metamodel ...

[Bill Burke]

  User: bill    
  Date: 06/07/25 22:07:56

  Modified:    src/main/org/jboss/ejb3/metamodel     
                        EjbJarDDObjectFactory.java EnterpriseBean.java
                        Injectable.java Interceptor.java
  Removed:     src/main/org/jboss/ejb3/metamodel     
                        PersistenceContextRef.java
  Log:
  refactor metamodel for sharing with Tomcat
  
  Revision  Changes    Path
  1.5       +64 -63    jboss-ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EjbJarDDObjectFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/EjbJarDDObjectFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- EjbJarDDObjectFactory.java	20 Jun 2006 19:21:29 -0000	1.4
  +++ EjbJarDDObjectFactory.java	26 Jul 2006 02:07:56 -0000	1.5
  @@ -46,13 +46,14 @@
   import org.jboss.metamodel.descriptor.RunAs;
   import org.jboss.metamodel.descriptor.WebServiceRef;
   import org.jboss.metamodel.descriptor.SecurityRole;
  +import org.jboss.metamodel.descriptor.PersistenceContextRef;
   
   /**
    * org.jboss.xb.binding.ObjectModelFactory implementation that accepts data
    * chuncks from unmarshaller and assembles them into an EjbJarDD instance.
    *
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  - * @version <tt>$Revision: 1.4 $</tt>
  + * @version <tt>$Revision: 1.5 $</tt>
    */
   public class EjbJarDDObjectFactory extends DDObjectFactory
   {
  
  
  
  1.3       +22 -46    jboss-ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EnterpriseBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EnterpriseBean.java	20 Jun 2006 19:21:29 -0000	1.2
  +++ EnterpriseBean.java	26 Jul 2006 02:07:56 -0000	1.3
  @@ -22,7 +22,6 @@
   package org.jboss.ejb3.metamodel;
   
   import java.util.ArrayList;
  -import java.util.HashMap;
   import java.util.List;
   import java.util.Collection;
   import java.util.HashSet;
  @@ -35,17 +34,17 @@
   import org.jboss.metamodel.descriptor.PersistenceUnitRef;
   import org.jboss.metamodel.descriptor.ResourceEnvRef;
   import org.jboss.metamodel.descriptor.ResourceRef;
  +import org.jboss.metamodel.descriptor.PersistenceContextRef;
   
   /**
    * Represents an EJB element of the ejb-jar.xml deployment descriptor for the
    * 1.4 schema
    *
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  - * @version <tt>$Revision: 1.2 $</tt>
  + * @version <tt>$Revision: 1.3 $</tt>
    */
   public abstract class EnterpriseBean 
      extends EnvironmentRefGroup
  -   implements Injectable 
   {
      private static final Logger log = Logger.getLogger(EnterpriseBean.class);
      
  @@ -347,27 +346,4 @@
         return sb.toString();
      }
   
  -   private List<PersistenceContextRef> persistenceContextRefs = new ArrayList<PersistenceContextRef>();
  -   private List<PersistenceUnitRef> persistenceUnitRefs = new ArrayList<PersistenceUnitRef>();
  -
  -   public List<PersistenceContextRef> getPersistenceContextRefs()
  -   {
  -      return persistenceContextRefs;
  -   }
  -
  -   public List<PersistenceUnitRef> getPersistenceUnitRefs()
  -   {
  -      return persistenceUnitRefs;
  -   }
  -
  -   public void addPersistenceContextRef(PersistenceContextRef ref)
  -   {
  -      persistenceContextRefs.add(ref);
  -   }
  -
  -   public void addPersistenceUnitRef(PersistenceUnitRef ref)
  -   {
  -      persistenceUnitRefs.add(ref);
  -   }
  -   
   }
  
  
  
  1.3       +5 -4      jboss-ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Injectable.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/Injectable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Injectable.java	20 Jun 2006 19:21:29 -0000	1.2
  +++ Injectable.java	26 Jul 2006 02:07:56 -0000	1.3
  @@ -32,11 +32,12 @@
   import org.jboss.metamodel.descriptor.ResourceEnvRef;
   import org.jboss.metamodel.descriptor.ResourceRef;
   import org.jboss.metamodel.descriptor.WebServiceRef;
  +import org.jboss.metamodel.descriptor.PersistenceContextRef;
   
   /**
    * 
    * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public interface Injectable
   {
  
  
  
  1.3       +2 -2      jboss-ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Interceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/Interceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Interceptor.java	20 Jun 2006 19:21:29 -0000	1.2
  +++ Interceptor.java	26 Jul 2006 02:07:56 -0000	1.3
  @@ -26,15 +26,15 @@
   
   import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
   import org.jboss.metamodel.descriptor.PersistenceUnitRef;
  +import org.jboss.metamodel.descriptor.PersistenceContextRef;
   
   /**
    * 
    * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class Interceptor
      extends EnvironmentRefGroup
  -   implements Injectable
   {
      String interceptorClass;
      Method aroundInvoke;