jakarta-watchdog-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rlu...@apache.org
Subject cvs commit: jakarta-watchdog-4.0/src/tools/org/apache/jspxml jsp2XML.java
Date Tue, 29 Jan 2002 00:30:00 GMT
rlubke      02/01/28 16:30:00

  Modified:    src/tools/org/apache/jspxml jsp2XML.java
  Log:
   - fixed bug where single quotes weren't preserved during translation.
   - added a new line after the parse of a taglib directive
   - adjusted parsing of page directive to handle multiple import attribute values
  
  Revision  Changes    Path
  1.9       +491 -490  jakarta-watchdog-4.0/src/tools/org/apache/jspxml/jsp2XML.java
  
  Index: jsp2XML.java
  ===================================================================
  RCS file: /home/cvs/jakarta-watchdog-4.0/src/tools/org/apache/jspxml/jsp2XML.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- jsp2XML.java	27 Apr 2001 18:03:17 -0000	1.8
  +++ jsp2XML.java	29 Jan 2002 00:30:00 -0000	1.9
  @@ -6,514 +6,515 @@
   
   
   
  -public class jsp2XML
  -{
  +public class jsp2XML {
   
  -public String xml_ns;  //for xml name spaces
  -public String input_jsp;  //String representation of input JSP file
  +    public String xml_ns;  //for xml name spaces
  +    public String input_jsp;  //String representation of input JSP file
   
  -protected static String new_line;
  -public static  String xml_prolog;
  -public static  String jsp_root_tag;
  -public static String author_comments;
  -public static String jsp_end_tag;
  -protected Hashtable tag_prefix ;
  -//Initialize above variables Here
  -
  - static {
  -new_line = System.getProperty("line.separator");
  -
  -//The final xml will be prolog + comments + root_tag +xmlns+ body + end_tag
  -//Note new_line is not required but we use it for formatting
  -
  -//xml_prolog = "<?xml version=\'1.0\' encoding=\'us-ascii\'?>" + new_line ;
  -xml_prolog="<!DOCTYPE root" + new_line;
  -xml_prolog+="PUBLIC \"-//Sun Microsystems Inc.//DTD JavaServer Pages Version 1.2//EN\""
+ new_line ;
  -xml_prolog+="\"http://java.sun.com/products/jsp/dtd/jspcore_1_2.dtd\" > " ;
  -
  -author_comments = new_line + "<!-- This File is generated automatically by jsp2XML converter
tool --> " + new_line ;
  -author_comments+= "<!-- Written By Ramesh Mandava/Santosh Singh -->" ;
  -
  -jsp_root_tag = new_line + "<jsp:root" + new_line ;
  -//note that we haven't yet closed the jsp:root since taglib directives will also be added
here
  -jsp_end_tag = new_line +"</jsp:root>" ;
  -
  -
  -
  -}//initialization complete
  -
  -public jsp2XML(String input_jsp_file)
  -{
  -input_jsp="";
  -xml_ns="xmlns:jsp=\"http://java.sun.com/JSP/Page\" version=\"1.2\"" ;
  -xml_ns +=new_line ;
  -tag_prefix = new Hashtable();
  -readJspFileintoString(input_jsp_file) ;
  -}
  -
  -public String parseDirective(String directive_str )
  -{
  -// \t is not same as a space
  -
  -StringTokenizer st= new StringTokenizer(directive_str," \t\n\r\f" );
  -String directive = st.nextToken();
  -String out_file="";
  -   if( ! (directive.equals("taglib")) )  //not a taglib directive
  -   {
  -    out_file+="<jsp:directive." + directive +" " ;
  -
  -    while(st.hasMoreTokens() )
  -    out_file+=st.nextToken() + " " ;
  -
  -   out_file+="/>" ;
  -   return out_file;
  -   }
  -
  -//If it is a taglib directive we need to change the xml NameSpace
  -//Construct a new String Tokenizer with =\t\n" as delimiters	
  -
  -st =new StringTokenizer(directive_str," =\t\n\r\"" , false );
  -directive = st.nextToken();
  -//Latest spec doesn't need jsp:directive.taglib - Ramesh
  -//out_file+="<jsp:directive." + directive +" ";
  -String uri="";
  -String prefix="";
  -   while(st.hasMoreTokens() )
  -  {
  -String next_token=st.nextToken();
  -
  -       if(next_token.equals("uri") )
  -       uri=st.nextToken();
  -
  -       if(next_token.equals("prefix") )
  -       prefix=st.nextToken();
  -
  -  }
  -//put the prefix in the hashtable if it doesn't exist
  -//this will be used to update the xml Namespace
  -
  - if(!tag_prefix.containsKey(prefix) )
  - {
  -  tag_prefix.put(prefix , prefix);
  -//add to the xml NameSpace
  -  xml_ns+="xmlns:" +prefix +"=\"" + uri + "\"" + new_line;
  - }
  -
  -//update xml output
  -//Latest spec doesn't need jsp:directive.taglib, commenting out that part - Ramesh
  -/*
  -out_file += "uri=\"" + uri + "\"" + " " ;
  -out_file+="prefix=\"" + prefix +"\"" + " ";
  -out_file+="/>" ; //end of taglib
  -*/
  -return out_file;
  -}
  -
  -
  -public String convert(String jsp )
  -{
  -int element_index=0;
  -int last_index=0;
  -int end_index=0;
  -int action_index=0;
  -int tag_level=0;
  -String xml="";
  -boolean jsp_element_first=false;
  -boolean cdata_closed = true; 
  - 
  -while(element_index>=0 || action_index>=0)
  -{
  -element_index=jsp.indexOf("<%" , last_index);
  -action_index=jsp.indexOf(":" , last_index); //might be an action
  -
  -if ( ((element_index < action_index)  && ( element_index != -1 ) ) || (action_index==-1)
)
  -  {
  -         jsp_element_first=true;
  -  }
  -  else
  -  {
  -         jsp_element_first=false;
  -  }
  -
  -
  -if ( ( cdata_closed ) && ( jsp_element_first == true ) )
  -{
  -//xml+=new_line+ "<jsp:cdata><![CDATA[ " + new_line ;
  -xml+=new_line+ "<jsp:text><![CDATA[" ;
  -cdata_closed=false;
  -}
  -
  - if(element_index!=-1 && jsp_element_first) //JSP element was found before action
  - {
  - xml+=jsp.substring(last_index , element_index);
  - //xml+=new_line + "]]></jsp:cdata>" + new_line ; //end of CDATA section
  -
  - char jsp_char = jsp.charAt(element_index+2);
  -
  -    if( jsp_char =='-' ) //jsp Comment
  -    {
  - xml+= "]]></jsp:text>" + new_line ; //end of CDATA section
  - cdata_closed=true;
  -   xml+= new_line +"<!--" ; //XML comment
  -   end_index=jsp.indexOf("--%>" , last_index );
  -   xml+=jsp.substring(element_index+4,end_index);
  -   xml+="-->" ;
  -   last_index=end_index+4;
  -   continue;
  -    }//end JSP Comment
  -
  -    if( jsp_char =='=' ) //Jsp Expression
  -    {
  - xml+= "]]></jsp:text>" + new_line ; //end of CDATA section
  - cdata_closed=true;
  -   xml+=new_line+"<jsp:expression>" ; 
  -   end_index=jsp.indexOf("%>" , last_index );
  -   xml+= new_line + "<![CDATA["  ;
  -   xml+=jsp.substring(element_index+3,end_index);
  -   xml+="]]>"+new_line ; //end of CDATA
  -   xml+= new_line +"</jsp:expression>"+new_line ;
  -   last_index=end_index+2;
  -   continue;
  -    }//end JSP Expression
  -
  -if( jsp_char =='!' ) //jsp Declaration
  -    {
  - xml+= "]]></jsp:text>" + new_line ; //end of CDATA section
  - cdata_closed=true;
  -   xml+=new_line+"<jsp:declaration>" ;
  -   end_index=jsp.indexOf("%>" , last_index );
  -   xml+=new_line+"<![CDATA["  ;
  -   xml+=jsp.substring(element_index+3,end_index);
  -   xml+="]]>" + new_line ; //end of CDATA
  -   xml+=new_line+"</jsp:declaration>"+new_line ;
  -   last_index=end_index+2;
  -   continue;
  -    }//end JSP Declaration
  -
  -if( jsp_char =='@' ) //jsp Directive
  -    {
  -     
  -   end_index=jsp.indexOf("%>" , last_index );
  - String directive = jsp.substring(element_index+3,end_index);
  -
  -  if (directive.indexOf ( "taglib" ) == -1 )
  -  {
  - xml+= "]]></jsp:text>" + new_line ; //end of CDATA section
  - cdata_closed=true;
  -   }
  -
  -   xml+=parseDirective(directive); //this adds to xml String itself
  -   last_index=end_index+2;
  -   continue;
  -    }//end JSP Directive
  -
  - xml+= "]]></jsp:text>" + new_line ; //end of CDATA section
  - cdata_closed=true;
  - //if we reach here it means we got a JSP Scriptlet
  -   xml+=new_line+"<jsp:scriptlet>" +new_line;
  -   end_index=jsp.indexOf("%>" , last_index );
  -   //xml+=new_line+"<![CDATA[" +new_line ;
  -   xml+=new_line+"<![CDATA[" ;
  -   xml+=jsp.substring(element_index+2,end_index);
  -   xml+="]]>" +new_line ; //end of CDATA
  -   xml+=new_line+"</jsp:scriptlet>" +new_line ;
  -   last_index=end_index+2;
  -   continue;
  - } //end if
  -
  -//This is the code to take care of jsp actions like jsp:forward and custom actions
  -//Here for simplicity a am assuming that these standard strings are 
  -//not used as part of template text. Note that all these elements
  -//start with "jsp:" 
  -
  -//Ramesh: ":" can't appear at the beginning of line
  -//if(action_index!=-1) // might be a custom or standard action
  -if(action_index > 0) // might be a custom or standard action
  -  {
  -//find the previous element
  -int save_index=action_index ;
  -char ch= jsp.charAt(action_index -1 );
  -/*
  -if  ( ch == ' ' ) // Ramesh: first letter left to":" should not be a whitespace
  -{
  -	continue;
  -} 
  -*/
  - while( ch!='<' )
  - {
  - action_index--;
  -
  -    //don't wanna go back to where we already are
  -   if ( (action_index < last_index) || ( ch=='>' ) ) // Ramesh: > can't appear
before :
  -   break;
  -   
  - ch=jsp.charAt(action_index);
  - }
  -
  - String action_name = jsp.substring(action_index+1,save_index);
  -
  -   if( (action_index<last_index) || action_name.endsWith(" ") )
  -    {
  -      //don't close the existing CDATA section
  -     // because it's a template text
  -      xml+=jsp.substring(last_index , save_index+1);
  -      last_index= save_index+1;
  -      continue;
  -    }
  +    protected static String new_line;
  +    public static String xml_prolog;
  +    public static String jsp_root_tag;
  +    public static String author_comments;
  +    public static String jsp_end_tag;
  +    protected Hashtable tag_prefix ;
  +    //Initialize above variables Here
  +
  +    static {
  +        new_line = System.getProperty("line.separator");
  +
  +        //The final xml will be prolog + comments + root_tag +xmlns+ body + end_tag
  +        //Note new_line is not required but we use it for formatting
  +
  +        //xml_prolog = "<?xml version=\'1.0\' encoding=\'us-ascii\'?>" + new_line
;
  +        xml_prolog = "<!DOCTYPE root" + new_line;
  +        xml_prolog += "PUBLIC \"-//Sun Microsystems Inc.//DTD JavaServer Pages Version
1.2//EN\"" + new_line ;
  +        xml_prolog += "\"http://java.sun.com/products/jsp/dtd/jspcore_1_2.dtd\" > "
;
  +
  +        author_comments = new_line + "<!-- This File is generated automatically by jsp2XML
converter tool --> " + new_line ;
  +        author_comments += "<!-- Written By Ramesh Mandava/Santosh Singh -->" ;
   
  -//Check for an end tag
  +        jsp_root_tag = new_line + "<jsp:root" + new_line ;
  +        //note that we haven't yet closed the jsp:root since taglib directives will also
be added here
  +        jsp_end_tag = new_line + "</jsp:root>" ;
   
  -   if(action_name.startsWith("/") )
  -   {
  -     //close the existiong CDATA section first, Ramesh
  -      //xml+=jsp.substring(last_index , action_index);
  -      tag_level--;
  -      //if ( ( tag_level == 0 ) && ( cdata_closed == false ) )
  -      /*
  -      if ( ( tag_level == 0 )  )
  -      {
  -      */
  -	xml+=new_line+ "<jsp:text><![CDATA[" ;
  -      if ( action_index > last_index )
  -      {
  -            xml+=jsp.substring(last_index , action_index); // Include even newline 
  -      }
  -	//xml+=new_line+"]]></jsp:cdata>" +new_line ; //end of CDATA
  -	xml+= "]]></jsp:text>" +new_line ; //end of CDATA
  -	cdata_closed= true;
  -      /*
  -      }
  -      */
  -      end_index=jsp.indexOf( ">" , action_index);
  -      // Ramesh: need to have < included 
  -      xml+=jsp.substring(action_index  , end_index+1);
  -      //xml+=jsp.substring(action_index , end_index+1);
  -      last_index=end_index+1;
  -      continue;
  -   }
  -
  -
  -//we found a Standard action or a custom action
  -//the attributes of these action might contain runtime expressions
  -
  -action_name = action_name.trim();
  -
  -   if(action_name.equals("jsp") || tag_prefix.containsKey(action_name) )
  -    {
  -
  -	 //xml+=jsp.substring(last_index , action_index);
  -	/*
  -         if (tag_level==0) 
  -          {  
  -	*/
  -	if  ( cdata_closed == false )  // If we had open cdata and one level of action
  -         {
  -	 // xml+=new_line + "]]></jsp:cdata>"+new_line ; //end of CDATA section
  -	 xml+= "]]></jsp:text>"+new_line ; //end of CDATA section
  -         cdata_closed=true;
  -         }
  -    else
  -    {
  -	xml+=new_line+ "<jsp:text><![CDATA[" ;
  -      if ( action_index > last_index )
  -      {
  -            xml+=jsp.substring(last_index , action_index); // including new_line
  -      }
  -	//xml+=new_line+"]]></jsp:cdata>" +new_line ; //end of CDATA
  -	xml+= "]]></jsp:text>" +new_line ; //end of CDATA
  -	cdata_closed= true;
  -     }
  -	/*
  -	}
  -	*/
  -	
  -
  -         tag_level++;
  -	//Ramesh. Need to set to true
  -         //cdata_closed=false;
  -         //cdata_closed=true;
  -
  -         end_index=jsp.indexOf(">" , action_index); 
  -         ch=jsp.charAt(end_index-1);
  -           while(ch=='%')
  -           {
  -            last_index=end_index+1;
  -            end_index=jsp.indexOf(">" , last_index); 
  -            ch=jsp.charAt(end_index-1);
  -           }
   
  -         xml+=parseAttributes( jsp.substring(action_index ,end_index+1) );
  - 	 last_index=end_index+1;
   
  -         if( jsp.charAt(end_index-1)=='/' ) //end of tag
  +    } //initialization complete
  +
  +    public jsp2XML(String input_jsp_file) {
  +        input_jsp = "";
  +        xml_ns = "xmlns:jsp=\"http://java.sun.com/JSP/Page\" version=\"1.2\"" ;
  +        xml_ns += new_line ;
  +        tag_prefix = new Hashtable();
  +        readJspFileintoString(input_jsp_file) ;
  +    }
  +
  +    public String parseDirective(String directive_str ) {
  +        // \t is not same as a space
  +
  +        StringTokenizer st = new StringTokenizer(directive_str, " \t\n\r\f" );
  +        String directive = st.nextToken();
  +        String out_file = "";
  +        if ( ! (directive.equals("taglib")) )  //not a taglib directive
           {
  -                tag_level--;
  -		//Ramesh: need to allow the others to close so commenting out
  -		/*
  -                if(tag_level==0)
  -         	cdata_closed=true;
  -		*/
  +            out_file += "<jsp:directive." + directive + " " ;
  +            String token = null;
  +            String importList = "";
  +            while (st.hasMoreTokens() ) {
  +                token = st.nextToken();
  +                if (token.indexOf( "import=" ) > -1) {
  +                    int idx = token.indexOf("=");
  +                    importList += token.substring((idx + 2), token.length() - 1 ) + ",";
  +                } else {
  +                    out_file += token + " ";
  +                }
  +            }
  +            if ( !importList.equals("") ) {
  +                out_file += "import=\"" + importList.substring(0,importList.lastIndexOf(","))
+ "\"";
  +            }
  +            out_file += "/>" ;
  +            return out_file;
  +        }
   
  +        //If it is a taglib directive we need to change the xml NameSpace
  +        //Construct a new String Tokenizer with =\t\n" as delimiters
  +
  +        st = new StringTokenizer(directive_str, " =\t\n\r\"" , false );
  +        directive = st.nextToken();
  +        //Latest spec doesn't need jsp:directive.taglib - Ramesh
  +        //out_file+="<jsp:directive." + directive +" ";
  +        String uri = "";
  +        String prefix = "";
  +        while (st.hasMoreTokens() ) {
  +            String next_token = st.nextToken();
  +
  +            if (next_token.equals("uri") )
  +                uri = st.nextToken();
  +
  +            if (next_token.equals("prefix") )
  +                prefix = st.nextToken();
  +
  +        }
  +        //put the prefix in the hashtable if it doesn't exist
  +        //this will be used to update the xml Namespace
  +
  +        if (!tag_prefix.containsKey(prefix) ) {
  +            tag_prefix.put(prefix , prefix);
  +            //add to the xml NameSpace
  +            xml_ns += "xmlns:" + prefix + "=\"" + uri + "\"" + new_line;
           }
  -  }
  - /*
  -else  //template text again
  -  {
  -      xml+=jsp.substring(last_index , save_index+1);
  -      last_index= save_index+1;
  -  }
  - */
   
  +        //update xml output
  +        //Latest spec doesn't need jsp:directive.taglib, commenting out that part - Ramesh
  +        /*
  +        out_file += "uri=\"" + uri + "\"" + " " ;
  +        out_file+="prefix=\"" + prefix +"\"" + " ";
  +        out_file+="/>" ; //end of taglib
  +        */
  +        
  +        // add '\n' in the place where the taglib directive was found
  +        out_file += new_line;
  +        return out_file;
  +    }
  +
  +
  +    public String convert(String jsp ) {
  +        int element_index = 0;
  +        int last_index = 0;
  +        int end_index = 0;
  +        int action_index = 0;
  +        int tag_level = 0;
  +        String xml = "";
  +        boolean jsp_element_first = false;
  +        boolean cdata_closed = true;
  +
  +        while (element_index >= 0 || action_index >= 0) {
  +            element_index = jsp.indexOf("<%" , last_index);
  +            action_index = jsp.indexOf(":" , last_index); //might be an action
  +
  +            if ( ((element_index < action_index) && ( element_index != -1 )
) || (action_index == -1) ) {
  +                jsp_element_first = true;
  +            } else {
  +                jsp_element_first = false;
  +            }
  +
  +
  +            if ( ( cdata_closed ) && ( jsp_element_first == true ) ) {
  +                //xml+=new_line+ "<jsp:cdata><![CDATA[ " + new_line ;
  +                xml += new_line + "<jsp:text><![CDATA[" ;
  +                cdata_closed = false;
  +            }
  +
  +            if (element_index != -1 && jsp_element_first) //JSP element was found
before action
  +            {
  +                xml += jsp.substring(last_index , element_index);
  +                //xml+=new_line + "]]></jsp:cdata>" + new_line ; //end of CDATA
section
  +
  +                char jsp_char = jsp.charAt(element_index + 2);
  +
  +                if ( jsp_char == '-' ) //jsp Comment
  +                {
  +                    xml += "]]></jsp:text>" + new_line ; //end of CDATA section
  +                    cdata_closed = true;
  +                    xml += new_line + "<!--" ; //XML comment
  +                    end_index = jsp.indexOf("--%>" , last_index );
  +                    xml += jsp.substring(element_index + 4, end_index);
  +                    xml += "-->" ;
  +                    last_index = end_index + 4;
  +                    continue;
  +                } //end JSP Comment
  +
  +                if ( jsp_char == '=' ) //Jsp Expression
  +                {
  +                    xml += "]]></jsp:text>" + new_line ; //end of CDATA section
  +                    cdata_closed = true;
  +                    xml += new_line + "<jsp:expression>" ;
  +                    end_index = jsp.indexOf("%>" , last_index );
  +                    xml += new_line + "<![CDATA[" ;
  +                    xml += jsp.substring(element_index + 3, end_index);
  +                    xml += "]]>" + new_line ; //end of CDATA
  +                    xml += new_line + "</jsp:expression>" + new_line ;
  +                    last_index = end_index + 2;
  +                    continue;
  +                } //end JSP Expression
  +
  +                if ( jsp_char == '!' ) //jsp Declaration
  +                {
  +                    xml += "]]></jsp:text>" + new_line ; //end of CDATA section
  +                    cdata_closed = true;
  +                    xml += new_line + "<jsp:declaration>" ;
  +                    end_index = jsp.indexOf("%>" , last_index );
  +                    xml += new_line + "<![CDATA[" ;
  +                    xml += jsp.substring(element_index + 3, end_index);
  +                    xml += "]]>" + new_line ; //end of CDATA
  +                    xml += new_line + "</jsp:declaration>" + new_line ;
  +                    last_index = end_index + 2;
  +                    continue;
  +                } //end JSP Declaration
  +
  +                if ( jsp_char == '@' ) //jsp Directive
  +                {
  +
  +                    end_index = jsp.indexOf("%>" , last_index );
  +                    String directive = jsp.substring(element_index + 3, end_index);
  +
  +                    if (directive.indexOf ( "taglib" ) == -1 ) {
  +                        xml += "]]></jsp:text>" + new_line ; //end of CDATA section
  +                        cdata_closed = true;
  +                    }
  +
  +                    xml += parseDirective(directive); //this adds to xml String itself
  +                    last_index = end_index + 2;
  +                    continue;
  +                } //end JSP Directive
  +
  +                xml += "]]></jsp:text>" + new_line ; //end of CDATA section
  +                cdata_closed = true;
  +                //if we reach here it means we got a JSP Scriptlet
  +                xml += new_line + "<jsp:scriptlet>" + new_line;
  +                end_index = jsp.indexOf("%>" , last_index );
  +                //xml+=new_line+"<![CDATA[" +new_line ;
  +                xml += new_line + "<![CDATA[" ;
  +                xml += jsp.substring(element_index + 2, end_index);
  +                xml += new_line + "]]>" + new_line ; //end of CDATA
  +                xml += new_line + "</jsp:scriptlet>" + new_line ;
  +                last_index = end_index + 2;
  +                continue;
  +            } //end if
  +
  +            //This is the code to take care of jsp actions like jsp:forward and custom
actions
  +            //Here for simplicity a am assuming that these standard strings are
  +            //not used as part of template text. Note that all these elements
  +            //start with "jsp:"
  +
  +            //Ramesh: ":" can't appear at the beginning of line
  +            //if(action_index!=-1) // might be a custom or standard action
  +            if (action_index > 0) // might be a custom or standard action
  +            {
  +                //find the previous element
  +                int save_index = action_index ;
  +                char ch = jsp.charAt(action_index - 1 );
  +                /*
  +                if  ( ch == ' ' ) // Ramesh: first letter left to":" should not be a whitespace
  +            {
  +                	continue;
  +            } 
  +                */
  +                while ( ch != '<' ) {
  +                    action_index--;
  +
  +                    //don't wanna go back to where we already are
  +                    if ( (action_index < last_index) || ( ch == '>' ) ) // Ramesh:
> can't appear before :
  +                        break;
  +
  +                    ch = jsp.charAt(action_index);
  +                }
  +
  +                String action_name = jsp.substring(action_index + 1, save_index);
  +
  +                if ( (action_index < last_index) || action_name.endsWith(" ") ) {
  +                    //don't close the existing CDATA section
  +                    // because it's a template text
  +                    xml += jsp.substring(last_index , save_index + 1);
  +                    last_index = save_index + 1;
  +                    continue;
  +                }
  +
  +                //Check for an end tag
  +
  +                if (action_name.startsWith("/") ) {
  +                    //close the existiong CDATA section first, Ramesh
  +                    //xml+=jsp.substring(last_index , action_index);
  +                    tag_level--;
  +                    //if ( ( tag_level == 0 ) && ( cdata_closed == false ) )
  +                    /*
  +                    if ( ( tag_level == 0 )  )
  +                {
  +                    */
  +                    xml += new_line + "<jsp:text><![CDATA[" ;
  +                    if ( action_index > last_index ) {
  +                        xml += jsp.substring(last_index , action_index); // Include even
newline
  +                    }
  +                    //xml+=new_line+"]]></jsp:cdata>" +new_line ; //end of CDATA
  +
  +
  +                    xml += "]]></jsp:text>" + new_line ; //end of CDATA
  +                    cdata_closed = true;
  +                    /*
  +                }
  +                    */
  +                    end_index = jsp.indexOf( ">" , action_index);
  +                    // Ramesh: need to have < included
  +                    xml += jsp.substring(action_index , end_index + 1);
  +                    //xml+=jsp.substring(action_index , end_index+1);
  +                    last_index = end_index + 1;
  +                    continue;
  +                }
  +
  +
  +                //we found a Standard action or a custom action
  +                //the attributes of these action might contain runtime expressions
  +
  +                action_name = action_name.trim();
  +
  +                if (action_name.equals("jsp") || tag_prefix.containsKey(action_name) )
{
  +
  +                    //xml+=jsp.substring(last_index , action_index);
  +                    /*
  +                            if (tag_level==0) 
  +                             {  
  +                    */
  +                    if ( cdata_closed == false )  // If we had open cdata and one level
of action
  +                    {
  +                        // xml+=new_line + "]]></jsp:cdata>"+new_line ; //end
of CDATA section
  +                        xml += "]]></jsp:text>" + new_line ; //end of CDATA section
  +                        cdata_closed = true;
  +                    } else {
  +                        xml += new_line + "<jsp:text><![CDATA[" ;
  +                        if ( action_index > last_index ) {
  +                            xml += jsp.substring(last_index , action_index); // including
new_line
  +                        }
  +                        //xml+=new_line+"]]></jsp:cdata>" +new_line ; //end of
CDATA
  +
  +
  +                        xml += "]]></jsp:text>" + new_line ; //end of CDATA
  +                        cdata_closed = true;
  +                    }
  +                    /*
  +                }
  +                    */
  +
  +
  +                    tag_level++;
  +                    //Ramesh. Need to set to true
  +                    //cdata_closed=false;
  +                    //cdata_closed=true;
  +
  +                    end_index = jsp.indexOf(">" , action_index);
  +                    ch = jsp.charAt(end_index - 1);
  +                    while (ch == '%') {
  +                        last_index = end_index + 1;
  +                        end_index = jsp.indexOf(">" , last_index);
  +                        ch = jsp.charAt(end_index - 1);
  +                    }
  +
  +                    xml += parseAttributes( jsp.substring(action_index , end_index + 1)
);
  +                    last_index = end_index + 1;
  +
  +                    if ( jsp.charAt(end_index - 1) == '/' ) //end of tag
  +                    {
  +                        tag_level--;
  +                        //Ramesh: need to allow the others to close so commenting out
  +                        /*
  +                                      if(tag_level==0)
  +                               	cdata_closed=true;
  +                        */
  +
  +                    }
  +                }
  +                /*
  +                else  //template text again
  +                 {
  +                     xml+=jsp.substring(last_index , save_index+1);
  +                     last_index= save_index+1;
  +                 }
  +                */
  +
  +
  +
  +            } //end action
  +
  +        } //end while
  +
  +        //Remaining part of the string
  +
  +
  +        xml += jsp.substring(last_index);
  +        //close the CDATA section
  +        //xml+=new_line + "]]></jsp:cdata>" + new_line ;
  +        xml += "]]></jsp:text>" + new_line ;
  +
  +        return xml;
  +
  +    } //end convert
  +
  +    public String parseAttributes(String xml_tag) {
  +        //parse the request time attributes if any
  +        String parsed_string = "";
  +        final String sqStart = "'%=";
  +        final String sqStop = "%'";
  +        final String dqStart = "\"%=";
  +        final String dqStop = "%\"";
  +        boolean singleQuote = false;
  +        int element_index = xml_tag.indexOf("<%=");
  +        int save_index = element_index;
  +        int last_index = 0;
  +
  +        while (element_index != -1)  //found a request time attribute
  +        {
  +            if ( xml_tag.indexOf("'<%=") > -1 ) {
  +                singleQuote = true;
  +            }
  +
  +            //find the previous element skipping spaces
  +            char ch = xml_tag.charAt(element_index);
  +
  +            while (ch != '\'') {
  +                element_index--;
  +                ch = xml_tag.charAt(element_index);
  +                if (ch == '\"')
  +                    break;
  +                if (element_index <= last_index) //might be a syntax error
  +                    return null;
  +            }
  +
  +            parsed_string += xml_tag.substring(last_index, element_index) ;
  +            if ( singleQuote ) {
  +                parsed_string += sqStart;
  +            } else {
  +                parsed_string += dqStart;
  +            }
  +            last_index = save_index + 3;
  +            element_index = xml_tag.indexOf("%>" , last_index);
  +            parsed_string += xml_tag.substring(last_index, element_index);
  +            if ( singleQuote ) {
  +                parsed_string += sqStop;
  +            } else {
  +                parsed_string += dqStop;
  +            }
  +
  +            last_index = element_index + 2;
  +            //skip the blaank spaces
  +            while ( true) {
  +                ch = xml_tag.charAt(last_index);
  +
  +                if ( ch == '\'' || ch == '\"' ) {
  +                    last_index++;
  +                    break;
  +                }
  +                if (ch == ' ')
  +                    last_index++;
  +                else //Syntax error
  +                    return null ;
  +
  +            }
   
   
  -} //end action
  -
  -}//end while
  -
  -//Remaining part of the string
  -     xml+=jsp.substring(last_index);
  -//close the CDATA section
  -     //xml+=new_line + "]]></jsp:cdata>" + new_line ;
  -     xml+= "]]></jsp:text>" + new_line ;
  - 
  -return xml;
  -
  -} //end convert
  -
  -public String parseAttributes(String xml_tag)
  -{
  -//parse the request time attributes if any
  -String parsed_string="";
  -int element_index = xml_tag.indexOf("<%=");
  -int save_index=element_index;
  -int last_index=0;
  -
  -  while (element_index !=-1)  //found a reqquest time attribute
  -  {
  -    //find the previous element skipping spaces
  -  char ch=xml_tag.charAt(element_index);
  -
  -    while(ch!='\'')
  -    {
  -      element_index--;
  -      ch=xml_tag.charAt(element_index);
  -       if(ch=='\"')
  -       break;
  -       if(element_index <=last_index) //might be a syntax error
  -       return null;
  +            element_index = xml_tag.indexOf("<%=" , last_index);
  +            save_index = element_index;
  +        }
  +        parsed_string += xml_tag.substring(last_index);
  +        return parsed_string;
  +
       }
   
  -  parsed_string+=xml_tag.substring(last_index,element_index) ;
  -  parsed_string+="\"%=" ;
  -  last_index=save_index+3;
  -  element_index = xml_tag.indexOf("%>" ,last_index);
  -  parsed_string+=xml_tag.substring(last_index,element_index);
  -  parsed_string+="%\"" ;
  -
  -  last_index=element_index+2;
  -//skip the blaank spaces
  -   while ( true)
  -   {
  -     ch = xml_tag.charAt(last_index);
  -
  -     if( ch=='\'' || ch=='\"' )
  -      {
  -       last_index++;
  -       break;
  -      }
  -     if(ch==' ')
  -     last_index++;
  -     else //Syntax error
  -     return null ;
  -
  -   }
  -
  -
  -  element_index=xml_tag.indexOf("<%=" ,last_index);
  -  save_index=element_index;
  -  }
  - parsed_string+=xml_tag.substring(last_index);
  - return parsed_string;
  -
  -}
  -
  -private void readJspFileintoString( String jsp_file )
  -{
  -  if (jsp_file ==null)
  -  return;
  -
  -try
  -{
  -FileReader in_file = new FileReader(jsp_file);
  -BufferedReader br = new BufferedReader(in_file);
  -
  -String line=br.readLine() ;
  -
  -
  -    while(line !=null)
  -    {
  -  // remove all the spaces from beginning and end of the line
  - //and convert to quoting to XML
  -
  - //   line=convertToXMLQuoting(line);
  -
  -    line=line+new_line ; //readLine removes new line
  -    input_jsp+=line;
  -    line=br.readLine() ;
  +    private void readJspFileintoString( String jsp_file ) {
  +        if (jsp_file == null)
  +            return ;
  +
  +        try {
  +            FileReader in_file = new FileReader(jsp_file);
  +            BufferedReader br = new BufferedReader(in_file);
  +
  +            String line = br.readLine() ;
  +
  +
  +            while (line != null) {
  +                // remove all the spaces from beginning and end of the line
  +                //and convert to quoting to XML
  +
  +                //   line=convertToXMLQuoting(line);
  +
  +                line = line + new_line ; //readLine removes new line
  +                input_jsp += line;
  +                line = br.readLine() ;
   
  +            }
  +            br.close();
  +            in_file.close();
  +
  +        } catch (IOException ioex) {
  +            System.out.println("I/O Error in Reading");
  +        }
  +
  +    } //end readJspFileintoString
  +
  +    public String ConvertJsp2XML() {
  +
  +        String output_xml = convert( input_jsp);
  +
  +        //we have the xml file in output_xml
  +        //The final file is
  +        //xml_prolog + xml_ns + jsp_root_tag +xml+ jsp_end_tag
  +
  +        xml_ns += ">" + new_line ; //close the XML Name Space
  +        // Omit "xml_prolog" per JSP 1.2 PFD2 clarifications
  +        // output_xml=xml_prolog+ author_comments + jsp_root_tag +xml_ns+ output_xml +
jsp_end_tag ;
  +        output_xml = author_comments + jsp_root_tag + xml_ns + output_xml + jsp_end_tag
;
  +        return output_xml;
       }
  - br.close();
  - in_file.close();
   
  -}
  -catch(IOException ioex)
  - {
  -System.out.println("I/O Error in Reading");
  - }
  -
  -} //end readJspFileintoString
  -
  -public String ConvertJsp2XML()
  -{
  -
  -String output_xml =convert( input_jsp);
  -
  -//we have the xml file in output_xml
  -//The final file is
  -//xml_prolog + xml_ns + jsp_root_tag +xml+ jsp_end_tag
  -
  -xml_ns+=">" + new_line ; //close the XML Name Space
  -// Omit "xml_prolog" per JSP 1.2 PFD2 clarifications
  -// output_xml=xml_prolog+ author_comments + jsp_root_tag +xml_ns+ output_xml + jsp_end_tag
;
  -output_xml= author_comments + jsp_root_tag +xml_ns+ output_xml + jsp_end_tag ;
  -return output_xml;
  -}
  -
  -public void ConvertJsp2XML(String xml_file)
  -{
  -
  -String output_xml=convert( input_jsp);
  -
  -//we have the xml file in output_xml
  -//The final file is
  -//xml_prolog + xml_ns + jsp_root_tag +xml+ jsp_end_tag
  -
  -xml_ns+=">" + new_line ; //close the XML Name Space
  -output_xml=xml_prolog+ author_comments + jsp_root_tag +xml_ns+ output_xml + jsp_end_tag
;
  -//write it to the file
  -try
  -{
  -FileWriter out_file = new FileWriter(xml_file);
  -  out_file.write(output_xml, 0, output_xml.length() ) ;
  -  out_file.flush();
  -  out_file.close();
  -}
  -catch(IOException ioex)
  - {
  -System.out.println("I/O Error in writing");
  - }
  +    public void ConvertJsp2XML(String xml_file) {
  +
  +        String output_xml = convert( input_jsp);
  +
  +        //we have the xml file in output_xml
  +        //The final file is
  +        //xml_prolog + xml_ns + jsp_root_tag +xml+ jsp_end_tag
  +
  +        xml_ns += ">" + new_line ; //close the XML Name Space
  +        output_xml = xml_prolog + author_comments + jsp_root_tag + xml_ns + output_xml
+ jsp_end_tag ;
  +        //write it to the file
  +        try {
  +            FileWriter out_file = new FileWriter(xml_file);
  +            out_file.write(output_xml, 0, output_xml.length() ) ;
  +            out_file.flush();
  +            out_file.close();
  +        } catch (IOException ioex) {
  +            System.out.println("I/O Error in writing");
  +        }
   
  -} //end convertToXML
  +    } //end convertToXML
   
   } //end class
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:watchdog-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:watchdog-dev-help@jakarta.apache.org>


Mime
View raw message