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

[Bill DeCoste]

  User: bdecoste
  Date: 06/07/24 17:28:29

  Modified:    src/main/org/jboss/ejb3/metamodel    
                        JBossDDObjectFactory.java EnterpriseBeans.java
                        MessageDrivenBean.java
  Removed:     src/main/org/jboss/ejb3/metamodel    
                        MessageDrivenConfig.java
  Log:
  MDB cleanup, standalone test for standard testcases, fixed class level @Resources jndi env bindings
  
  Revision  Changes    Path
  1.6       +1 -31     jboss-ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossDDObjectFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/JBossDDObjectFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- JBossDDObjectFactory.java	23 Jun 2006 21:32:14 -0000	1.5
  +++ JBossDDObjectFactory.java	24 Jul 2006 21:28:29 -0000	1.6
  @@ -49,7 +49,7 @@
    * Represents the jboss.xml deployment descriptor for the 2.1 schema
    *
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  - * @version <tt>$Revision: 1.5 $</tt>
  + * @version <tt>$Revision: 1.6 $</tt>
    */
   public class JBossDDObjectFactory extends DDObjectFactory
   {
  @@ -334,24 +334,6 @@
         {
            child = new ActivationConfig();
         }
  -      else if (localName.equals("message-driven-config"))
  -      {
  -         child = new MessageDrivenConfig();
  -      }
  -      
  -      return child;
  -   }
  -   
  -   public Object newChild(MessageDrivenConfig parent,
  -         UnmarshallingContext navigator, String namespaceURI, String localName,
  -         Attributes attrs)
  -   {
  -      Object child = null;
  -      
  -      if (localName.equals("message-driven-config-property"))
  -      {
  -         child = new NameValuePair();
  -      }
         
         return child;
      }
  @@ -370,12 +352,6 @@
         return child;
      }
      
  -   public void addChild(EnterpriseBeans parent, MessageDrivenConfig config,
  -         UnmarshallingContext navigator, String namespaceURI, String localName)
  -   {
  -      parent.setMessageDrivenConfig(config);
  -   }
  -   
      public void addChild(EnterpriseBeans parent, ActivationConfig config,
                           UnmarshallingContext navigator, String namespaceURI, String localName)
      {
  @@ -388,12 +364,6 @@
         parent.addActivationConfigProperty(property);
      }
      
  -   public void addChild(MessageDrivenConfig parent, NameValuePair property,
  -         UnmarshallingContext navigator, String namespaceURI, String localName)
  -   {
  -      parent.addMessageDrivenConfigProperty(property);
  -   }
  -   
      public void addChild(Consumer parent, Producer producer,
                           UnmarshallingContext navigator, String namespaceURI, String localName)
      {
  
  
  
  1.4       +1 -6      jboss-ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EnterpriseBeans.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/EnterpriseBeans.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- EnterpriseBeans.java	20 Jun 2006 19:21:29 -0000	1.3
  +++ EnterpriseBeans.java	24 Jul 2006 21:28:29 -0000	1.4
  @@ -43,7 +43,7 @@
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
    *         ejbs.setCurrentEjbName(value); } else if
    *         (localName.equals("jndi-name")){ ejbs.setJndiName(value);
  - * @version <tt>$Revision: 1.3 $</tt>
  + * @version <tt>$Revision: 1.4 $</tt>
    */
   public class EnterpriseBeans
   {
  @@ -63,11 +63,6 @@
         ((MessageDrivenBean)currentEjb).setDefaultActivationConfig(config);
      }
      
  -   public void setMessageDrivenConfig(MessageDrivenConfig config)
  -   {
  -      ((MessageDrivenBean)currentEjb).setMessageDrivenConfig(config);
  -   }
  -   
      public void setCacheConfig(CacheConfig config)
      {
         ((SessionEnterpriseBean)currentEjb).setCacheConfig(config);
  
  
  
  1.4       +1 -12     jboss-ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MessageDrivenBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/main/org/jboss/ejb3/metamodel/MessageDrivenBean.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- MessageDrivenBean.java	20 Jun 2006 19:21:29 -0000	1.3
  +++ MessageDrivenBean.java	24 Jul 2006 21:28:29 -0000	1.4
  @@ -29,7 +29,7 @@
    * the 1.4 schema
    *
    * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  - * @version <tt>$Revision: 1.3 $</tt>
  + * @version <tt>$Revision: 1.4 $</tt>
    */
   public class MessageDrivenBean extends EnterpriseBean
   {
  @@ -50,7 +50,6 @@
   
      private MessageDrivenDestination messageDrivenDestination;
      
  -   private MessageDrivenConfig mdbConfig;
      private ActivationConfig activationConfig;
      private ActivationConfig defaultActivationConfig;
      
  @@ -66,16 +65,6 @@
      private Method preDestroy;
      private Method prePassivate;
      
  -   public MessageDrivenConfig getMessageDrivenConfig()
  -   {
  -      return mdbConfig;
  -   }
  -
  -   public void setMessageDrivenConfig(MessageDrivenConfig mdbConfig)
  -   {
  -      this.mdbConfig = mdbConfig;
  -   }
  -   
      public ActivationConfig getDefaultActivationConfig()
      {
         return defaultActivationConfig;