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

2005-09-01 Thread yoavs 
yoavs   2005/09/01 11:39:24

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Minor logging enhancement for my own debugging purposes.
  
  Revision  ChangesPath
  1.29  +6 -2  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JspRuntimeContext.java30 Aug 2005 22:38:33 -  1.28
  +++ JspRuntimeContext.java1 Sep 2005 18:39:24 -   1.29
  @@ -338,6 +338,10 @@
   }
   
   classpath = cpath.toString() + cp;
  +
  +if(log.isDebugEnabled()) {
  +log.debug(Compilation classpath initialized:  + 
getClassPath());
  +}
   }
   
   /**
  @@ -511,7 +515,7 @@
   try {
   checkCompile();
   } catch (Throwable t) {
  -t.printStackTrace();
  +log.error(Exception checking if recompile needed: , t);
   }
   }
   
  
  
  

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

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

2004-10-19 Thread luehe 
luehe   2004/10/19 09:21:46

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Removed printlns ;-)
  
  Revision  ChangesPath
  1.26  +1 -7  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JspRuntimeContext.java19 Oct 2004 16:17:34 -  1.25
  +++ JspRuntimeContext.java19 Oct 2004 16:21:46 -  1.26
  @@ -181,7 +181,6 @@
*/
   public void addWrapper(String jspUri, JspServletWrapper jsw) {
   jsps.remove(jspUri);
  -System.out.println( ADDING WRAPPER + jspUri +   + this);
   jsps.put(jspUri,jsw);
   }
   
  @@ -201,7 +200,6 @@
* @param jspUri JSP URI of JspServletWrapper to remove
*/
   public void removeWrapper(String jspUri) {
  -System.out.println( REMOVING WRAPPER + jspUri);
   jsps.remove(jspUri);
   }
   
  @@ -212,7 +210,6 @@
* @return The number of JSPs that have been loaded into the webapp
*/
   public int getJspCount() {
  -System.out.println(X CALLING GETJSPCOUNT:  + jsps.size() +   + this);
   return jsps.size();
   }
   
  @@ -265,7 +262,6 @@
* Increments the JSP reload counter.
*/
   public synchronized void incrementJspReloadCount() {
  -System.out.println( INCREMENTING);
   jspReloadCount++;
   }
   
  @@ -450,8 +446,6 @@
