cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java

[remm]

remm        2003/01/22 03:40:00

  Modified:    jasper2/src/share/org/apache/jasper JspC.java
  Log:
  - Fix package name generation.
  - Default to "org.apache.jsp" package name.
  
  Revision  Changes    Path
  1.24      +12 -6     
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JspC.java 21 Jan 2003 23:24:50 -0000      1.23
  +++ JspC.java 22 Jan 2003 11:40:00 -0000      1.24
  @@ -159,7 +159,7 @@
   
       String ieClassId = DEFAULT_IE_CLASS_ID;
   
  -    String targetPackage;
  +    String targetPackage = "org.apache.jsp";
   
       String targetClassName;
   
  @@ -548,8 +548,13 @@
                   targetClassName = null;
               }
               if (targetPackage != null) {
  -                clctxt.setServletPackageName( targetPackage +
  -                        toPackageName(jspUri));
  +                String jspPackage = toPackageName(jspUri);
  +                if (jspPackage.equals("")) {
  +                    clctxt.setServletPackageName(targetPackage);
  +                } else {
  +                    clctxt.setServletPackageName(targetPackage + "." 
  +                                                 + jspPackage);
  +                }
               } else {
                   clctxt.setServletPackageName( toPackageName(jspUri));
               }
  @@ -589,6 +594,7 @@
                                 new Object[] {fne.getMessage()}, Logger.WARNING);
               throw new JasperException( fne );
           } catch (Exception e) {
  +            e.printStackTrace();
               Constants.message("jspc.error.generalException",
                       new Object[] {file, e}, Logger.ERROR);
               if ( listErrors ) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>