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

[conor]

conor       2003/02/16 05:41:54

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        DescriptorHandler.java
  Log:
  recognize local interfaces in <ejbjar>
  
  PR:   15862
  Submitted by: Colin Sampaleanu
  
  Revision  Changes    Path
  1.27      +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.26
  retrieving revision 1.27
  diff -u -w -u -r1.26 -r1.27
  --- DescriptorHandler.java    12 Feb 2003 14:29:07 -0000      1.26
  +++ DescriptorHandler.java    16 Feb 2003 13:41:54 -0000      1.27
  @@ -92,6 +92,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";
  @@ -273,7 +274,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;
  @@ -302,7 +303,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;