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

2003-03-26 Thread jfarcand 
jfarcand2003/03/26 14:44:02

  Modified:jasper2/src/share/org/apache/jasper
EmbededServletOptions.java
  Log:
  Always validate the name/value pair returned by the getInitParameter(). If the name 
or the value is null, do not try to add it into the Properties object.
  
  Fix bugtraq: 4837522
  
  Revision  ChangesPath
  1.20  +6 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- EmbededServletOptions.java24 Feb 2003 19:39:38 -  1.19
  +++ EmbededServletOptions.java26 Mar 2003 22:44:02 -  1.20
  @@ -205,7 +205,9 @@
   }
   
   public void setProperty(String name, String value ) {
  -settings.setProperty( name, value );
  +if (name != null || value != null){ 
  +settings.setProperty( name, value );
  +}
   }
   
   /**
  
  
  

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

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

2003-03-26 Thread jfarcand 
jfarcand2003/03/26 17:18:31

  Modified:jasper2/src/share/org/apache/jasper
EmbededServletOptions.java
  Log:
  Both name and value should not be null.
  
  Revision  ChangesPath
  1.21  +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- EmbededServletOptions.java26 Mar 2003 22:44:02 -  1.20
  +++ EmbededServletOptions.java27 Mar 2003 01:18:31 -  1.21
  @@ -205,7 +205,7 @@
   }
   
   public void setProperty(String name, String value ) {
  -if (name != null || value != null){ 
  +if (name != null  value != null){ 
   settings.setProperty( name, value );
   }
   }
  
  
  

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

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

2003-01-03 Thread glenn 
glenn   2003/01/03 05:24:59

  Modified:jasper2/src/share/org/apache/jasper Tag: tomcat_4_branch
EmbededServletOptions.java
  Log:
  Make Ant javac fork the default
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.8.2.3   +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- EmbededServletOptions.java31 Dec 2002 14:00:36 -  1.8.2.2
  +++ EmbededServletOptions.java3 Jan 2003 13:24:59 -   1.8.2.3
  @@ -91,7 +91,7 @@
   /**
* Should Ant fork its java compiles of JSP pages.
*/
  -public boolean fork = false;
  +public boolean fork = true;
   
   /**
* Do you want to keep the generated Java files around?
  
  
  

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

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

2003-01-01 Thread remm 
remm2003/01/01 07:21:01

  Modified:jasper2/src/share/org/apache/jasper
EmbededServletOptions.java
  Log:
  - Due to continued problems with javac, I think fork should default to true.
  
  Revision  ChangesPath
  1.17  +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- EmbededServletOptions.java31 Dec 2002 14:01:17 -  1.16
  +++ EmbededServletOptions.java1 Jan 2003 15:21:01 -   1.17
  @@ -93,7 +93,7 @@
   /**
* Should Ant fork its java compiles of JSP pages.
*/
  -public boolean fork = false;
  +public boolean fork = true;
   
   /**
* Do you want to keep the generated Java files around?
  
  
  

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

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

2002-10-22 Thread luehe 
luehe   2002/10/22 15:23:15

  Modified:jasper2/src/share/org/apache/jasper
EmbededServletOptions.java
  Log:
  Reduced visibility of instance fields from public to private, since each has its own 
(public) getter method
  
  Revision  ChangesPath
  1.11  +18 -18
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EmbededServletOptions.java20 Aug 2002 03:52:18 -  1.10
  +++ EmbededServletOptions.java22 Oct 2002 22:23:14 -  1.11
   -87,12 +87,12 
   /**
* Is Jasper being used in development mode?
*/
  -public boolean development = true;
  +private boolean development = true;
   
   /**
* Do you want to keep the generated Java files around?
*/
  -public boolean keepGenerated = true;
  +private boolean keepGenerated = true;
   
   /**
* Do you want support for large files? What this essentially
   -100,64 +100,64 
* file is stored separately as opposed to those constant string
* data being used literally in the generated servlet. 
*/
  -public boolean largeFile = false;
  +private boolean largeFile = false;
   
   /**
* Determines whether tag handler pooling is enabled.
*/
  -public boolean poolingEnabled = true;
  +private boolean poolingEnabled = true;
   
   /**
* Do you want support for mapped files? This will generate
* servlet that has a print statement per line of the JSP file.
* This seems like a really nice feature to have for debugging.
*/
  -public boolean mappedFile = false;
  +private boolean mappedFile = false;
   
   /**
* Do you want stack traces and such displayed in the client's
* browser? If this is false, such messages go to the standard
* error or a log file if the standard error is redirected. 
*/
  -public boolean sendErrorToClient = false;
  +private boolean sendErrorToClient = false;
   
   /**
* Do we want to include debugging information in the class file?
*/
  -public boolean classDebugInfo = true;
  +private boolean classDebugInfo = true;
   
   /**
* Background compile thread check interval in seconds.
*/
  -public int checkInterval = 300;
  +private int checkInterval = 300;
   
   /**
* JSP reloading check ?
*/
  -public boolean reloading = true;
  +private boolean reloading = true;
   
   /**
* I want to see my generated servlets. Which directory are they
* in?
*/
  -public File scratchDir;
  +private File scratchDir;
   
   /**
* Need to have this as is for versions 4 and 5 of IE. Can be set from
* the initParams so if it changes in the future all that is needed is
* to have a jsp initParam of type ieClassId=value
*/
  -public String ieClassId = clsid:8AD9C840-044E-11D1-B3E9-00805F499D93;
  +private String ieClassId = clsid:8AD9C840-044E-11D1-B3E9-00805F499D93;
   
   /**
* What classpath should I use while compiling generated servlets?
*/
  -public String classpath = null;
  +private String classpath = null;
   
   /**
* Compiler to use.
*/
  -public String compiler = null;
  +private String compiler = null;
   
   /**
* Cache for the TLD locations
   -167,7 +167,7 
   /**
* Jsp config information
*/
  -JspConfig jspConfig = null;
  +private JspConfig jspConfig = null;
   
   /**
* Java platform encoding to generate the JSP
   -278,7 +278,7 
   }
   
   public void setTldLocationsCache( TldLocationsCache tldC ) {
  -tldLocationsCache=tldC;
  +tldLocationsCache = tldC;
   }
   
   public String getJavaEncoding() {
  
  
  

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

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

2002-06-12 Thread costin 

costin  2002/06/12 16:18:50

  Modified:jasper2/src/share/org/apache/jasper
EmbededServletOptions.java
  Log:
  Turn class debug info, they are quite usefull in debugging and don't
  hurt anyone.
  
  Revision  ChangesPath
  1.6   +4 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EmbededServletOptions.java31 May 2002 05:13:13 -  1.5
  +++ EmbededServletOptions.java12 Jun 2002 23:18:50 -  1.6
  @@ -114,7 +114,7 @@
   /**
* Do we want to include debugging information in the class file?
*/
  -public boolean classDebugInfo = false;
  +public boolean classDebugInfo = true;
   
   /**
* Background compile thread check interval in seconds.
  
  
  

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