DO NOT REPLY [Bug 39011] - image size limit

2006-12-23 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39011


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-12-23 09:33 ---
I solved the problem:
I have installed tomcat-5.5.17 and tomcat-admin-5.5.20.When I trid to 
uninstall all and reinstall tomcat-5.5.17 only ,the problem solved.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r489910 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java webapps/docs/changelog.xml

2006-12-23 Thread markt 
Author: markt
Date: Sat Dec 23 10:07:34 2006
New Revision: 489910

URL: http://svn.apache.org/viewvc?view=rev&rev=489910
Log:
Make ApplicationDispatcher thread safe. After a very long thread on the users 
list (http://marc.theaimsgroup.com/?t=11655879003&r=1&w=2) this was found 
to be the root of the problem.
There was also some debate if this re-use of the RequestDispatcher was valid. 
The spec is not clear on this point.
This change should be functionality identical to the previous version. It uses 
additional local variables and method parameters rather than instance variables.
Some fields were unnecessary duplicates and have been removed.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java?view=diff&rev=489910&r1=489909&r2=489910
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
 Sat Dec 23 10:07:34 2006
@@ -131,7 +131,6 @@
 this.context = (Context) wrapper.getParent();
 this.requestURI = requestURI;
 this.servletPath = servletPath;
-this.origServletPath = servletPath;
 this.pathInfo = pathInfo;
 this.queryString = queryString;
 this.name = name;
@@ -153,30 +152,12 @@
 private static Log log = LogFactory.getLog(ApplicationDispatcher.class);
 
 /**
- * The request specified by the dispatching application.
- */
-private ServletRequest appRequest = null;
-
-
-/**
- * The response specified by the dispatching application.
- */
-private ServletResponse appResponse = null;
-
-
-/**
  * The Context this RequestDispatcher is associated with.
  */
 private Context context = null;
 
 
 /**
- * Are we performing an include() instead of a forward()?
- */
-private boolean including = false;
-
-
-/**
  * Descriptive information about this implementation.
  */
 private static final String info =
@@ -190,18 +171,6 @@
 
 
 /**
- * The outermost request that will be passed on to the invoked servlet.
- */
-private ServletRequest outerRequest = null;
-
-
-/**
- * The outermost response that will be passed on to the invoked servlet.
- */
-private ServletResponse outerResponse = null;
-
-
-/**
  * The extra path information for this RequestDispatcher.
  */
 private String pathInfo = null;
@@ -218,13 +187,13 @@
  */
 private String requestURI = null;
 
+
 /**
  * The servlet path for this RequestDispatcher.
  */
 private String servletPath = null;
 
-private String origServletPath = null;
-
+
 /**
  * The StringManager for this package.
  */
@@ -246,18 +215,6 @@
 private Wrapper wrapper = null;
 
 
-/**
- * The request wrapper we have created and installed (if any).
- */
-private ServletRequest wrapRequest = null;
-
-
-/**
- * The response wrapper we have created and installed (if any).
- */
-private ServletResponse wrapResponse = null;
-
-
 // - Properties
 
 
@@ -323,11 +280,12 @@
 }
 
 // Set up to handle the specified request and response
-setup(request, response, false);
-
+ServletRequest outerRequest = request;
+ServletResponse outerResponse = response;
+
 if (Globals.STRICT_SERVLET_COMPLIANCE) {
 // Check SRV.8.2 / SRV.14.2.5.1 compliance
-checkSameObjects();
+checkSameObjects(request, response);
 }
 
 // Identify the HTTP-specific request and response objects (if any)
@@ -343,8 +301,9 @@
 
 if ( log.isDebugEnabled() )
 log.debug(" Non-HTTP Forward");
-
-processRequest(hrequest,hresponse);
+// TODO - this doesn't appear to agree with the comments above
+processRequest(hrequest,hresponse,outerRequest,outerResponse,null,
+null);
 
 }
 
@@ -355,17 +314,18 @@
 log.debug(" Named Dispatcher Forward");
 
 ApplicationHttpRequest wrequest =
