tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources messages.properties messages_es.properties
Date Fri, 07 Sep 2001 17:57:46 GMT
craigmcc    01/09/07 10:57:46

  Modified:    jasper/src/share/org/apache/jasper JspC.java
               jasper/src/share/org/apache/jasper/resources
                        messages.properties messages_es.properties
  Log:
  Update web.xml fragments generated by jspc command line compiler to use
  the appropriate DTD header, and to generate valid servlet mapping
  elements.
  
  PR: Bugzilla #3474
  Submitted by:	Todd Blakeslee <blakest@diebold.com>
  
  Revision  Changes    Path
  1.9       +8 -7      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspC.java	2001/02/04 01:03:42	1.8
  +++ JspC.java	2001/09/07 17:57:46	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
1.8 2001/02/04 01:03:42 glenn Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/02/04 01:03:42 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
1.9 2001/09/07 17:57:46 craigmcc Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/09/07 17:57:46 $
    *
    * ====================================================================
    * 
  @@ -400,11 +400,12 @@
                   servletout.write("</servlet-class>\n\t</servlet>\n");
               }
               if (mappingout != null) {
  -                mappingout.write("\n\t<servlet-mapping>\n\t\t<url-pattern>");
  -                mappingout.write(file);
  -                mappingout.write("</url-pattern>\n\t\t<servlet-name>");
  +                mappingout.write("\n\t<servlet-mapping>\n\t\t<servlet-name>");
                   mappingout.write(thisServletName);
  -                mappingout.write("</servlet-name>\n\t</servlet-mapping>\n");
  +                mappingout.write("</servlet-name>\n\t\t<url-pattern>");
  +                mappingout.write(file);
  +                mappingout.write("</url-pattern>\n\t</servlet-mapping>\n");
  +
               }
               return true;
           } catch (JasperException je) {
  
  
  
  1.20      +3 -3      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- messages.properties	2001/07/12 23:29:33	1.19
  +++ messages.properties	2001/09/07 17:57:46	1.20
  @@ -1,4 +1,4 @@
  -# $Id: messages.properties,v 1.19 2001/07/12 23:29:33 horwat Exp $
  +# $Id: messages.properties,v 1.20 2001/09/07 17:57:46 craigmcc Exp $
   #
   # Default localized string information
   # Localized this the Default Locale as is en_US
  @@ -185,8 +185,8 @@
   jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
   \n\
   <!DOCTYPE web-app\n\
  -\    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"\n\
  -\    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">\n\
  +\    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
  +\    "http://java.sun.com/dtd/web-app_2_3.dtd">\n\
   <!--\n\
   Automatically created by Tomcat JspC.\n\
   -->\n\
  
  
  
  1.8       +3 -3      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties
  
  Index: messages_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- messages_es.properties	2000/11/08 00:09:26	1.7
  +++ messages_es.properties	2001/09/07 17:57:46	1.8
  @@ -1,4 +1,4 @@
  -# $Id: messages_es.properties,v 1.7 2000/11/08 00:09:26 pierred Exp $
  +# $Id: messages_es.properties,v 1.8 2001/09/07 17:57:46 craigmcc Exp $
   #
   # Default localized string information
   # Localized para Locale es_ES
  @@ -164,8 +164,8 @@
   jspc.webxml.header=<?xml version="1.0" encoding="ISO-8859-1"?>\n\
   \n\
   <!DOCTYPE web-app\n\
  -\    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"\n\
  -\    "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">\n\
  +\    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
  +\    "http://java.sun.com/dtd/web-app_2_3.dtd">\n\
   <!--\n\
   Automatically created by Tomcat JspC.\n\
   -->\n\
  
  
  

Mime
View raw message