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

[conor]

conor       2003/02/16 05:43:56

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
                        ANT_15_BRANCH DescriptorHandler.java
  Log:
  Merge
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.3  +3 -2      
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
  
  Index: DescriptorHandler.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
  retrieving revision 1.23.2.2
  retrieving revision 1.23.2.3
  diff -u -w -u -r1.23.2.2 -r1.23.2.3
  --- DescriptorHandler.java    12 Feb 2003 14:35:09 -0000      1.23.2.2
  +++ DescriptorHandler.java    16 Feb 2003 13:43:56 -0000      1.23.2.3
  @@ -94,6 +94,7 @@
        * constructing the filenames of various parts of the ejb jar.
        */
       private static final String EJB_REF               = "ejb-ref";
  +    private static final String EJB_LOCAL_REF         = "ejb-local-ref";
       private static final String HOME_INTERFACE        = "home";
       private static final String REMOTE_INTERFACE      = "remote";
       private static final String LOCAL_HOME_INTERFACE  = "local-home";
  @@ -275,7 +276,7 @@
           throws SAXException {
           this.currentElement = name;
           currentText = "";
  -        if (name.equals(EJB_REF)) {
  +        if (name.equals(EJB_REF) || name.equals(EJB_LOCAL_REF)) {
               inEJBRef = true;
           } else if (parseState == STATE_LOOKING_EJBJAR && 
name.equals(EJB_JAR)) {
               parseState = STATE_IN_EJBJAR;
  @@ -304,7 +305,7 @@
           processElement();
           currentText = "";
           this.currentElement = "";
  -        if (name.equals(EJB_REF)) {
  +        if (name.equals(EJB_REF) || name.equals(EJB_LOCAL_REF)) {
               inEJBRef = false;
           } else if (parseState == STATE_IN_ENTITY && 
name.equals(ENTITY_BEAN)) {
               parseState = STATE_IN_BEANS;