-(ApplicationHttpRequest) wrapRequest();
+(ApplicationHttpRequest) wrapRequest(outerRequest);
 wrequest.setRequestURI(hrequest.getRequestURI());
 wrequest.setContextPath(hrequest.getContextPath());
 wrequest.setServletPath(hrequest.getServletPath());

DO NOT REPLY [Bug 36574] - Broken PDF document in online docware

2006-12-23 Thread bugzilla 
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=36574


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




--- Additional Comments From [EMAIL PROTECTED]  2006-12-23 11:12 ---
I am trying to open document serverStartup.pdf from 
http://tomcat.apache.org/tomcat-5.5-
doc/architecture/startup/serverStartup.pdf, and it shows me this error 
message "An unrecognized tocken '.p35.76' was found", and then the PDF 
document appears in blank. 
Also I have tried to open the requestProcess.pdf from 
http://tomcat.apache.org/tomcat-5.5-doc/architecture/startup/serverStartup.pdf 
and it shows another error "Cannot extract the embedded font 'EHPFDM+aRIAL'. 
some character may not display or print correctly." Once I press Ok it shows 
another error message which reads "An unrecognized tocken 'N1' was found", and 
then the document only shows a tittle on the left corner that reads 
ThreadPool. 
I am running Win XP Home and Adobe Reader 7.0. 
Thanks

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r489929 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java

2006-12-23 Thread markt 
Author: markt
Date: Sat Dec 23 13:58:57 2006
New Revision: 489929

URL: http://svn.apache.org/viewvc?view=rev&rev=489929
Log:
Tabs to 8 spaces. No functional change.

Modified:

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java?view=diff&rev=489929&r1=489928&r2=489929
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java
 (original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java
 Sat Dec 23 13:58:57 2006
@@ -40,12 +40,12 @@
  * @param errMsg The compilation error message
  */
 public JavacErrorDetail(String javaFileName,
-   int javaLineNum,
-   StringBuffer errMsg) {
+int javaLineNum,
+StringBuffer errMsg) {
 
-   this.javaFileName = javaFileName;
-   this.javaLineNum = javaLineNum;
-   this.errMsg = errMsg;
+this.javaFileName = javaFileName;
+this.javaLineNum = javaLineNum;
+this.errMsg = errMsg;
 this.jspBeginLineNum = -1;
 }
 
@@ -62,14 +62,14 @@
  * @param errMsg The compilation error message
  */
 public JavacErrorDetail(String javaFileName,
-   int javaLineNum,
-   String jspFileName,
-   int jspBeginLineNum,
-   StringBuffer errMsg) {
+int javaLineNum,
+String jspFileName,
+int jspBeginLineNum,
+StringBuffer errMsg) {
 
 this(javaFileName, javaLineNum, errMsg);
-   this.jspFileName = jspFileName;
-   this.jspBeginLineNum = jspBeginLineNum;
+this.jspFileName = jspFileName;
+this.jspBeginLineNum = jspBeginLineNum;
 }
 
 /**
@@ -79,7 +79,7 @@
  * @return Java source file name
  */
 public String getJavaFileName() {
-   return this.javaFileName;
+return this.javaFileName;
 }
 
 /**
@@ -88,7 +88,7 @@
  * @return Compilation error line number
  */
 public int getJavaLineNumber() {
-   return this.javaLineNum;
+return this.javaLineNum;
 }
 
 /**
@@ -98,7 +98,7 @@
  * @return JSP file from which the Java source file was generated.
  */
 public String getJspFileName() {
-   return this.jspFileName;
+return this.jspFileName;
 }
 
 /**
@@ -109,7 +109,7 @@
  * compilation error
  */
 public int getJspBeginLineNumber() {
-   return this.jspBeginLineNum;
+return this.jspBeginLineNum;
 }
 
 /**
@@ -118,6 +118,6 @@
  * @return Compilation error message
  */
 public String getErrorMessage() {
-   return this.errMsg.toString();
+return this.errMsg.toString();
 }
 }



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

svn commit: r489978 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