*  a background thread now
*/
   protected void threadStart() {
  -
  -System.out.println(XXX STARTING THREAD);
   
   // Has the background thread already been started?
   if (thread != null) {
  
  
  

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

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

2004-06-14 Thread luehe 
luehe   2004/06/14 21:58:38

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Added setJspReloadCount()
  
  Revision  ChangesPath
  1.23  +12 -5 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JspRuntimeContext.java16 Apr 2004 23:01:29 -  1.22
  +++ JspRuntimeContext.java15 Jun 2004 04:58:38 -  1.23
  @@ -260,10 +260,17 @@
   /**
* Increments the JSP reload counter.
*/
  -public void incrementJspReloadCount() {
  -synchronized(this) {
  -jspReloadCount++;
  -}
  +public synchronized void incrementJspReloadCount() {
  +jspReloadCount++;
  +}
  +
  +/**
  + * Resets the JSP reload counter.
  + *
  + * @param count Value to which to reset the JSP reload counter
  + */
  +public synchronized void setJspReloadCount(int count) {
  +this.jspReloadCount = count;
   }
   
   /**
  
  
  

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

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

2003-05-30 Thread remm 
remm2003/05/29 09:34:38

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  - Only do the security init if there's a security manager.
  
  Revision  ChangesPath
  1.14  +7 -5  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- JspRuntimeContext.java15 May 2003 18:45:40 -  1.13
  +++ JspRuntimeContext.java29 May 2003 16:34:37 -  1.14
  @@ -191,7 +191,9 @@
return;
}
   
  -initSecurity();
  +if (System.getSecurityManager() != null) {
  +initSecurity();
  +}
   
   // If this web application context is running from a
   // directory, start the background compilation thread
  
  
  

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

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

2003-03-08 Thread glenn 
glenn   2003/03/08 06:19:48

  Modified:jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspRuntimeContext.java
  Log:
  Fix bug #17775
  
  Make sure web applications are granted a FilePermission to
  read the web application context directory in addition to
  its contents.
  
  Minor refactoring and cleanup of code for adding FilePermission's.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.5   +24 -12
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.4.2.4
  retrieving revision 1.4.2.5
  diff -u -r1.4.2.4 -r1.4.2.5
  --- JspRuntimeContext.java28 Dec 2002 01:46:59 -  1.4.2.4
  +++ JspRuntimeContext.java8 Mar 2003 14:19:48 -   1.4.2.5
  @@ -373,25 +373,37 @@
   if( docBase == null ) {
   docBase = options.getScratchDir().toString();
   }
  -if (!docBase.endsWith(File.separator)){
  -docBase = docBase + File.separator;
  +String codeBase = docBase;
  +if (!codeBase.endsWith(File.separator)){
  +codeBase = codeBase + File.separator;
   }
  -File contextDir = new File(docBase);
  +File contextDir = new File(codeBase);
   URL url = contextDir.getCanonicalFile().toURL();
   codeSource = new CodeSource(url,null);
   permissionCollection = policy.getPermissions(codeSource);
   
   // Create a file read permission for web app context directory
  +if (!docBase.endsWith(File.separator)){
  +permissionCollection.add
  +(new FilePermission(docBase,read));
  +docBase = docBase + File.separator;
  +} else {
  +permissionCollection.add
  +(new FilePermission
  +(docBase.substring(0,docBase.length() - 1),read));
  +}
   docBase = docBase + -;
   permissionCollection.add(new FilePermission(docBase,read));
   
  -// Create a file read permission for web app tempdir (work) 
directory
  +// Create a file read permission for web app tempdir (work)
  +// directory
   String workDir = options.getScratchDir().toString();
  -if (workDir.endsWith(File.separator)) {
  -workDir = workDir + -;
  -} else {
  -workDir = workDir + File.separator + -;
  +if (!workDir.endsWith(File.separator)){
  +permissionCollection.add
  +(new FilePermission(workDir,read));
  +workDir = workDir + File.separator;
   }
  +workDir = workDir + -;
   permissionCollection.add(new FilePermission(workDir,read));
   
   // Allow the JSP to access org.apache.jasper.runtime.HttpJspBase
  
  
  

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

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

2003-03-08 Thread glenn 
glenn   2003/03/08 09:01:54

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Port bug #17775 patch from Tomcat 4
  
  Revision  ChangesPath
  1.12  +26 -13
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JspRuntimeContext.java21 Feb 2003 18:23:14 -  1.11
  +++ JspRuntimeContext.java8 Mar 2003 17:01:54 -   1.12
  @@ -398,30 +398,43 @@
   if( docBase == null ) {
   docBase = options.getScratchDir().toString();
   }
  -if (!docBase.endsWith(File.separator)){
  -docBase = docBase + File.separator;
  +String codeBase = docBase;
  +if (!codeBase.endsWith(File.separator)){
  +codeBase = codeBase + File.separator;
   }
  -File contextDir = new File(docBase);
  +File contextDir = new File(codeBase);
   URL url = contextDir.getCanonicalFile().toURL();
   codeSource = new CodeSource(url,null);
   permissionCollection = policy.getPermissions(codeSource);
   
  +// Create a file read permission for web app context directory
  +if (!docBase.endsWith(File.separator)){
  +permissionCollection.add
  +(new FilePermission(docBase,read));
  +docBase = docBase + File.separator;
  +} else {
  +permissionCollection.add
  +(new FilePermission
  +(docBase.substring(0,docBase.length() - 1),read));
  +}
   docBase = docBase + -;
   permissionCollection.add(new FilePermission(docBase,read));
   
  -// Create a file read permission for web app tempdir (work) 
directory
  +// Create a file read permission for web app tempdir (work)
  +// directory
   String workDir = options.getScratchDir().toString();
  -if (workDir.endsWith(File.separator)) {
  -workDir = workDir + -;
  -} else {
  -workDir = workDir + File.separator + -;
  +if (!workDir.endsWith(File.separator)){
  +permissionCollection.add
  +(new FilePermission(workDir,read));
  +workDir = workDir + File.separator;
   }
  +workDir = workDir + -;
   permissionCollection.add(new FilePermission(workDir,read));
   
   // Allow the JSP to access org.apache.jasper.runtime.HttpJspBase
   permissionCollection.add( new RuntimePermission(
   accessClassInPackage.org.apache.jasper.runtime) );
  -
  +
   if (parentClassLoader instanceof URLClassLoader) {
   URL [] urls = parentClassLoader.getURLs();
   String jarUrl = null;
  
  
  

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

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JspRuntimeContext.java TagFileProcessor.java TagLibraryInfoImpl.java

2003-02-21 Thread kinman 
kinman  2003/02/21 10:23:14

  Modified:jasper2/src/bin jasper.sh jspc.sh
   jasper2/src/share/org/apache/jasper JspC.java
JspCompilationContext.java
   jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java TagFileProcessor.java
TagLibraryInfoImpl.java
  Log:
  - Applied Hans Bergsten's patch on TagLibraryInfoImpl for Jspc problem.
  - Reverted mods to TagFileProcessor.java
  - Created a dummy JspRuntimeContext for handling tag file compilations.
  - Added debugging option to jspc.sh
  
  Manual precompilation with jspc.sh seems to work now, but precompilation
  in ant still fail.  The problem seems to be related to processing tld
  in jars.  Weird.
  
  Stay tuned.
  
  Revision  ChangesPath
  1.5   +11 -1 jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh
  
  Index: jasper.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/bin/jasper.sh,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jasper.sh 4 Aug 2002 18:21:08 -   1.4
  +++ jasper.sh 21 Feb 2003 18:23:14 -  1.5
  @@ -87,6 +87,16 @@
 exec $_RUNJAVA $JAVA_OPTS $JASPER_OPTS \
   -Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
   -Djasper.home=$JASPER_HOME \
  +-Dcatalina.home=$JASPER_HOME \
  +org.apache.jasper.JspC $@
  +
  +elif [ $1 = debug ] ; then
  +
  +  shift
  +  exec $_RUNJDB $JAVA_OPTS $JASPER_OPTS \
  +-Djava.endorsed.dirs=$JAVA_ENDORSED_DIRS -classpath $CLASSPATH \
  +-Djasper.home=$JASPER_HOME \
  +-Dcatalina.home=$JASPER_HOME \
   org.apache.jasper.JspC $@
   
   else
  
  
  
  1.4   +7 -2  jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh
  
  Index: jspc.sh
  ===
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/bin/jspc.sh,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jspc.sh   4 Aug 2002 18:21:08 -   1.3
  +++ jspc.sh   21 Feb 2003 18:23:14 -  1.4
  @@ -28,4 +28,9 @@
 exit 1
   fi
   
  -exec $PRGDIR/$EXECUTABLE jspc $@
  +if [ $1 = debug ]; then
  +  shift
  +  exec $PRGDIR/$EXECUTABLE debug $@
  +else
  +  exec $PRGDIR/$EXECUTABLE jspc $@
  +fi
  
  
  
  1.30  +23 -12
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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JspC.java 10 Feb 2003 10:31:49 -  1.29
  +++ JspC.java 21 Feb 2003 18:23:14 -  1.30
  @@ -68,13 +68,12 @@
   import org.apache.jasper.compiler.ServletWriter;
   import org.apache.jasper.compiler.Compiler;
   import org.apache.jasper.compiler.TldLocationsCache;
  -
  -import org.apache.jasper.servlet.JspCServletContext;
  -
  -import org.apache.jasper.compiler.JspConfig;
   import org.apache.jasper.compiler.JspConfig;
   import org.apache.jasper.compiler.TagPluginManager;
   import org.apache.jasper.compiler.Localizer;
  +import org.apache.jasper.compiler.JspRuntimeContext;
  +import org.apache.jasper.servlet.JspCServletContext;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  @@ -195,6 +194,10 @@
   static PrintStream logStream;
   
   JspCServletContext context;
  +/*
  + * Maintain a dummy JspRuntimeContext for compiling tag files
  + */
  +JspRuntimeContext rctxt;
   
   /**
* Cache for the TLD locations
  @@ -204,6 +207,7 @@
   private JspConfig jspConfig = null;
   private TagPluginManager tagPluginManager = null;
   
  +private boolean verbose = false;
   private boolean listErrors = false;
   private boolean showSuccess = false;
   
  @@ -530,7 +534,7 @@
   String baseDir = scratchDir.getCanonicalPath();
   this.setOutputDir( baseDir + jspUri.substring( 0, jspUri.lastIndexOf( 
'/' ) ) );
   JspCompilationContext clctxt = new JspCompilationContext
  -( jspUri, false,  this, context, null, null );
  +( jspUri, false,  this, context, null, rctxt );
   
   /* Override the defaults */
   if ((targetClassName != null)  (targetClassName.length()  0)) {
  @@ -591,6 +595,8 @@
  e);
   if ( listErrors ) {
logStream.println( Error in File:  + file );
  + logStream.println(e.getMessage());
  + e.printStackTrace(logStream);
return true;
   } else if (dieLevel != NO_DIE_LEVEL) {
   dieOnExit = true;
  @@ -745,12 +751,13 @@
   (new PrintWriter(System.out),

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

2002-12-27 Thread glenn 
glenn   2002/12/27 17:46:59

  Modified:jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspRuntimeContext.java
  Log:
  Fix bug 15531
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.4   +12 -8 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- JspRuntimeContext.java23 Sep 2002 23:53:05 -  1.4.2.3
  +++ JspRuntimeContext.java28 Dec 2002 01:46:59 -  1.4.2.4
  @@ -303,9 +303,9 @@
* registered with this class for JSP's.
*/
   private void checkCompile() {
  -Iterator it = jsps.values().iterator();
  -while (it.hasNext()) {
  -JspServletWrapper jsw = (JspServletWrapper)it.next();
  +Object [] wrappers = jsps.values().toArray();
  +for (int i = 0; i  wrappers.length; i++ ) {
  +JspServletWrapper jsw = (JspServletWrapper)wrappers[i];
   JspCompilationContext ctxt = jsw.getJspEngineContext();
   // JspServletWrapper also synchronizes on this when
   // it detects it has to do a reload
  @@ -512,7 +512,11 @@
   
   // Check for included files which are newer than the
   // JSP which uses them.
  -checkCompile();
  +try {
  +checkCompile();
  +} catch (Throwable t) {
  +t.printStackTrace();
  +}
   }
   
   }
  
  
  

--
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/compiler JspRuntimeContext.java

2002-12-27 Thread glenn 
glenn   2002/12/27 17:47:11

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Fix bug 15531
  
  Revision  ChangesPath
  1.9   +12 -8 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspRuntimeContext.java8 Dec 2002 13:42:53 -   1.8
  +++ JspRuntimeContext.java28 Dec 2002 01:47:11 -  1.9
  @@ -317,9 +317,9 @@
* registered with this class for JSP's.
*/
   private void checkCompile() {
  -Iterator it = jsps.values().iterator();
  -while (it.hasNext()) {
  -JspServletWrapper jsw = (JspServletWrapper)it.next();
  +Object [] wrappers = jsps.values().toArray();
  +for (int i = 0; i  wrappers.length; i++ ) {
  +JspServletWrapper jsw = (JspServletWrapper)wrappers[i];
   JspCompilationContext ctxt = jsw.getJspEngineContext();
   // JspServletWrapper also synchronizes on this when
   // it detects it has to do a reload
  @@ -527,7 +527,11 @@
   
   // Check for included files which are newer than the
   // JSP which uses them.
  -checkCompile();
  +try {
  +checkCompile();
  +} catch (Throwable t) {
  +t.printStackTrace();
  +}
   }
   
   }
  
  
  

--
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/compiler JspRuntimeContext.java

2002-11-07 Thread jfarcand 
jfarcand2002/11/07 13:14:53

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Securize the package so it can work under the SecurityManager when the 
org.apache.jasper
  package is protected. Fix bugs when the JSP 2.0 examples were executed under the 
SecurityManager.
  
  Revision  ChangesPath
  1.6   +19 -4 
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JspRuntimeContext.java3 Aug 2002 23:29:21 -   1.5
  +++ JspRuntimeContext.java7 Nov 2002 21:14:53 -   1.6
   -130,6 +130,20 
   runtime.TagHandlerPool);
   factory.getClass().getClassLoader().loadClass( basePackage +
   servlet.JspServletWrapper);
  +factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.JspFragmentHelper);
  +factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.ProtectedFunctionMapper);
  +factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.ProtectedFunctionMapper$1);
  +factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.ProtectedFunctionMapper$2);
  +factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.PageContextImpl);  
  + factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.PageContextImpl$1);  
  +factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.JspContextWrapper);   
   } catch (ClassNotFoundException ex) {
   System.out.println(
   Jasper JspRuntimeContext preload of class failed:  +
   -392,6 +406,7 
   // Allow the JSP to access org.apache.jasper.runtime.HttpJspBase
   permissionCollection.add( new RuntimePermission(
   accessClassInPackage.org.apache.jasper.runtime) );
  +
   if (parentClassLoader instanceof URLClassLoader) {
   URL [] urls = parentClassLoader.getURLs();
   String jarUrl = null;
  
  
  

--
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/compiler JspRuntimeContext.java

2002-09-23 Thread glenn 

glenn   2002/09/23 16:53:06

  Modified:jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspRuntimeContext.java
  Log:
  Make sure the CodeSource for JSP pages is created consistently the same
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.3   +16 -14
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- JspRuntimeContext.java20 Sep 2002 23:04:12 -  1.4.2.2
  +++ JspRuntimeContext.java23 Sep 2002 23:53:05 -  1.4.2.3
  @@ -369,20 +369,21 @@
   if( policy != null ) {
   try {  
   // Get the permissions for the web app context
  -String contextDir = context.getRealPath(/);
  -if( contextDir == null ) {
  -contextDir = options.getScratchDir().toString();
  +String docBase = context.getRealPath(/);
  +if( docBase == null ) {
  +docBase = options.getScratchDir().toString();
   }
  -URL url = new URL(file: + contextDir);
  +if (!docBase.endsWith(File.separator)){
  +docBase = docBase + File.separator;
  +}
  +File contextDir = new File(docBase);
  +URL url = contextDir.getCanonicalFile().toURL();
   codeSource = new CodeSource(url,null);
   permissionCollection = policy.getPermissions(codeSource);
   
   // Create a file read permission for web app context directory
  -if (contextDir.endsWith(File.separator)) {
  -contextDir = contextDir + -;
  -} else {
  -contextDir = contextDir + File.separator + -;
  -}
  +docBase = docBase + -;
  +permissionCollection.add(new FilePermission(docBase,read));
   
   // Create a file read permission for web app tempdir (work) 
directory
   String workDir = options.getScratchDir().toString();
  @@ -425,7 +426,8 @@
   permissionCollection.add(
   new FilePermission(jndiUrl,read) );
   }
  -} catch(MalformedURLException mfe) {
  +} catch(Exception e) {
  +context.log(Security Init for context failed,e);
   }
   }
   }
  
  
  

--
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/compiler JspRuntimeContext.java

2002-09-20 Thread glenn 

glenn   2002/09/20 10:46:27

  Modified:jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch JspRuntimeContext.java
  Log:
  Add read FilePermission for work directory, cleanup docs
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.4.2.1   +17 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- JspRuntimeContext.java21 Jun 2002 17:11:32 -  1.4
  +++ JspRuntimeContext.java20 Sep 2002 17:46:27 -  1.4.2.1
  @@ -96,10 +96,6 @@
* is dependent upon.  If a dpendent file changes the JSP page
* which included it is recompiled.
*
  - * Saves information about JSP dependincies to the file
  - * codeJSP_DEPENDENCY.ser/code in the web application context
  - * work directory.
  - *
* Only used if a web application context is a directory.
*
* @author Glenn L. Nielsen
  @@ -373,23 +369,34 @@
   if( policy != null ) {
   try {  
   // Get the permissions for the web app context
  -String contextDir = context.getRealPath(/);
  +String contextDir = options.getScratchDir().toString();
   if( contextDir == null ) {
   contextDir = options.getScratchDir().toString();
   }
   URL url = new URL(file: + contextDir);
   codeSource = new CodeSource(url,null);
   permissionCollection = policy.getPermissions(codeSource);
  +
   // Create a file read permission for web app context directory
   if (contextDir.endsWith(File.separator)) {
   contextDir = contextDir + -;
   } else {
   contextDir = contextDir + File.separator + -;
   }
  -permissionCollection.add(new FilePermission(contextDir,read));
  +
  +// Create a file read permission for web app tempdir (work) 
directory
  +String workDir = options.getScratchDir().toString();
  +if (workDir.endsWith(File.separator)) {
  +workDir = workDir + -;
  +} else {
  +workDir = workDir + File.separator + -;
  +}
  +permissionCollection.add(new FilePermission(workDir,read));
  +
   // Allow the JSP to access org.apache.jasper.runtime.HttpJspBase
   permissionCollection.add( new RuntimePermission(
   accessClassInPackage.org.apache.jasper.runtime) );
  +
   if (parentClassLoader instanceof URLClassLoader) {
   URL [] urls = parentClassLoader.getURLs();
   String jarUrl = null;
  
  
  

--
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/compiler JspRuntimeContext.java

2002-06-21 Thread glenn 

glenn   2002/06/21 10:11:32

  Modified:jasper2/src/share/org/apache/jasper/compiler
JspRuntimeContext.java
  Log:
  Preload TagHandlerPool class to make SecurityManager happy
  
  Revision  ChangesPath
  1.4   +6 -4  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java
  
  Index: JspRuntimeContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JspRuntimeContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JspRuntimeContext.java20 Jun 2002 22:58:58 -  1.3
  +++ JspRuntimeContext.java21 Jun 2002 17:11:32 -  1.4
  @@ -127,6 +127,8 @@
   factory.getClass().getClassLoader().loadClass( basePackage +
   runtime.ServletResponseWrapperInclude);
   factory.getClass().getClassLoader().loadClass( basePackage +
  +runtime.TagHandlerPool);
  +factory.getClass().getClassLoader().loadClass( basePackage +
   servlet.JspServletWrapper);
   } catch (ClassNotFoundException ex) {
   System.out.println(
  
  
  

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