Return-Path: 
 <tomcat-dev-return-16818-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 15457 invoked from network); 24 Aug 2002 00:48:32 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 24 Aug 2002 00:48:32 -0000
Received: (qmail 7326 invoked by uid 97); 24 Aug 2002 00:49:02 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 7295 invoked by uid 97); 24 Aug 2002 00:49:02 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 7280 invoked by uid 97); 24 Aug 2002 00:49:01 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 24 Aug 2002 00:48:22 -0000
Message-ID: <20020824004822.72123.qmail@icarus.apache.org>
From: kinman@apache.org
To: jakarta-tomcat-jasper-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler
 ParserController.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

kinman      2002/08/23 17:48:22

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        ParserController.java
  Log:
  - Recognize suffix .jspx to be a JSP document (XML)
  
  Revision  Changes    Path
  1.15      +12 -3     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java
  
  Index: ParserController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ParserController.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ParserController.java	21 Aug 2002 00:45:00 -0000	1.14
  +++ ParserController.java	24 Aug 2002 00:48:22 -0000	1.15
  @@ -245,14 +245,23 @@
                       file.startsWith( "/META-INF/tags" );
   
   	PageInfo pageInfo = compiler.getPageInfo();
  +
  +	boolean isXmlFound = false;
   	if (pageInfo.isXmlSpecified()) {
  +	    // If <is-xml> is specified in a <jsp-property-group>, it is used.
   	    isXml = pageInfo.isXml();
  +	    isXmlFound = true;
  +	} else if (file.endsWith(".jspx")) {
  +	    isXml = true;
  +	    isXmlFound = true;
   	}
  +	
   	if (pageInfo.getPageEncoding() != null) {
   	    newEncoding = pageInfo.getPageEncoding();
   	}
  -	if (pageInfo.isXmlSpecified() && newEncoding != null)
  -	    return;
  +
  +	if (isXmlFound && newEncoding != null)
  +	    return;	// No need to scan the file
   
   	JspReader jspReader;
   	try {
  @@ -264,7 +273,7 @@
           jspReader.setSingleFile(true);
           Mark startMark = jspReader.mark();
   
  -	if (!pageInfo.isXmlSpecified()) {
  +	if (!isXmlFound) {
   	    // Check for the jsp:root tag
   	    // No check for xml prolog, since nothing prevents a page
   	    // to output XML and still use JSP syntax.
  
  
  

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