2006-12-23 Thread markt 
Author: markt
Date: Sat Dec 23 20:23:23 2006
New Revision: 489978

URL: http://svn.apache.org/viewvc?view=rev&rev=489978
Log:
Update changelog

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=489978&r1=489977&r2=489978
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Dec 23 20:23:23 2006
@@ -181,6 +181,10 @@
   
 41057: Make jsp:plugin output XHTML compliant. (markt)
   
+  
+When displaying JSP source after an exception, handle included files.
+(markt)
+  
 

   



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

svn commit: r489981 - in /tomcat: container/tc5.5.x/webapps/docs/ jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ jasper/tc5.5.x/src/share/org/apache/jasper/servlet/

2006-12-23 Thread markt 
Author: markt
Date: Sat Dec 23 20:28:38 2006
New Revision: 489981

URL: http://svn.apache.org/viewvc?view=rev&rev=489981
Log:
Display JSP source when a compilation error occurs and use the correct line 
number rather than the start of the scriptlet block.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JDTCompiler.java

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/JavacErrorDetail.java

tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/servlet/JspServletWrapper.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=489981&r1=489980&r2=489981
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Dec 23 20:28:38 2006
@@ -185,6 +185,10 @@
 When displaying JSP source after an exception, handle included files.
 (markt)
   
+  
+Display the JSP source when a compilation error occurs and display
+the correct line number rather than start of a scriptlet block. (markt)
+  
 

   

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java?view=diff&rev=489981&r1=489980&r2=489981
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
 (original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/DefaultErrorHandler.java
 Sat Dec 23 20:28:38 2006
@@ -67,22 +67,22 @@
 StringBuffer buf = new StringBuffer();
 
 for (int i=0; i < details.length; i++) {
+buf.append("\n");
 if (details[i].getJspBeginLineNumber() >= 0) {
 args = new Object[] {
 new Integer(details[i].getJspBeginLineNumber()), 
 details[i].getJspFileName() };
+buf.append("\n");
 buf.append(Localizer.getMessage("jsp.error.single.line.number",
 args));
 buf.append("\n"); 
+buf.append(details[i].getErrorMessage());
+buf.append("\n"); 
+buf.append(details[i].getJspExtract());
 }
-
-buf.append(
-Localizer.getMessage("jsp.error.corresponding.servlet"));
-buf.append(details[i].getErrorMessage());
-buf.append("\n\n");
 }
-
-throw new 
JasperException(Localizer.getMessage("jsp.error.unable.compile") + "\n\n" + 
buf);
+buf.append("\n\nStacktrace:");
+throw new 
JasperException(Localizer.getMessage("jsp.error.unable.compile") + ": " + buf);
 }
 
 /**

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java?view=diff&rev=489981&r1=489980&r2=489981
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java 
(original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/ErrorDispatcher.java 
Sat Dec 23 20:28:38 2006
@@ -23,6 +23,7 @@
 import java.net.MalformedURLException;
 
 import org.apache.jasper.JasperException;
+import org.apache.jasper.JspCompilationContext;
 import org.xml.sax.SAXException;
 
 /**
@@ -501,8 +502,24 @@
  * @return JavacErrorDetail The error details
  * @throws JasperException
  */
-public static JavacErrorDetail createJavacError(String fname, Node.Nodes 
page, 
+public static JavacErrorDetail createJavacError(String fname,
+Node.Nodes page, 
 StringBuffer errMsgBuf, int lineNum) throws JasperException {
+return createJavacError(fname, page, errMsgBuf, lineNum, null);
+}
+/**
+ * @param fname
+ * @param page
+ * @param errMsgBuf
+ * @param lineNum
+ * @param ctxt
+ * @return JavacErrorDetail The error details
+ * @throws JasperException
+ */
+public static JavacErrorDetail createJavacError(String fname,
+Node.Nodes page, 
+StringBuffer errMsgBuf, int lineNum, JspCompilationContext ctxt)
+throws JasperException {
 JavacErrorDetail javacError;
 // Attempt to map javac error line number to line in JSP page
 ErrorVisitor errVisit