cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb DescriptorHandler.java

[conor]

conor       01/10/09 05:11:23

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        DescriptorHandler.java
  Log:
  Add support for message beans
  
  Submitted by: Josh Lannin <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.13      +38 -25    
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
  
  Index: DescriptorHandler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- DescriptorHandler.java    2001/08/18 14:59:39     1.12
  +++ DescriptorHandler.java    2001/10/09 12:11:23     1.13
  @@ -78,6 +78,7 @@
       static private final int STATE_IN_BEANS = 3;
       static private final int STATE_IN_SESSION = 4;
       static private final int STATE_IN_ENTITY = 5;
  +    static private final int STATE_IN_MESSAGE = 6;
       
       private Task owningTask;
       
  @@ -97,6 +98,7 @@
       private static final String ENTERPRISE_BEANS = "enterprise-beans";
       private static final String ENTITY_BEAN      = "entity";
       private static final String SESSION_BEAN     = "session";
  +    private static final String MESSAGE_BEAN     = "message-driven";
   
       /**
        * The state of the parsing
  @@ -277,7 +279,10 @@
           else if (parseState == STATE_IN_BEANS && name.equals(ENTITY_BEAN )) {
               parseState = STATE_IN_ENTITY;
           }
  +        else if (parseState == STATE_IN_BEANS && name.equals(MESSAGE_BEAN )) 
{
  +            parseState = STATE_IN_MESSAGE;
       }
  +    }
   
   
       /**
  @@ -297,11 +302,15 @@
               inEJBRef = false;
           }
           else if (parseState == STATE_IN_ENTITY && name.equals(ENTITY_BEAN )) 
{
  +        if (parseState == STATE_IN_ENTITY && name.equals(ENTITY_BEAN )) {
               parseState = STATE_IN_BEANS;
           }
           else if (parseState == STATE_IN_SESSION && 
name.equals(SESSION_BEAN)) {
               parseState = STATE_IN_BEANS;
           }
  +        else if (parseState == STATE_IN_MESSAGE && 
name.equals(MESSAGE_BEAN)) {
  +            parseState = STATE_IN_BEANS;
  +        }
           else if (parseState == STATE_IN_BEANS && 
name.equals(ENTERPRISE_BEANS)) {
               parseState = STATE_IN_EJBJAR;
           }
  @@ -333,8 +342,12 @@
       
       
       protected void processElement() {
  +<<<<<<< DescriptorHandler.java
  +        if (parseState != STATE_IN_ENTITY && parseState != STATE_IN_SESSION 
&& parseState != STATE_IN_MESSAGE) {
  +=======
           if (inEJBRef || 
               (parseState != STATE_IN_ENTITY && parseState != 
STATE_IN_SESSION)) {
  +>>>>>>> 1.12
               return;
           }