User: oberg   
  Date: 00/10/25 01:32:36

  Modified:    src/main/org/jboss/ejb Container.java EntityContainer.java
                        StatefulSessionContainer.java
                        StatelessSessionContainer.java
  Log:
  Moved home and remote classes to subclasses of Container (preparation for EJB 2.0 
MessageDriven beans)
  Changed comp/env setup to use new JNP. "java:comp" is now component local instead of 
"java:/"!
  
  Revision  Changes    Path
  1.30      +3 -16     jboss/src/main/org/jboss/ejb/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/Container.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Container.java    2000/10/15 20:52:26     1.29
  +++ Container.java    2000/10/25 08:32:35     1.30
  @@ -67,7 +67,7 @@
    *   @see ContainerFactory
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  - *   @version $Revision: 1.29 $
  + *   @version $Revision: 1.30 $
    */
   public abstract class Container
   {
  @@ -86,12 +86,6 @@
        // the metadata for the application can be accessed trough 
metaData.getApplicationMetaData()
      protected BeanMetaData metaData;
   
  -    // This is the Home interface class
  -   protected Class homeInterface;
  -
  -   // This is the Remote interface class
  -   protected Class remoteInterface;
  -
      // This is the EnterpriseBean class
      protected Class beanClass;
   
  @@ -342,16 +336,9 @@
      {
           try
           {
  -            // Create a new java: namespace root
  -          NamingServer root = new NamingServer();
  -
  -            // Associate this root with the classloader of the bean
  -          ((BeanClassLoader)getClassLoader()).setJNDIRoot(root);
  -
             // Since the BCL is already associated with this thread we can start 
using the java: namespace directly
  -          Context ctx = (Context) new InitialContext().lookup("java:/");
  -          ctx.createSubcontext("comp");
  -          ctx = ctx.createSubcontext("comp/env");
  +          Context ctx = (Context) new InitialContext().lookup("java:comp");
  +          ctx = ctx.createSubcontext("env");
   
             // Bind environment properties
             {
  
  
  
  1.30      +7 -1      jboss/src/main/org/jboss/ejb/EntityContainer.java
  
  Index: EntityContainer.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EntityContainer.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- EntityContainer.java      2000/10/09 20:15:34     1.29
  +++ EntityContainer.java      2000/10/25 08:32:35     1.30
  @@ -36,7 +36,7 @@
   *   @author Rickard �berg ([EMAIL PROTECTED])
   *   @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
   *   @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  -*   @version $Revision: 1.29 $
  +*   @version $Revision: 1.30 $
   */
   public class EntityContainer
   extends Container
  @@ -46,6 +46,12 @@
       
       // Attributes ----------------------------------------------------
       
  +    // This is the Home interface class
  +    protected Class homeInterface;
  +
  +    // This is the Remote interface class
  +    protected Class remoteInterface;
  +
       // These are the mappings between the home interface methods and the container 
methods
       protected Map homeMapping;
       
  
  
  
  1.20      +7 -1      jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java
  
  Index: StatefulSessionContainer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatefulSessionContainer.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- StatefulSessionContainer.java     2000/10/09 20:15:35     1.19
  +++ StatefulSessionContainer.java     2000/10/25 08:32:35     1.20
  @@ -32,7 +32,7 @@
    *      
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
  - *   @version $Revision: 1.19 $
  + *   @version $Revision: 1.20 $
    */
   public class StatefulSessionContainer
      extends Container
  @@ -41,6 +41,12 @@
      // Constants -----------------------------------------------------
       
      // Attributes ----------------------------------------------------
  +   // This is the Home interface class
  +   protected Class homeInterface;
  +
  +   // This is the Remote interface class
  +   protected Class remoteInterface;
  +
      // These are the mappings between the home interface methods and the container 
methods
      protected Map homeMapping;
      
  
  
  
  1.14      +7 -1      jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java
  
  Index: StatelessSessionContainer.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/StatelessSessionContainer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StatelessSessionContainer.java    2000/09/29 21:25:16     1.13
  +++ StatelessSessionContainer.java    2000/10/25 08:32:35     1.14
  @@ -29,7 +29,7 @@
   *   @see <related>
   *   @author Rickard �berg ([EMAIL PROTECTED])
   *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  -*   @version $Revision: 1.13 $
  +*   @version $Revision: 1.14 $
   */
   public class StatelessSessionContainer
       extends Container
  @@ -38,6 +38,12 @@
       // Constants -----------------------------------------------------
       
       // Attributes ----------------------------------------------------
  +    // This is the Home interface class
  +    protected Class homeInterface;
  + 
  +    // This is the Remote interface class
  +    protected Class remoteInterface;
  +    
       // These are the mappings between the home interface methods and the container 
methods
       protected Map homeMapping;
       
  
  
  

Reply via email to