cvs commit: jakarta-tomcat-catalina/webapps/admin/resources deleteUserDatabases.jsp listUserDatabases.jsp listUserDatabases.jspf userDatabase.jsp userDatabases.jspf
amyroh 2003/03/26 00:05:22
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ListUserDatabasesAction.java ResourceUtils.java
SaveUserDatabaseAction.java
SetUpUserDatabaseAction.java UserDatabaseForm.java
UserDatabasesForm.java
webapps/admin/resources deleteUserDatabases.jsp
listUserDatabases.jsp listUserDatabases.jspf
userDatabase.jsp userDatabases.jspf
Log:
Fix UserDatabase.
Revision ChangesPath
1.2 +11 -5
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java
Index: ListUserDatabasesAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ListUserDatabasesAction.java 18 Jul 2002 16:48:27 - 1.1
+++ ListUserDatabasesAction.java 26 Mar 2003 08:05:19 - 1.2
@@ -147,10 +147,16 @@
HttpSession session = request.getSession();
Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
+String domain = request.getParameter(domain);
+if (domain != null) {
+domain = URLDecoder.decode(domain);
+}
// Create a form bean containing the requested MBean Names
UserDatabasesForm userDatabasesForm = null;
try {
- userDatabasesForm = ResourceUtils.getUserDatabasesForm(mserver);
+ userDatabasesForm =
+ResourceUtils.getUserDatabasesForm(mserver, domain);
+ userDatabasesForm.setDomain(domain);
} catch (Exception e) {
getServlet().log(resources.getMessage
(locale,
1.7 +6 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceUtils.java23 Mar 2003 02:10:27 - 1.6
+++ ResourceUtils.java26 Mar 2003 08:05:19 - 1.7
@@ -426,10 +426,10 @@
*
* @exception Exception if an error occurs
*/
-public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver)
+public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver,String
domain)
throws Exception {
-ObjectName rname = new ObjectName( RESOURCE_TYPE + GLOBAL_TYPE +
+ObjectName rname = new ObjectName( domain + RESOURCE_TYPE + GLOBAL_TYPE +
,class= + USERDB_CLASS + ,*);
Iterator iterator = (mserver.queryMBeans(rname, null).iterator());
1.3 +5 -5
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
Index: SaveUserDatabaseAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveUserDatabaseAction.java 18 Mar 2003 10:48:24 - 1.2
+++ SaveUserDatabaseAction.java 26 Mar 2003 08:05:19 - 1.3
@@ -186,7 +186,7 @@
ObjectName oname = null;
try {
-String domain = (new ObjectName(objectName)).getDomain();
+String domain = userDatabaseForm.getDomain();
// Construct the MBean Name for the naming source
oname = new ObjectName(domain +
ResourceUtils.NAMINGRESOURCES_TYPE +
1.2 +7 -5
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java
Index: SetUpUserDatabaseAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetUpUserDatabaseAction.java 18 Jul 2002 16:48:27 - 1.1
+++ SetUpUserDatabaseAction.java 26 Mar 2003 08:05:19 - 1.2
@@ -153,12 +153,14 @@
//
DO NOT REPLY [Bug 18354] New: - Error receiving XML/HTTP requests strings that are too long
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18354. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18354 Error receiving XML/HTTP requests strings that are too long Summary: Error receiving XML/HTTP requests strings that are too long Product: Tomcat 4 Version: 4.1.18 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I've written a servlet to receiving XML/HTTP requests send from Pocket PC applications. The request string is read into a StringBuffer. Subsequently this is read into a InputSource to be parsed. If the request string is too long (abt 20kb), it gets truncated before being parsed, thereby causing the SAXParser to throw an exception. I encounter this problem when using version 4.1.18, but not 4.0.3. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18222] - when I click on link to Webapps: Administration tomcat threw an exception.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18222. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18222 when I click on link to Webapps: Administration tomcat threw an exception. [EMAIL PROTECTED] changed: What|Removed |Added Priority|Other |High --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 09:08 --- when you run admin webapp: org.apache.jasper.JasperException: Cannot find message resources under key org.apache.struts.action.MESSAGE when you check admin webapp tree: - xml files contains ctrl+M - classes name are cutted is the binary correct? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes - New directory
remm2003/03/26 01:48:28 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org - New directory
remm2003/03/26 01:48:35 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache - New directory
remm2003/03/26 01:48:42 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina - New directory
remm2003/03/26 01:48:48 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager - New directory
remm2003/03/26 01:48:55 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF web.xml
remm2003/03/26 01:49:29 Modified:webapps/manager/WEB-INF web.xml Log: - Move manager classes. Revision ChangesPath 1.6 +3 -3 jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- web.xml 23 Mar 2003 16:10:21 - 1.5 +++ web.xml 26 Mar 2003 09:49:28 - 1.6 @@ -20,7 +20,7 @@ -- servlet servlet-nameManager/servlet-name -servlet-classorg.apache.catalina.servlets.ManagerServlet/servlet-class +servlet-classorg.apache.catalina.manager.ManagerServlet/servlet-class init-param param-namedebug/param-name param-value2/param-value @@ -28,7 +28,7 @@ /servlet servlet servlet-nameHTMLManager/servlet-name -servlet-classorg.apache.catalina.servlets.HTMLManagerServlet/servlet-class +servlet-classorg.apache.catalina.manager.HTMLManagerServlet/servlet-class init-param param-namedebug/param-name param-value2/param-value @@ -36,7 +36,7 @@ /servlet servlet servlet-nameStatus/servlet-name -servlet-classorg.apache.catalina.servlets.StatusManagerServlet/servlet-class +servlet-classorg.apache.catalina.manager.StatusManagerServlet/servlet-class init-param param-namedebug/param-name param-value0/param-value - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager build.xml
remm2003/03/26 01:50:35
Modified:webapps/manager build.xml
Log:
- Compile manager classes.
Revision ChangesPath
1.3 +18 -4 jakarta-tomcat-catalina/webapps/manager/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 15 Jan 2003 03:40:45 - 1.2
+++ build.xml 26 Mar 2003 09:50:35 - 1.3
@@ -15,6 +15,20 @@
property name=webapps.distvalue=../dist/
property name=webapp.name value=manager/
+ !-- Dependent JARs and files --
+ property name=servlet-api.jar
value=${api.home}/jsr154/dist/lib/servlet-api.jar/
+ property name=jsp-api.jar value=${api.home}/jsr152/dist/lib/jsp-api.jar/
+
+ !-- Construct Admin classpath --
+ path id=manager.classpath
+pathelement location=${catalina.deploy}/classes/
+pathelement location=${commons-fileupload.jar}/
+pathelement location=${commons-modeler.jar}/
+pathelement location=${jmx.jar}/
+pathelement location=${servlet-api.jar}/
+pathelement location=${jsp-api.jar}/
+ /path
+
!-- === BUILD: Create Directories == --
target name=build-prepare
@@ -22,6 +36,7 @@
mkdir dir=${webapps.build}/${webapp.name}/
mkdir dir=${webapps.build}/${webapp.name}/images/
mkdir dir=${webapps.build}/${webapp.name}/WEB-INF/
+mkdir dir=${webapps.build}/${webapp.name}/WEB-INF/classes/
/target
@@ -57,14 +72,13 @@
/fileset
/copy
-!--
javac srcdir=WEB-INF/classes
destdir=${webapps.build}/${webapp.name}/WEB-INF/classes
- classpath=${servlet.jar}
debug=${compile.debug} deprecation=${compile.deprecation}
optimize=${compile.optimize}
- excludes=**/CVS/**/
---
+ excludes=**/CVS/**
+ classpath refid=manager.classpath /
+/javac
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina build.xml
remm2003/03/26 01:51:23
Modified:catalina build.xml
Log:
- Remove manager JAR,
Revision ChangesPath
1.48 +0 -7 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- build.xml 20 Mar 2003 23:29:34 - 1.47
+++ build.xml 26 Mar 2003 09:51:23 - 1.48
@@ -1031,13 +1031,6 @@
/fileset
/jar
-!-- Servlets - Manager Servlet --
-jar jarfile=${catalina.deploy}/server/lib/servlets-manager.jar index=true
- fileset dir=${classes.dir}
-include name=org/apache/catalina/servlets/*Manager* /
- /fileset
-/jar
-
!-- Servlets - SSI Servlet --
jar jarfile=${catalina.deploy}/server/lib/servlets-ssi.renametojar
index=true
fileset dir=${classes.dir}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets LocalStrings.properties LocalStrings_fr.properties LocalStrings_ja.properties HTMLManagerServlet.java ManagerServlet.java StatusManagerServlet.java
remm2003/03/26 01:53:10
Modified:catalina/src/share/org/apache/catalina/servlets
LocalStrings.properties LocalStrings_fr.properties
LocalStrings_ja.properties
Removed: catalina/src/share/org/apache/catalina/servlets
HTMLManagerServlet.java ManagerServlet.java
StatusManagerServlet.java
Log:
- Move manager classes.
Revision ChangesPath
1.4 +0 -75
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 15 Jan 2003 03:40:42 - 1.3
+++ LocalStrings.properties 26 Mar 2003 09:53:10 - 1.4
@@ -2,87 +2,12 @@
defaultservlet.upto=Up to:
defaultservlet.subdirectories=Subdirectories:
defaultservlet.files=Files:
-htmlManagerServlet.appsAvailable=Running
-htmlManagerServlet.appsName=Display Name
-htmlManagerServlet.appsPath=Path
-htmlManagerServlet.appsReload=Reload
-htmlManagerServlet.appsRemove=Remove
-htmlManagerServlet.appsSessions=Sessions
-htmlManagerServlet.appsStart=Start
-htmlManagerServlet.appsStop=Stop
-htmlManagerServlet.appsTasks=Commands
-htmlManagerServlet.appsTitle=Applications
-htmlManagerServlet.helpHtmlManager=HTML Manager Help
-htmlManagerServlet.helpHtmlManagerFile=html-manager-howto.html
-htmlManagerServlet.helpManager=Manager Help
-htmlManagerServlet.helpManagerFile=manager-howto.html
-htmlManagerServlet.installButton=Install
-htmlManagerServlet.installConfig=XML Configuration file URL:
-htmlManagerServlet.installPath=Context Path (optional):
-htmlManagerServlet.installServer=Install directory or WAR file located on server
-htmlManagerServlet.installTitle=Install
-htmlManagerServlet.installUpload=Upload a WAR file to install
-htmlManagerServlet.installUploadFail=FAIL - Install Upload Failed, Exception: {0}
-htmlManagerServlet.installUploadFile=Select WAR file to upload
-htmlManagerServlet.installUploadNotWar=FAIL - File uploaded \{0}\ must be a .war
-htmlManagerServlet.installUploadNoFile=FAIL - File upload failed, no file
-htmlManagerServlet.installUploadWarExists=FAIL - War file \{0}\ already exists on
server
-htmlManagerServlet.installWar=WAR or Directory URL:
-htmlManagerServlet.list=List Applications
-htmlManagerServlet.manager=Manager
-htmlManagerServlet.messageLabel=Message:
-htmlManagerServlet.serverJVMVendor=JVM Vendor
-htmlManagerServlet.serverJVMVersion=JVM Version
-htmlManagerServlet.serverOSArch=OS Architecture
-htmlManagerServlet.serverOSName=OS Name
-htmlManagerServlet.serverOSVersion=OS Version
-htmlManagerServlet.serverTitle=Server Information
-htmlManagerServlet.serverVersion=Tomcat Version
-htmlManagerServlet.title=Tomcat Web Application Manager
invokerServlet.allocate=Cannot allocate servlet instance for path {0}
invokerServlet.cannotCreate=Cannot create servlet wrapper for path {0}
invokerServlet.deallocate=Cannot deallocate servlet instance for path {0}
invokerServlet.invalidPath=No servlet name or class was specified in path {0}
invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher
invokerServlet.noWrapper=Container has not called setWrapper() for this servlet
-managerServlet.alreadyContext=FAIL - Application already exists at path {0}
-managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use
-managerServlet.cannotInvoke=Cannot invoke manager servlet through invoker
-managerServlet.configured=OK - Installed application from context file {0}
-managerServlet.deployed=OK - Deployed application at context path {0}
-managerServlet.exception=FAIL - Encountered exception {0}
-managerServlet.installed=OK - Installed application at context path {0}
-managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
-managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
-managerServlet.listed=OK - Listed applications for virtual host {0}
-managerServlet.listitem={0}:{1}:{2}:{3}
-managerServlet.noAppBase=FAIL - Cannot identify application base for context path
{0}
-managerServlet.noCommand=FAIL - No command was specified
-managerServlet.noContext=FAIL - No context exists for path {0}
-managerServlet.noDirectory=FAIL - Non-directory document base for path {0}
-managerServlet.noDocBase=FAIL - Cannot remove document base for path {0}
-managerServlet.noGlobal=FAIL - No global JNDI resources are available
-managerServlet.noReload=FAIL - Reload not supported on WAR deployed at path {0}
-managerServlet.noRename=FAIL - Cannot deploy uploaded WAR for path {0}
cvs commit: jakarta-tomcat-5 build.properties.default
remm2003/03/26 01:53:38
Modified:.build.properties.default
Log:
- Update to NSIS 2.0 b3.
Revision ChangesPath
1.81 +3 -3 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- build.properties.default 17 Mar 2003 19:56:49 - 1.80
+++ build.properties.default 26 Mar 2003 09:53:38 - 1.81
@@ -183,10 +183,10 @@
# - NSIS, version 2.0 or later -
-nsis.home=${base.path}/nsis-2.0-b2
+nsis.home=${base.path}/nsis-2.0-b3
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
-nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b2.exe
+nsis.loc=http://telia.dl.sourceforge.net/sourceforge/nsis/nsis20b3.exe
# - Struts, version 1.1 or later -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 build.xml
remm2003/03/26 01:54:38
Modified:.build.xml
Log:
- Build JARs for webapps, in order to save space.
Revision ChangesPath
1.117 +28 -4 jakarta-tomcat-5/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- build.xml 21 Mar 2003 15:54:27 - 1.116
+++ build.xml 26 Mar 2003 09:54:38 - 1.117
@@ -545,9 +545,9 @@
property name=flags.hide value=true /
/ant
-antcall target=fix-webapps /
-
+!-- Precompiling and fixing webapps --
antcall target=build-webapps-precompile /
+antcall target=fix-webapps /
/target
@@ -572,8 +572,26 @@
copy file=./CHANGELOG
tofile=${tomcat.build}/webapps/tomcat-docs/CHANGELOG.txt /
+!-- Build JARs for webapps classes --
+mkdir dir=${tomcat.build}/server/webapps/admin/WEB-INF/lib /
+jar
jarfile=${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar
+ index=true
+ fileset dir=${tomcat.build}/server/webapps/admin/WEB-INF/classes
+ include name=**/*.class /
+ include name=**/*.properties /
+ /fileset
+/jar
+mkdir dir=${tomcat.build}/server/webapps/manager/WEB-INF/lib /
+jar
jarfile=${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
+ index=true
+ fileset dir=${tomcat.build}/server/webapps/manager/WEB-INF/classes
+ include name=**/*.class /
+ include name=**/*.properties /
+ /fileset
+/jar
+
!-- Add XML declarations for admin and manager --
-move file=${tomcat.build}/server/webapps/manager/manager.xml
+copy file=${tomcat.build}/server/webapps/manager/manager.xml
todir=${tomcat.build}/webapps /
copy file=${tomcat.build}/server/webapps/admin/admin.xml
todir=${tomcat.build}/webapps /
@@ -737,8 +755,11 @@
!-- == COMBO: Clean All Directories --
target name=clean
description=Clean all components
+
delete dir=${tomcat.build}/
+delete dir=${tomcat.embed}/
+
echoTarget: Servlet API - Clean .../echo
ant dir=${api.home}/jsr154 target=clean/
@@ -957,7 +978,10 @@
fileset dir=${tomcat.build}/server/lib /
/copy
copy todir=${tomcat.dist}/server/webapps
- fileset dir=${tomcat.build}/server/webapps /
+ fileset dir=${tomcat.build}/server/webapps
+exclude name=${tomcat.build}/server/webapps/admin/WEB-INF/classes/** /
+exclude name=${tomcat.build}/server/webapps/manager/WEB-INF/classes/** /
+ /fileset
/copy
!--
copy todir=${tomcat.dist}/shared/lib
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18222] - when I click on link to Webapps: Administration tomcat threw an exception.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18222. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18222 when I click on link to Webapps: Administration tomcat threw an exception. --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 10:14 --- it seems that tar binary used is from Operating System not from GNU. pls check with the tar binary to GNU tar binary and il will be ok. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat Jdk14Compat.java JdkCompat.java
remm2003/03/26 03:01:39
Modified:util/java/org/apache/tomcat/util/compat Jdk14Compat.java
JdkCompat.java
Log:
- Use JDK compat for Runtime.maxMemory().
Revision ChangesPath
1.3 +11 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java
Index: Jdk14Compat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/Jdk14Compat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jdk14Compat.java 4 Feb 2003 07:16:47 - 1.2
+++ Jdk14Compat.java 26 Mar 2003 11:01:39 - 1.3
@@ -114,4 +114,12 @@
}
+/**
+ * Return the maximum amount of memory the JVM will attempt to use.
+ */
+public long getMaxMemory() {
+return Runtime.getRuntime().maxMemory();
+}
+
+
}
1.4 +11 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java
Index: JdkCompat.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/compat/JdkCompat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JdkCompat.java5 Feb 2003 03:47:12 - 1.3
+++ JdkCompat.java26 Mar 2003 11:01:39 - 1.4
@@ -193,4 +193,12 @@
}
+/**
+ * Return the maximum amount of memory the JVM will attempt to use.
+ */
+public long getMaxMemory() {
+return (-1L);
+}
+
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/03/26 03:01:54 Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java Log: - Use JDK compat for Runtime.maxMemory(). Revision ChangesPath 1.2 +7 -5 jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java Index: StatusManagerServlet.java === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StatusManagerServlet.java 26 Mar 2003 09:49:19 - 1.1 +++ StatusManagerServlet.java 26 Mar 2003 11:01:53 - 1.2 @@ -87,6 +87,8 @@ import org.apache.commons.modeler.Registry; +import org.apache.tomcat.util.compat.JdkCompat; + /** * This servlet will display a complete status of the HTTP/1.1 connector. * @@ -271,7 +273,7 @@ writer.print( Total memory: ); writer.print(Runtime.getRuntime().totalMemory()); writer.print( Max memory: ); -writer.print(Runtime.getRuntime().maxMemory()); +writer.print(JdkCompat.getJdkCompat().getMaxMemory()); writer.print(br/); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP] Build timed out - jk2
This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-03-26/jakarta-tomcat-jk-native2.html
Buildfile: build.xml
init.taskdef:
guess.os:
[echo] build.properties i386.Linux
[echo] Linux:true Win32:${win32} Netware:${netware} Solaris:${solaris}
HPUX:${hpux}
init.win32.properties:
init.win32.mc:
init.win32:
init.netware:
init.os:
guess.server:
[echo] Apache2 /usr/local/apache2 true
[echo] Apache13 /usr true
[echo] IIS ${iis.home} ${iis.detect}
[echo] Iplanet ${iplanet.home} ${iplanet.detect}
[echo] JNI true
init:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk2
apache20:
[mkdir] Created dir:
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk2/apache2
[so] Compiling 42 out of 42
Compiling
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_channel.c
Compiling
/home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native2/common/jk_env.c
/home/rubys/bin/timeout: timed out
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP] Build timed out - jk
This email is autogenerated from the output from:
http://cvs.apache.org/builds/gump/2003-03-26/jakarta-tomcat-jk-native.html
Buildfile: build.xml
init:
[echo] /home/rubys
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk
[echo] linux=true solaris=${solaris} win32=${win32} hpux=${hpux}
netware=${netware}
apache20:
apache13:
iis:
netscape:
jni:
[mkdir] Created dir: /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk/jni
[so] Compiling 4 out of 4
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_map.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/common/jk_util.c
Compiling /home/rubys/jakarta/jakarta-tomcat-connectors/jk/native/jni/jk_jnicb.c
Linking /home/rubys/jakarta/jakarta-tomcat-connectors/jk/build/jk/jni/jni_connect.so
/home/rubys/bin/timeout: timed out
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF web.xml
The admin app's classes all live under org.apache.webapp.admin Would it be better to have the manager's classes reside beneath org.apache.webapp.manager, not org.apache.catalina.manager? That way, if any new webapp comes along it will also reside under org.apache.webapp? -Tim [EMAIL PROTECTED] wrote: remm2003/03/26 01:49:29 Modified:webapps/manager/WEB-INF web.xml Log: - Move manager classes. Revision ChangesPath 1.6 +3 -3 jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- web.xml 23 Mar 2003 16:10:21 - 1.5 +++ web.xml 26 Mar 2003 09:49:28 - 1.6 @@ -20,7 +20,7 @@ -- servlet servlet-nameManager/servlet-name -servlet-classorg.apache.catalina.servlets.ManagerServlet/servlet-class +servlet-classorg.apache.catalina.manager.ManagerServlet/servlet-class init-param param-namedebug/param-name param-value2/param-value @@ -28,7 +28,7 @@ SNIPPED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18361] New: - IIS doesn't like ;jsessionid within uri
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361 IIS doesn't like ;jsessionid within uri Summary: IIS doesn't like ;jsessionid within uri Product: Tomcat 4 Version: 4.1.19 Platform: All OS/Version: Windows XP Status: NEW Severity: Normal Priority: Other Component: Connector:Coyote HTTP/1.1 AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] AFAIK Servlet API v2.3 defines that in case of URL rewriting session id should be put into the uri before query params separated by semicolon, like: www.xxx.com/uri;jsessionid=...?params The problem is, that MS IIS doesn't let such URL go through to the application server, at least not using forwarding by extension it just doesnt recognize the extension it should. Using the previous API (session id as one of the query params) worked perfectly. Now currently we use WebLogic v6.1 as our application server. Starting with SP3 I can set a dedicated parameter forcing WLS to use a query param instead of ;jsessionid in the uri. We are now planning to migrate from WLS to Tomcat, but: I have looked into Tomcats source code, this method of rewriting URLs is not parametrized, so I cannot persuade Tomcat to do the same. Possible solutions: a) get a fix for IIS our webmaster has called MS, they say they knew about it but did not plan to do anything. We could make our own isapi DLL, but we are on our own. In fact we do use IIS v4, because of instabilities in IIS v5 (says our webmaster). b) forward based by path not the extension: it hasnt been tested so is not guaranteed to work, and we have so many apps using the same path for static and dynamic content, where the static content should remain on IIS, and where static is under the control of CMS, that it might be even more difficult than to make an isapi.dll :-) c) make a Tomcat specific filter (valve, connector I am yet not sure), which would parse outgoing responses and exchange ;jsessionid= with a query param, then parse incoming requests and set sessionid based on this param d) patch Tomcat using inheritance. Not so easy, since the required methods (HttpProcessor.processRequest, HttpResponseBase.toEncoded) are private. HttpResponseFacade is final, so I cant overwrite encodeURL as well. Make my own Façade? e) patch Tomcat: dont like the idea, since I am then cut off from the future Tomcat development f) similar solution as WLS: a parameter that decides how to construct URLs during rewriting. Is it sensible? What would you say to that? Any other ideas? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF web.xml
I agree, the manager should be moved to the org.apache.webapp.manager package. Glenn Tim Funk wrote: The admin app's classes all live under org.apache.webapp.admin Would it be better to have the manager's classes reside beneath org.apache.webapp.manager, not org.apache.catalina.manager? That way, if any new webapp comes along it will also reside under org.apache.webapp? -Tim [EMAIL PROTECTED] wrote: remm2003/03/26 01:49:29 Modified:webapps/manager/WEB-INF web.xml Log: - Move manager classes. Revision ChangesPath 1.6 +3 -3 jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- web.xml23 Mar 2003 16:10:21 -1.5 +++ web.xml26 Mar 2003 09:49:28 -1.6 @@ -20,7 +20,7 @@ -- servlet servlet-nameManager/servlet-name - servlet-classorg.apache.catalina.servlets.ManagerServlet/servlet-class + servlet-classorg.apache.catalina.manager.ManagerServlet/servlet-class init-param param-namedebug/param-name param-value2/param-value @@ -28,7 +28,7 @@ SNIPPED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5 tomcat.nsi
remm2003/03/26 04:14:34
Modified:.tomcat.nsi
Log:
- Update to NSIS 2.0 b3.
Revision ChangesPath
1.29 +7 -7 jakarta-tomcat-5/tomcat.nsi
Index: tomcat.nsi
===
RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tomcat.nsi13 Mar 2003 16:01:53 - 1.28
+++ tomcat.nsi26 Mar 2003 12:14:34 - 1.29
@@ -2,6 +2,12 @@
; Tomcat script for Nullsoft Installer
; $Id$
+ ;Compression options
+ CRCCheck on
+ SetCompress force
+ SetCompressor bzip2
+ SetDatablockOptimize on
+
!include MUI.nsh
!define MUI_PRODUCT Apache Tomcat
@@ -39,12 +45,6 @@
;General
OutFile tomcat-installer.exe
-
- ;Compression options
- CRCCheck on
- SetCompress force
- SetCompressor bzip2
- SetDatablockOptimize on
;Install Options pages
LangString TEXT_JVM_TITLE ${LANG_ENGLISH} Java Virtual Machine
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18361] - IIS doesn't like ;jsessionid within uri
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361 IIS doesn't like ;jsessionid within uri --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 14:17 --- Another solution: Don't use IIS. Use Apache's http server to front Tomcat. We did this on our win2k servers and even noticed a marked speed improvement (and that's with only using the mod_proxy). Plus we were finally able to use mod_gzip! - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18369] New: - NullPointerException in StoreBase
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18369. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18369 NullPointerException in StoreBase Summary: NullPointerException in StoreBase Product: Tomcat 4 Version: 4.1.24 Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Catalina:Modules AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] JDBCStore.keys() can return null. java.lang.NullPointerException at org.apache.catalina.session.StoreBase.processExpires(StoreBase.java:306) at org.apache.catalina.session.StoreBase.run(StoreBase.java:376) at java.lang.Thread.run(Thread.java:536) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
tagpool wrong constructor?
Hello,
In a pre-compiled jsp the following constructor of TagHandlerPool is called.
public searchagenda_jsp() {
_jspx_tagPool_bn_getConnection_id_database = new
org.apache.jasper.runtime.TagHandlerPool();
}
But in the code of TagHandlerPool this is noted:
public TagHandlerPool() {
// Nothing - jasper generated servlets call the other constructor,
// this should be used in future + init .
}
Is this correct behaviour?
Or do I mis something?
Greetings,
Ronald.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Jasper 4.1.24 tag
Did jasper get a 4.1.24 tag when tomcat 4.1.24 got released, as I can see all the other 4.1.x tags but .24 Thanks, John - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18361] - IIS doesn't like ;jsessionid within uri
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361 IIS doesn't like ;jsessionid within uri --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 14:45 --- This one is out of question. The whole story happens in a multi-thousand-employees company - the inert ion of such a big animal is enormous. Actually the applications servers and web servers do not belong to the same department. We have absolutely no influence on what web server do the others choose, besides they have software relying on IIS that must be used. The good (and surprising) is that they take apache into account at all, just that it will take some time until they have tested it and found replacements for all the stuff they have. And waiting until they migrate to apache is another solution that wont work. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18361] - IIS doesn't like ;jsessionid within uri
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361 IIS doesn't like ;jsessionid within uri [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 14:58 --- IIS doesn't handle forwarding very well in the first place. This is an IIS limitation - not a tomcat limitation. You could try forwarding by path (I'm assuming you are using BEA's wlforward ISAPI plugin). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18238] - Client (JSP) request abort causes SEVERE error in server log
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18238. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18238 Client (JSP) request abort causes SEVERE error in server log --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 15:15 --- This occurs for me with Apache 2.0.43, mod_jk 1.2.2, and Tomcat 4.1.18 or 4.1.20 -- though I've never had it occur if I let all pages (and frames therein, of course) load completely. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15417] - Add port for forced compilation of JSP pages
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15417. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15417 Add port for forced compilation of JSP pages [EMAIL PROTECTED] changed: What|Removed |Added Summary|Add port for forced |Add port for forced |compilation of pages|compilation of JSP pages - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18361] - IIS doesn't like ;jsessionid within uri
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18361 IIS doesn't like ;jsessionid within uri --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 16:01 --- I have never stated that this were a Tomcat limitation, I was just looking for a feedback from Tomcat community - and I got it. Thats okay. OTOH IIS with its limitations is fact of life, organisations like mine also. In this case BEA has chosen a solution thats easy for its customers, even if it doesnt follow the standard and we were happy they did it - dont take me wrong, I now Tomcat is open source and nobody gets paid for the working on it, contrary to people working on BEA WebLogic. If the migration starts and the only solution my boss accepts would be to patch Tomcat, would you accept a change (I already submitted patches for Eclipse for that matter)? Or would you say its non-standard so we wont use it? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast McastMembership.java
fhanik 2003/03/26 09:24:50
Modified:modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastMembership.java
Log:
fixed concurrent modification exception
Revision ChangesPath
1.2 +22 -10
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java
Index: McastMembership.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastMembership.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- McastMembership.java 19 Feb 2003 20:32:10 - 1.1
+++ McastMembership.java 26 Mar 2003 17:24:50 - 1.2
@@ -136,18 +136,19 @@
* @return the list of expired members
*/
public synchronized McastMember[] expire(long maxtime) {
-Iterator i = map.keySet().iterator();
+MbrEntry[] members = getMemberEntries();
java.util.ArrayList list = new java.util.ArrayList();
-while ( i.hasNext() ) {
-MbrEntry entry = (MbrEntry)map.get(i.next());
+for (int i=0; imembers.length; i++) {
+MbrEntry entry = members[i];
if ( entry.hasExpired(maxtime) ) {
list.add(entry.getMember());
-map.remove(entry.getMember().getName());
}//end if
}//while
McastMember[] result = new McastMember[list.size()];
list.toArray(result);
+for ( int j=0; jresult.length; j++) map.remove(result[j].getName());
return result;
+
}//expire
/**
@@ -156,12 +157,23 @@
*/
public synchronized McastMember[] getMembers() {
McastMember[] result = new McastMember[map.size()];
-java.util.Iterator i = map.keySet().iterator();
+java.util.Iterator i = map.entrySet().iterator();
int pos = 0;
while ( i.hasNext() )
-result[pos++] = ((MbrEntry)map.get(i.next())).getMember();
+result[pos++] =
((MbrEntry)((java.util.Map.Entry)i.next()).getValue()).getMember();
return result;
}
+
+protected synchronized MbrEntry[] getMemberEntries()
+{
+MbrEntry[] result = new MbrEntry[map.size()];
+java.util.Iterator i = map.entrySet().iterator();
+int pos = 0;
+while ( i.hasNext() )
+result[pos++] = ((MbrEntry)((java.util.Map.Entry)i.next()).getValue());
+return result;
+}
+
/**
* Inner class that represents a member entry
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitter.java SimpleTcpCluster.java
fhanik 2003/03/26 09:40:02
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java SimpleTcpCluster.java
Log:
fixed concurrent modification exceptions
Revision ChangesPath
1.3 +9 -11
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Index: ReplicationTransmitter.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReplicationTransmitter.java 20 Mar 2003 20:46:14 - 1.2
+++ ReplicationTransmitter.java 26 Mar 2003 17:40:02 - 1.3
@@ -108,10 +108,10 @@
public synchronized void stop()
{
-java.util.Iterator i = map.keySet().iterator();
+java.util.Iterator i = map.entrySet().iterator();
while ( i.hasNext() )
{
-IDataSender sender = (IDataSender)map.get(i.next());
+IDataSender sender =
(IDataSender)((java.util.HashMap.Entry)i.next()).getValue();
if ( sender.isConnected() )
{
try { sender.disconnect(); } catch ( Exception x ){}
@@ -121,12 +121,11 @@
public synchronized IDataSender[] getSenders()
{
-java.util.Iterator i = map.keySet().iterator();
+java.util.Iterator i = map.entrySet().iterator();
java.util.Vector v = new java.util.Vector();
while ( i.hasNext() )
{
-String key = (String)i.next();
-IDataSender sender = (IDataSender)map.get(key);
+IDataSender sender =
(IDataSender)((java.util.HashMap.Entry)i.next()).getValue();
if ( sender!=null) v.addElement(sender);
}
IDataSender[] result = new IDataSender[v.size()];
@@ -145,13 +144,12 @@
public void sendMessage(byte[] indata) throws java.io.IOException
{
-java.util.Iterator i = map.keySet().iterator();
+java.util.Iterator i = map.entrySet().iterator();
java.util.Vector v = new java.util.Vector();
byte[] data = XByteBuffer.createDataPackage(indata);
while ( i.hasNext() )
{
-String key = (String)i.next();
-IDataSender sender = (IDataSender)map.get(key);
+IDataSender sender =
(IDataSender)((java.util.HashMap.Entry)i.next()).getValue();
try
{
if (!sender.isConnected())
1.9 +8 -8
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
Index: SimpleTcpCluster.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimpleTcpCluster.java 20 Mar 2003 20:46:14 - 1.8
+++ SimpleTcpCluster.java 26 Mar 2003 17:40:02 - 1.9
@@ -726,7 +726,7 @@
* during installation
*/
public void installContext(String contextPath, URL war) {
-return;
+System.out.println(\n\n\n\nCluster Install called for
context:+contextPath+\n\n\n\n);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitter.java
fhanik 2003/03/26 09:44:19
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java
Log:
fixed compilation, wonder why it compiled in jbuilder
Revision ChangesPath
1.4 +6 -6
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java
Index: ReplicationTransmitter.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ReplicationTransmitter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReplicationTransmitter.java 26 Mar 2003 17:40:02 - 1.3
+++ ReplicationTransmitter.java 26 Mar 2003 17:44:19 - 1.4
@@ -111,7 +111,7 @@
java.util.Iterator i = map.entrySet().iterator();
while ( i.hasNext() )
{
-IDataSender sender =
(IDataSender)((java.util.HashMap.Entry)i.next()).getValue();
+IDataSender sender =
(IDataSender)((java.util.Map.Entry)i.next()).getValue();
if ( sender.isConnected() )
{
try { sender.disconnect(); } catch ( Exception x ){}
@@ -125,7 +125,7 @@
java.util.Vector v = new java.util.Vector();
while ( i.hasNext() )
{
-IDataSender sender =
(IDataSender)((java.util.HashMap.Entry)i.next()).getValue();
+IDataSender sender =
(IDataSender)((java.util.Map.Entry)i.next()).getValue();
if ( sender!=null) v.addElement(sender);
}
IDataSender[] result = new IDataSender[v.size()];
@@ -149,7 +149,7 @@
byte[] data = XByteBuffer.createDataPackage(indata);
while ( i.hasNext() )
{
-IDataSender sender =
(IDataSender)((java.util.HashMap.Entry)i.next()).getValue();
+IDataSender sender =
(IDataSender)((java.util.Map.Entry)i.next()).getValue();
try
{
if (!sender.isConnected())
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16001] - Tag.release() not invoked
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16001. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16001 Tag.release() not invoked --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 18:03 --- I agree that initializing variables in doStartTag() doesn't make sense, since the property sets are already called BEFORE doStartTag() according to the spec. So, where does this leave the programmers a place to re-initialize the veriables (most importantly the optional custom tag variables). I figure that doAfterBody() is no good because it is called multiple times for BodyTag handlers. So, the only place left is to override setPageContext() and have it call super.setPageContext() AND release(). This is obviously a hack and doesn't seem like a good answer, but I don't see any other choice. Is there one? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationContext.java ApplicationContextFacade.java
jfarcand2003/03/26 10:21:51
Modified:catalina/src/share/org/apache/catalina/core
ApplicationContext.java
ApplicationContextFacade.java
Log:
Better handle exception:
- throw only expected exception
- throw RuntimeException if a method throw an unexpected exception
Revision ChangesPath
1.10 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationContext.java 4 Mar 2003 01:57:05 - 1.9
+++ ApplicationContext.java 26 Mar 2003 18:21:50 - 1.10
@@ -467,7 +467,7 @@
throws MalformedURLException {
if (!path.startsWith(/)) {
-throw new
MalformedURLException(sm.getString(applicationContext.requestDispatcher.iae));
+throw new
MalformedURLException(sm.getString(applicationContext.requestDispatcher.iae, path));
}
path = normalize(path);
1.5 +87 -24
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
Index: ApplicationContextFacade.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationContextFacade.java 20 Mar 2003 20:06:37 - 1.4
+++ ApplicationContextFacade.java 26 Mar 2003 18:21:50 - 1.5
@@ -118,7 +118,7 @@
private HashMap objectCache;
-private static org.apache.commons.logging.Log log=
+private static org.apache.commons.logging.Log sysLog=
org.apache.commons.logging.LogFactory.getLog(
ApplicationContextFacade.class );
@@ -206,7 +206,14 @@
public URL getResource(String path)
throws MalformedURLException {
-return (URL)doPrivileged(getResource, new Object[]{path});
+try{
+return (URL)invokeMethod(context, getResource, new Object[]{path});
+}catch(Throwable t){
+if (t instanceof MalformedURLException){
+throw (MalformedURLException)t;
+}
+return null;
+}
}
@@ -227,7 +234,14 @@
public Servlet getServlet(String name)
throws ServletException {
- return (Servlet)doPrivileged(getServlet, new Object[]{name});
+try{
+return (Servlet)invokeMethod(context, getServlet, new Object[]{name});
+} catch (Throwable t){
+if (t instanceof ServletException){
+throw (ServletException) t;
+}
+return null;
+}
}
@@ -301,8 +315,39 @@
}
+/**
+ * Use reflection to invoke the requested method. Cache the method object
+ * to speed up the process
+ * @param appContext The AppliationContext object on which the method
+ * will be invoked
+ * @param methodName The method to call.
+ * @param params The arguments passed to the called method.
+ */
+private Object doPrivileged(ApplicationContext appContext,
+final String methodName,
+final Object[] params) {
+try{
+return invokeMethod(appContext, methodName, params );
+} catch (Throwable t){
+throw new RuntimeException(t.getMessage());
+}
+
+}
+
+
+/**
+ * Use reflection to invoke the requested method. Cache the method object
+ * to speed up the process
+ * will be invoked
+ * @param methodName The method to call.
+ * @param params The arguments passed to the called method.
+ */
private Object doPrivileged(final String methodName, final Object[] params){
-return doPrivileged(context, methodName,params);
+try{
+return invokeMethod(context, methodName, params);
+}catch(Throwable t){
+throw new RuntimeException(t.getMessage());
+}
}
@@ -314,9 +359,11 @@
* @param methodName The method to call.
* @param params The arguments passed to the called method.
*/
-private Object doPrivileged(ApplicationContext appContext,
+private Object invokeMethod(ApplicationContext appContext,
final String methodName,
-
DO NOT REPLY [Bug 18381] New: - jsp compiler puts blank line when page directives are in more than one line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18381. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18381 jsp compiler puts blank line when page directives are in more than one line Summary: jsp compiler puts blank line when page directives are in more than one line Product: Tomcat 4 Version: 4.0.6 Final Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi, We are developing a report module using itext software to produce PDF reports. we use JSP's. The jsp contains page directives in multiple lines. What is happening here, while jsp is being compiled, it puts the carriagefeed in the .dat file and puts spaces in produced html file(i.e if you see in .java file, the reference to _jsp_html_data[0] to [5]. in case of five import statements) Because of this the generated pdf report is getting corrupted. The logic shall be if there is a carriage feed or line feed from the end of tag to the starting of tag, the compiler shall not put the carriage feed info in .dat file. If any one needs more info pls email me. Thanks, Bhaskar - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 6709] - Images on protected areas have not Last modified header
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6709. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6709 Images on protected areas have not Last modified header --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 18:33 --- There is a flag named disableProxyCaching in AuthenticatorBase.java which when set to false prevents the default behavior of adding no-cache response headers to all constrained resources which are not protected by SSL. The question is: How can I set this flag? PS: It seems to me that the default behavior should apply ONLY to resources that are subject to a security-constraint that specifies an auth-constraint. You could then explicitly specify public resources (i.e., list them in a security-constraint that has no auth-constraint) without preventing browsers and web proxies from caching them. This practice of using a security-constraint for every resource provides a clearer picture of your security model and allows you to use a catchall no-access constraint for the /* URL pattern. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16001] - Tag.release() not invoked
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16001. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16001 Tag.release() not invoked --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 18:33 --- If you look through the comments for this bug, the solution is defined by the JSP spec: a tag handler instance can _not_ be reused for occurances of the corresponding custom action that specify different optional attributes. Hence, there's no risk that a tag handler that has been used with an optional attribute is later used without that optional attribute. See this article for details: http://www.onjava.com/pub/a/onjava/2001/11/07/jsp12.html Page 2, the Tag handler life cycle and instance reuse section - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18381] - jsp compiler puts blank line when page directives are in more than one line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18381. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18381 jsp compiler puts blank line when page directives are in more than one line [EMAIL PROTECTED] changed: What|Removed |Added Priority|Other |Medium - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18381] - jsp compiler puts blank line when page directives are in more than one line
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18381. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18381 jsp compiler puts blank line when page directives are in more than one line [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 18:38 --- The JSP specification specifically defines the behavior you describe. If you don't want extra line feeds added, lay out the JSP elements so there are no line feeds, e.g.: %@ page contentType=text/html %%@ taglib uri=http://com.foo/bar.html; prefix=foo %foo:myAction bar=baz / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16116] - ResourceLink does not work within DefaultContext
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16116. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16116 ResourceLink does not work within DefaultContext --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 18:38 --- Created an attachment (id=5515) General DefaultContext issues? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18225] - Regression in Tomcat 5: Request failed to match default servlet
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18225. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18225 Regression in Tomcat 5: Request failed to match default servlet [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|CLOSED --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 18:39 --- Fix verified today. Thanks. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18383] New: - context path is set to / instead of
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18383. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18383 context path is set to / instead of Summary: context path is set to / instead of Product: Tomcat 4 Version: 4.1.24 Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Webapps:Administration AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] just tried to create a new context inside my test-virtualHost context path field: after commit changes and reloading tomcat it was impossible to delete this context by means of the admin webapp. generated links on index pages are also faulty = they always lead to http://file instead of http://virtualhost/file (html source: relative link shows //file instead of /file) i think the cause of this problem is that the path attribute is set to / inside the server.xml config file. when i changed it manually to path= (tomcat shudown - edit server.xml - start again) the context worked proper it was also possible to remove the context via admin webapp when the path is set to hth cybi - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18384] New: - creation of jdbc realms is not possible with mozilla 1.3
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18384. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18384 creation of jdbc realms is not possible with mozilla 1.3 Summary: creation of jdbc realms is not possible with mozilla 1.3 Product: Tomcat 4 Version: 4.1.24 Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Webapps:Administration AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] creation of new jdbc realms lead into -- HTTP Status 400 - Invalid path /realm/AddRealm was requested type Status report message Invalid path /realm/AddRealm was requested description The request sent by the client was syntactically incorrect (Invalid path /realm/AddRealm was requested). --- there must be something wrong with the javascript behind the selection field works well in internet explorer, but does not work with mozilla 1.3 hth cybi - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ContainerBase.java StandardPipeline.java
costin 2003/03/26 11:20:30
Modified:catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardPipeline.java
Log:
Moved valve registration/unregistration to StandardPipeline, which seems a better
place ( since the pipeline manages the valves ).
I don't know why ContainerBase implements Pipeline instead of just delegating to one.
Revision ChangesPath
1.16 +0 -44
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContainerBase.java24 Mar 2003 09:18:26 - 1.15
+++ ContainerBase.java26 Mar 2003 19:20:29 - 1.16
@@ -1197,26 +1197,6 @@
}
}
}
-// If we are registered and the valve is not - create a default name
-Valve valves[]=getValves();
-for( int i=0; ivalves.length; i++ ) {
-Valve valve=valves[i];
-//log.info(Valve: + this + + valve + + domain );
-if( valve instanceof ValveBase
-((ValveBase)valve).getObjectName()==null ) {
-try {
-ObjectName
vname=((ValveBase)valve).createObjectName(getDomain(),
-this.getObjectName());
-if( vname != null ) {
-((ValveBase)valve).setObjectName(vname);
-Registry.getRegistry().registerComponent(valve, vname,
valve.getClass().getName());
-((ValveBase)valve).setController(oname);
-}
-} catch( Throwable t ) {
-log.info( Can't register valve + valve , t );
-}
-}
-}
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(BEFORE_START_EVENT, null);
@@ -1342,16 +1322,6 @@
}
}
-//
-Valve valves[]=getValves();
-for( int i=0; ivalves.length; i++ ) {
-Valve valve=valves[i];
-if( valve instanceof ValveBase
-((ValveBase)valve).getObjectName()!=null ) {
-
Registry.getRegistry().unregisterComponent(((ValveBase)valve).getObjectName());
-}
-}
-
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
@@ -1468,21 +1438,7 @@
public synchronized void removeValve(Valve valve) {
pipeline.removeValve(valve);
-if( valve instanceof ValveBase ) {
-try {
-ValveBase vb=(ValveBase)valve;
-if( vb.getController()!=null
-vb.getController() == oname ) {
-
-ObjectName vname=vb.getObjectName();
-Registry.getRegistry().getMBeanServer().unregisterMBean(vname);
-}
-} catch( Throwable t ) {
-log.info( Can't unregister valve + valve , t );
-}
-}
fireContainerEvent(REMOVE_VALVE_EVENT, valve);
-
}
1.5 +47 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
Index: StandardPipeline.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardPipeline.java 20 Mar 2003 18:28:28 - 1.4
+++ StandardPipeline.java 26 Mar 2003 19:20:29 - 1.5
@@ -286,9 +286,13 @@
for (int i = 0; i valves.length; i++) {
if (valves[i] instanceof Lifecycle)
((Lifecycle) valves[i]).start();
+registerValve(valves[i]);
}
if ((basic != null) (basic instanceof Lifecycle))
((Lifecycle) basic).start();
+
+if( basic!=null )
+registerValve(basic);
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(START_EVENT, null);
@@ -320,18 +324,56 @@
started = false;
// Stop the Valves in our pipeline (including the basic), if any
-if ((basic != null) (basic instanceof Lifecycle))
+if ((basic != null) (basic instanceof Lifecycle))
((Lifecycle) basic).stop();
+if( basic!=null ) {
+
DO NOT REPLY [Bug 18225] - Regression in Tomcat 5: Request failed to match default servlet
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18225. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18225 Regression in Tomcat 5: Request failed to match default servlet --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 19:35 --- - Always verify using the CVS code - Always submit a test case (I did reproduce what you had explained, but there was no problem with what you described) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15875] - Support global sharing of tag libraries
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15875. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15875 Support global sharing of tag libraries [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 19:37 --- Fixed in Tomcat 5. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Http version error
Yes, the 2 spaces cause the 505 since the spec only allows 1 space. Now the 400 bad request is because you do not have a Host: header (like Craig mentionned, this is required in HTTP/1.1) Try HTTP/1.0 or alternatively make sure you have a Host: header - Renaud Claudio Bisegni [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] i have tryed now with one space tommy give me the erro BAd request thia is my code for create the http request snip/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18199] - Regression in Tomcat 5: UnavailableException thrown in init() return Status 404 not 503
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18199. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18199 Regression in Tomcat 5: UnavailableException thrown in init() return Status 404 not 503 --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 19:48 --- Created an attachment (id=5519) war file to help reproduce the problem - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18202] - Tomcat 5 regression: default Content-Type is set to text/plain
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18202. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18202 Tomcat 5 regression: default Content-Type is set to text/plain --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 19:52 --- Created an attachment (id=5520) test case - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18204] - Regression in Tomcat 5: no IllegalArgumentException thrown with new Cookie($test, Valueless);
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18204. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18204 Regression in Tomcat 5: no IllegalArgumentException thrown with new Cookie($test, Valueless); --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 20:00 --- Created an attachment (id=5521) testcase - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18201] - Tomcat 5 regression: getReader() doesnot throw UnsupportedEncodingException when bogus charset is used
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18201. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18201 Tomcat 5 regression: getReader() doesnot throw UnsupportedEncodingException when bogus charset is used --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 20:03 --- Created an attachment (id=5522) testcase war file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Http version error
thanks in advanced, but where i insert the host:header? first or at and ?? On Mercoledì, mar 26, 2003, at 20:05 Europe/Rome, Renaud Bruyeron wrote: Yes, the 2 spaces cause the 505 since the spec only allows 1 space. Now the 400 bad request is because you do not have a Host: header (like Craig mentionned, this is required in HTTP/1.1) Try HTTP/1.0 or alternatively make sure you have a Host: header - Renaud Claudio Bisegni [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] i have tryed now with one space tommy give me the erro BAd request thia is my code for create the http request snip/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Http version error
I'have tried now all work correctly, thanks to all of this mlist On Mercoledì, mar 26, 2003, at 20:05 Europe/Rome, Renaud Bruyeron wrote: Yes, the 2 spaces cause the 505 since the spec only allows 1 space. Now the 400 bad request is because you do not have a Host: header (like Craig mentionned, this is required in HTTP/1.1) Try HTTP/1.0 or alternatively make sure you have a Host: header - Renaud Claudio Bisegni [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] i have tryed now with one space tommy give me the erro BAd request thia is my code for create the http request snip/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
JK2 module for AOLserver
Hi, A question about enhancement adoption process - how long does it typically take for new code to show up in CVS, in nightly builds? What is the verification process for new code? I have posted enhancement request to the mailing list and to Bugzilla (http://issues.apache.org/bugzilla/show_bug.cgi?id=18283). Thanks, Alex - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup TldConfig.java
luehe 2003/03/26 12:40:37
Modified:catalina/src/share/org/apache/catalina/startup
TldConfig.java
Log:
Fixed Bugzilla 15875 (Support global sharing of tag libraries)
Revision ChangesPath
1.3 +186 -66
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TldConfig.java16 Feb 2003 19:40:21 - 1.2
+++ TldConfig.java26 Mar 2003 20:40:37 - 1.3
@@ -69,6 +69,8 @@
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.net.URLConnection;
+import java.net.URLClassLoader;
import java.net.JarURLConnection;
import java.net.URL;
import java.util.ArrayList;
@@ -106,6 +108,9 @@
private static org.apache.commons.logging.Log log=
org.apache.commons.logging.LogFactory.getLog( TldConfig.class );
+private static final String FILE_URL_PREFIX = file:;
+private static final int FILE_URL_PREFIX_LEN = FILE_URL_PREFIX.length();
+
// - Instance Variables
/**
@@ -199,32 +204,23 @@
}
}
-// Acquire this list of TLD resource paths to be processed
+/*
+ * Acquire the list of TLD resource paths, possibly embedded in JAR
+ * files, to be processed
+ */
Set resourcePaths = tldScanResourcePaths();
+ Set globalJarPaths = getGlobalJarPaths();
-if( tldCache!= null tldCache.exists()) {
-// Find last modified
-Iterator paths = resourcePaths.iterator();
-long lastModified=0;
-while (paths.hasNext()) {
-String path = (String) paths.next();
-URL url = context.getServletContext().getResource(path);
-if( url==null ) {
-log.info( Null url + path );
-break;
-}
-long lastM=url.openConnection().getLastModified();
-if( lastM lastModified ) lastModified=lastM;
-if( log.isDebugEnabled() )
-log.debug( Last modified + path + + lastM);
-}
-
-if( lastModified tldCache.lastModified()) {
+ // Check to see if we can use cached listeners
+if (tldCache != null tldCache.exists()) {
+long lastModified = getLastModified(resourcePaths, globalJarPaths);
+if (lastModified tldCache.lastModified()) {
processCache(tldCache);
return;
}
}
-// Scan each accumulated resource paths for TLDs to be processed
+
+// Scan each accumulated resource path for TLDs to be processed
Iterator paths = resourcePaths.iterator();
while (paths.hasNext()) {
String path = (String) paths.next();
@@ -234,7 +230,12 @@
tldScanTld(path);
}
}
-String list[]=getTldListeners();
+paths = globalJarPaths.iterator();
+while (paths.hasNext()) {
+tldScanJar((JarURLConnection) paths.next());
+}
+
+String list[] = getTldListeners();
if( tldCache!= null ) {
log.info( Saving tld cache: + tldCache + + list.length);
@@ -263,6 +264,48 @@
// Private Methods
+/*
+ * Returns the last modification date of the given sets of resources.
+ *
+ * @param resourcePaths
+ * @param globalJarPaths
+ *
+ * @return Last modification date
+ */
+private long getLastModified(Set resourcePaths, Set globalJarPaths)
+throws Exception {
+
+ long lastModified = 0;
+
+ Iterator paths = resourcePaths.iterator();
+ while (paths.hasNext()) {
+ String path = (String) paths.next();
+ URL url = context.getServletContext().getResource(path);
+ if (url == null) {
+ log.info( Null url + path );
+ break;
+ }
+ long lastM = url.openConnection().getLastModified();
+ if (lastM lastModified) lastModified = lastM;
+ if (log.isDebugEnabled()) {
+ log.debug( Last modified + path + + lastM);
+ }
+ }
+
+ paths = globalJarPaths.iterator();
+ while (paths.hasNext()) {
+ JarURLConnection conn = (JarURLConnection) paths.next();
+ long lastM = conn.getLastModified();
+
DO NOT REPLY [Bug 18389] New: - Unicode handling broken
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18389. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18389 Unicode handling broken Summary: Unicode handling broken Product: Tomcat 4 Version: 4.1.24 Platform: Sun OS/Version: Solaris Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Hi, I've never filed a bug before so forgive me if I do this wrong -- email me with any questions. I posted to tomcat-user and some people on the list told me to file a bug. I've been using Tomcat 4.0.6 for some time now, because neither 4.1.12 nor 4.1.18 handled my Unicode correctly. When 4.1.18 came out, my co-worker Paul Caton posted to tomcat-user asking for help on this issue. I had supposed by now the issue would have been solved, so I cheerily and with much anticipation installed 4.1.24. However, the unicode handling is still bad in 4.1.24, so we are sticking with 4.0.6. We're wondering if this issue is going to be addressed in future releases. I am willing to send the actual URLs of the tomcat servers on which the test documents reside to any developer who wants them, but I'd rather not post those URLs to the public at large. I can also send any jsp code, xsl stylesheets, Xinclude stuff, etc. In lieu of that here, I'll just give the URLs of two comparative screenshots to show the differences in the Unicode handling: bad: http://dev.stg.brown.edu/screenshots/acsam-4.1.24.jpg good: http://dev.stg.brown.edu/screenshots/acsam-4.0.6.jpg Thank you very much, -carole - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapperValve.java
jfarcand2003/03/26 13:57:59
Modified:catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
Log:
Fix for bug 18199:
Regression in Tomcat 5: UnavailableException thrown in init() return Status 404 not
503
Based on the spec SRV.2.3.3.2 Exceptions During Request Handling:
- 404 will be returned if the servlet is permanently unavailable
- 503 will be returned if the servlet is unavailable for x time
Revision ChangesPath
1.14 +13 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StandardWrapperValve.java 20 Mar 2003 18:28:28 - 1.13
+++ StandardWrapperValve.java 26 Mar 2003 21:57:59 - 1.14
@@ -192,6 +192,18 @@
if (!unavailable) {
servlet = wrapper.allocate();
}
+} catch (UnavailableException e) {
+long available = wrapper.getAvailable();
+if ((available 0L) (available Long.MAX_VALUE)) {
+hres.setDateHeader(Retry-After, available);
+hres.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE,
+ sm.getString(standardWrapper.isUnavailable,
+wrapper.getName()));
+} else if (available == Long.MAX_VALUE) {
+hres.sendError(HttpServletResponse.SC_NOT_FOUND,
+ sm.getString(standardWrapper.notFound,
+wrapper.getName()));
+}
} catch (ServletException e) {
log.error(sm.getString(standardWrapper.allocateException,
wrapper.getName()), e);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18199] - Regression in Tomcat 5: UnavailableException thrown in init() return Status 404 not 503
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18199. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18199 Regression in Tomcat 5: UnavailableException thrown in init() return Status 404 not 503 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 22:01 --- Fixed. Based on the spec SRV.2.3.3.2 Exceptions During Request Handling: - 404 will be returned if the servlet is permanently unavailable - 503 will be returned if the servlet is unavailable for x time -- Jeanfrancois - 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
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]
DO NOT REPLY [Bug 15307] - Bad encoding for the part of pages included with %@ include file...
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15307. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15307 Bad encoding for the part of pages included with %@ include file... [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-03-26 23:58 --- The JSP 2.0 spec is going to clarify that resources included via the include directive do *not* inherit the page encoding of the top-level page. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 13781] - Non-existent file name given to jsp:include does not generate FNE
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13781. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13781 Non-existent file name given to jsp:include does not generate FNE [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 00:07 --- *** This bug has been marked as a duplicate of 16701 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 16701] - No exception if jsp:include fails
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16701. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=16701 No exception if jsp:include fails [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] ||m --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 00:07 --- *** Bug 13781 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages.properties
luehe 2003/03/26 16:13:51
Modified:jasper2/src/share/org/apache/jasper/resources Tag:
tomcat_4_branch messages.properties
Log:
Fixed 15959: Confusing Error Message with jsp:forward
Revision ChangesPath
No revision
No revision
1.9.2.8 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -u -r1.9.2.7 -r1.9.2.8
--- messages.properties 10 Feb 2003 18:18:52 - 1.9.2.7
+++ messages.properties 27 Mar 2003 00:13:51 - 1.9.2.8
@@ -73,7 +73,7 @@
jsp.error.unable.rename=Unable to rename class file {0} to {1}
jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
jsp.engine.info=Jasper JSP 1.1 Engine
-jsp.error.invalid.attribute={0}: Invalid attribute, {1}
+jsp.error.invalid.attribute={0} has invalid attribute: {1}
jsp.error.usebean.class.notfound=Class: {0} not found
jsp.error.file.cannot.read=Cannot read file: {0}
jsp.error.file.already.registered=Recursive include of file {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources messages_fr.properties
luehe 2003/03/26 16:16:39
Modified:jasper2/src/share/org/apache/jasper/resources
messages_fr.properties
Log:
Fixed 15959: Confusing Error Message with jsp:forward
Revision ChangesPath
1.21 +2 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- messages_fr.properties28 Feb 2003 00:12:41 - 1.20
+++ messages_fr.properties27 Mar 2003 00:16:39 - 1.21
@@ -78,7 +78,7 @@
jsp.error.mandatory.attribute={0}: L''attribut obligatoire {1} est manquant
jsp.engine.info=Moteur Jasper JSP 1.1
jsp.error.invalid.expression={0} contient d''incorrecte(s) expression(s): {1}
-jsp.error.invalid.attribute={0}: Attribut incorrect, {1}
+jsp.error.invalid.attribute={0}: Attribut incorrect: {1}
jsp.error.usebean.class.notfound=Classe: {0} non trouvée
jsp.error.file.cannot.read=Impossible de lire le fichier: {0}
jsp.error.file.already.registered=Inclusion récursive du fichier {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15959] - Confusing Error Message with jsp:forward
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15959. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15959 Confusing Error Message with jsp:forward [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED - 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
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]
DO NOT REPLY [Bug 18314] - Multiple declarations of same taglib cause exception during validation
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18314. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18314 Multiple declarations of same taglib cause exception during validation [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 01:31 --- Fixed as suggested, except that the check must be if (rootAttrs.getIndex(type) == -1) instead of if (attrs.getIndex(type) == -1) - 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 PageDataImpl.java
luehe 2003/03/26 17:36:18
Modified:jasper2/src/share/org/apache/jasper/compiler
PageDataImpl.java
Log:
Fixed 18314: Multiple declarations of same taglib cause exception
during validation
Revision ChangesPath
1.26 +19 -10
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java
Index: PageDataImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- PageDataImpl.java 24 Mar 2003 21:36:05 - 1.25
+++ PageDataImpl.java 27 Mar 2003 01:36:18 - 1.26
@@ -187,13 +187,22 @@
Attributes attrs = n.getAttributes();
if (attrs != null) {
String type = xmlns: + attrs.getValue(prefix);
- String location = attrs.getValue(uri);
- if (location != null) {
- rootAttrs.addAttribute(, , type, CDATA, location);
- } else {
- location = attrs.getValue(tagdir);
- rootAttrs.addAttribute(, , type, CDATA,
-URN_JSPTAGDIR + location);
+ /*
+ * According to javadocs of org.xml.sax.helpers.AttributesImpl,
+ * the addAttribute method does not check to see if the
+ * specified attribute is already contained in the list: This
+ * is the application's responsibility!
+ */
+ if (rootAttrs.getIndex(type) == -1) {
+ String location = attrs.getValue(uri);
+ if (location != null) {
+ rootAttrs.addAttribute(, , type, CDATA,
+location);
+ } else {
+ location = attrs.getValue(tagdir);
+ rootAttrs.addAttribute(, , type, CDATA,
+URN_JSPTAGDIR + location);
+ }
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17323] - Cancelled SSL connections cause Tomcat to stumble
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17323. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17323 Cancelled SSL connections cause Tomcat to stumble --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 01:40 --- I've got the same problem, but not with Https. I've got an older linux machine that sometimes swaps the tomcat process out. Sometimes, linux takes a bit to swap tomcat back in, and in the interim, the client closes the socket. As a result, the HttpConnector blows up and tomcat will stop responding after. I think this stack trace blows the HttpConnector out of the water: org.apache.commons.logging.LogConfigurationException: org.apache.commons.logging.LogConfigurationException: org.apache.commons.logging.LogConfigurationException: Class org.apache.commons.logging.impl.SimpleLog does not implement Log at org.apache.commons.logging.impl.LogFactoryImpl.newInstance (LogFactoryImpl.java:530) at org.apache.commons.logging.impl.LogFactoryImpl.getInstance (LogFactoryImpl.java:285) at org.apache.commons.logging.LogFactory.getLog(LogFactory.java:401) at org.apache.tomcat.util.log.CommonLogHandler.log (CommonLogHandler.java:97) at org.apache.tomcat.util.log.Log.log(Log.java:198) at org.apache.tomcat.util.log.Log.log(Log.java:192) at org.apache.tomcat.util.log.Log.log(Log.java:174) at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run (ThreadPool.java:536) at java.lang.Thread.run(Thread.java:484) I've got 4.1.12 on an older linux kernal with jdk 1.3.1_01 - 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 PageDataImpl.java
luehe 2003/03/26 17:52:08
Modified:jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch PageDataImpl.java
Log:
Fixed 18314: Multiple declarations of same taglib cause exception
during validation
Revision ChangesPath
No revision
No revision
1.3.2.1 +14 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java
Index: PageDataImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- PageDataImpl.java 17 May 2002 23:44:00 - 1.3
+++ PageDataImpl.java 27 Mar 2003 01:52:08 - 1.3.2.1
@@ -209,10 +209,17 @@
public void visit(Node.TaglibDirective n) throws JasperException {
Attributes attrs = n.getAttributes();
if (attrs != null) {
- String uri = attrs.getValue(uri);
- String prefix = attrs.getValue(prefix);
- rootAttrs.addAttribute(, , xmlns: + prefix, CDATA,
-uri);
+ String qName = xmlns: + attrs.getValue(prefix);
+ /*
+ * According to javadocs of org.xml.sax.helpers.AttributesImpl,
+ * the addAttribute method does not check to see if the
+ * specified attribute is already contained in the list: This
+ * is the application's responsibility!
+ */
+ if (rootAttrs.getIndex(qName) == -1) {
+ rootAttrs.addAttribute(, , qName, CDATA,
+attrs.getValue(uri));
+ }
}
}
}
-
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 PageDataImpl.java
luehe 2003/03/26 17:52:55
Modified:jasper2/src/share/org/apache/jasper/compiler
PageDataImpl.java
Log:
renamed 'type' into 'qName'
Revision ChangesPath
1.27 +7 -7
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java
Index: PageDataImpl.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageDataImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PageDataImpl.java 27 Mar 2003 01:36:18 - 1.26
+++ PageDataImpl.java 27 Mar 2003 01:52:55 - 1.27
@@ -186,21 +186,21 @@
public void visit(Node.TaglibDirective n) throws JasperException {
Attributes attrs = n.getAttributes();
if (attrs != null) {
- String type = xmlns: + attrs.getValue(prefix);
+ String qName = xmlns: + attrs.getValue(prefix);
/*
* According to javadocs of org.xml.sax.helpers.AttributesImpl,
* the addAttribute method does not check to see if the
* specified attribute is already contained in the list: This
* is the application's responsibility!
*/
- if (rootAttrs.getIndex(type) == -1) {
+ if (rootAttrs.getIndex(qName) == -1) {
String location = attrs.getValue(uri);
if (location != null) {
- rootAttrs.addAttribute(, , type, CDATA,
+ rootAttrs.addAttribute(, , qName, CDATA,
location);
} else {
location = attrs.getValue(tagdir);
- rootAttrs.addAttribute(, , type, CDATA,
+ rootAttrs.addAttribute(, , qName, CDATA,
URN_JSPTAGDIR + location);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 12457] - Filter does not work when RequestDispatcher uses INCLUDE value
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12457. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=12457 Filter does not work when RequestDispatcher uses INCLUDE value [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 02:13 --- Fixed. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 7392] - A body tag without a body doesn't generate correct JSP code
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7392. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7392 A body tag without a body doesn't generate correct JSP code [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 02:24 --- All the tag handler lifecycle methods have been clarified in the upcoming JSP 2.0 spec. The latest javax.servlet.jsp.tagext.BodyTag, available from jakarta-servletapi-5/jsr152, has this: * pNote that which methods are invoked after the doStartTag() depends on * both the return value and on if the custom action element is empty * or not in the JSP page, not how it's declared in the TLD. * * p * If SKIP_BODY is returned the body is not evaluated, and doEndTag() is * invoked. * * p * If EVAL_BODY_INCLUDE is returned, and the custom action element is not * empty, setBodyContent() is not invoked, * doInitBody() is not invoked, the body is evaluated and * passed through to the current out, doAfterBody() is invoked * and then, after zero or more iterations, doEndTag() is invoked. * If the custom action element is empty, only doStart() and * doEndTag() are invoked. * * p * If EVAL_BODY_BUFFERED is returned, and the custom action element is not * empty, setBodyContent() is invoked, * doInitBody() is invoked, the body is evaluated, doAfterBody() is * invoked, and then, after zero or more iterations, doEndTag() is invoked. * If the custom action element is empty, only doStart() and doEndTag() * are invoked. This means that if doStartTag() returns SKIP_BODY, or if it returns EVAL_BODY_INCLUDE or EVAL_BODY_BUFFERED and the custom action element is empty, doAfterBody() will *NOT* be invoked. Please do not reopen this bug, as what you are requesting contradicts the JSP spec. Place your logic in doEndTag() instead. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17509] - Jasper erroneously optimises BodyTag instances with no body
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17509. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17509 Jasper erroneously optimises BodyTag instances with no body [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 02:32 --- All the tag handler lifecycle methods have been clarified in the upcoming JSP 2.0. The latest javax.servlet.jsp.tagext.BodyTag, available from jakarta-servletapi-5/jsr152, has this: * pNote that which methods are invoked after the doStartTag() depends on * both the return value and on if the custom action element is empty * or not in the JSP page, not how it's declared in the TLD. * * p * If SKIP_BODY is returned the body is not evaluated, and doEndTag() is * invoked. * * p * If EVAL_BODY_INCLUDE is returned, and the custom action element is not * empty, setBodyContent() is not invoked, * doInitBody() is not invoked, the body is evaluated and * passed through to the current out, doAfterBody() is invoked * and then, after zero or more iterations, doEndTag() is invoked. * If the custom action element is empty, only doStart() and * doEndTag() are invoked. * * p * If EVAL_BODY_BUFFERED is returned, and the custom action element is not * empty, setBodyContent() is invoked, * doInitBody() is invoked, the body is evaluated, doAfterBody() is * invoked, and then, after zero or more iterations, doEndTag() is invoked. * If the custom action element is empty, only doStart() and doEndTag() * are invoked. This means that if a custom action is empty, we don't even need to check the return value of doStartTag(), and may simply proceed to calling doEndTag(). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 17323] - Cancelled SSL connections cause Tomcat to stumble
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17323. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17323 Cancelled SSL connections cause Tomcat to stumble --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 02:35 --- I just lost what I typed. I have a feeling this bug is a commons-logging-api issue because LogConfigurationException is a runtime exception that is blowing the HttpConnector out of the water. Basically, I have a feelign this bug is related to 17894. I transplanted commons-logging-api.jar from 4.1.18 into my 4.1.12 instance hoping that the commons-logging-api.jar in 4.1.12 is bogus. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ValveBase.java
amyroh 2003/03/26 19:06:40
Modified:catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardPipeline.java
StandardService.java
catalina/src/share/org/apache/catalina/logger
FileLogger.java LoggerBase.java
catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
catalina/src/share/org/apache/catalina/realm RealmBase.java
catalina/src/share/org/apache/catalina/valves ValveBase.java
Log:
Add deregistration code for container, service, valve/logger dynamic registration.
Use getObjectName() instead of MBeanUtils for most of cases.
Revision ChangesPath
1.17 +12 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
Index: ContainerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ContainerBase.java26 Mar 2003 19:20:29 - 1.16
+++ ContainerBase.java27 Mar 2003 03:06:39 - 1.17
@@ -1322,6 +1322,16 @@
}
}
+// unregister this component
+if( oname != null ) {
+try {
+Registry.getRegistry().unregisterComponent(oname);
+log.info(unregistering + oname);
+} catch( Throwable t ) {
+log.error(Error unregistering , t );
+}
+}
+
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
@@ -1667,11 +1677,11 @@
host=context.getParent();
servlet=container;
}
-if( host!=null ) suffix.append(,host=).append( host.getName() );
if( context!=null ) {
String path=((StandardContext)context).getPath();
-suffix.append(,path=).append((path==) ? / : path);
+suffix.append(,path=).append((path.equals()) ? / : path);
}
+if( host!=null ) suffix.append(,host=).append( host.getName() );
if( servlet != null ) {
String name=container.getName();
suffix.append(,servlet=);
1.6 +7 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
Index: StandardPipeline.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StandardPipeline.java 26 Mar 2003 19:20:29 - 1.5
+++ StandardPipeline.java 27 Mar 2003 03:06:39 - 1.6
@@ -486,6 +486,8 @@
results[valves.length] = valve;
valves = results;
}
+// register the newly added valve
+registerValve(valve);
}
@@ -601,6 +603,8 @@
log.error(StandardPipeline.removeValve: stop: , e);
}
}
+// unregister the removed valave
+unregisterValve(valve);
}
1.5 +14 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
Index: StandardService.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardService.java 21 Mar 2003 08:16:20 - 1.4
+++ StandardService.java 27 Mar 2003 03:06:39 - 1.5
@@ -582,6 +582,16 @@
}
}
}
+
+// unregister this service
+if( oname!=null ) {
+try {
+Registry.getRegistry().unregisterComponent(oname);
+log.info(unregistering + oname);
+} catch (Exception e) {
+log.error(Error unregistering ,e);
+}
+}
// Notify our interested LifecycleListeners
lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
1.2 +9 -51
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/FileLogger.java
Index: FileLogger.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/FileLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileLogger.java 18 Jul 2002
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
costin 2003/03/26 20:08:20
Modified:util/java tomcat-util.manifest
util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
Log:
Fix bug that prevented clean shutdown.
Remove ClassPath from manifest, added spec version and the other entries
so it may be useable with a loader that uses the manifest.
Revision ChangesPath
1.3 +7 -1 jakarta-tomcat-connectors/util/java/tomcat-util.manifest
Index: tomcat-util.manifest
===
RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/tomcat-util.manifest,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat-util.manifest 5 Jun 2002 21:13:37 - 1.2
+++ tomcat-util.manifest 27 Mar 2003 04:08:19 - 1.3
@@ -1 +1,7 @@
-Class-Path: commons-logging.jar log4j.jar log4j-core.jar mx4j.jar
+Manifest-version: 1.0
+Extension-Name: org.apache.tomcat.util
+Specification-Vendor: Apache Software Foundation
+Specification-Version: 3.0
+Implementation-Vendor-Id: org.apache
+Implementation-Vendor: Apache Software Foundation
+Implementation-Version: 5.1
1.14 +4 -3
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PoolTcpEndpoint.java 4 Mar 2003 18:20:36 - 1.13
+++ PoolTcpEndpoint.java 27 Mar 2003 04:08:20 - 1.14
@@ -390,6 +390,7 @@
}
}
+if( ! running ) return null;
reinitializing = true;
// Restart endpoint when getting an IOException during accept
synchronized (threadSync) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18396] New: - Tomcat does not use correct encoding if content type is not text/html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18396. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18396 Tomcat does not use correct encoding if content type is not text/html Summary: Tomcat does not use correct encoding if content type is not text/html Product: Tomcat 4 Version: 4.1.12 Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: Other Component: Unknown AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Atlassian uses a JSP to create Microsoft Excel documents. Because Excel can convert from HTML to excel, all we need to do is set the content type correctly, and it loads excel (and imports / converts). However, non-ascii characters are not being set correctly. This only happens if you use the excel content type. If I set the content type to text/html then the non-ascii characters are displayed fine. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 18396] - Tomcat does not use correct encoding if content type is not text/html
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18396. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18396 Tomcat does not use correct encoding if content type is not text/html --- Additional Comments From [EMAIL PROTECTED] 2003-03-27 05:31 --- Created an attachment (id=5524) Test case verifying problem - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5/resources/mbeans jboss-service.xml
costin 2003/03/26 22:32:15 Added: resources/mbeans jboss-service.xml Log: Another experimental mbean file, using jboss syntax. I used it to test reloading ( and cleanup ) in jboss, using their jmx impl ( which is the only one that supports class reloading and updates in the container classes ). You probably saw the fix in PoolTcpEndpoint ( the socket wasn't closed on stop() ), I also update modeler to allow cleanup of the static metadata. Things seem to work fine, but there are few objects in j-t-c that don't unregister themself, I'll debug them tomorrow night. Amy - great work, all catalina objects seem to unload cleanely. Revision ChangesPath 1.1 jakarta-tomcat-5/resources/mbeans/jboss-service.xml Index: jboss-service.xml === ?xml version=1.0 encoding=UTF-8? server classpath codebase=tomcat5.sar/lib/ archives=*/ classpath codebase=tomcat5.sar/ archives=tomcat41-service.jar/ mbean code=org.apache.commons.modeler.BaseModelMBean name=Catalina:type=Engine constructor arg type=java.lang.String value=org.apache.catalina.core.StandardEngine / /constructor attribute name=nameCatalina/attribute attribute name=baseDir/ws/50/embed/attribute attribute name=defaultHostlocalhost/attribute /mbean mbean code=org.apache.commons.modeler.BaseModelMBean name=Catalina:type=Realm constructor arg type=java.lang.String value=org.apache.catalina.realm.JAASRealm / /constructor /mbean !-- mbean code=org.apache.commons.modeler.BaseModelMBean name=Catalina:type=Connector,port=9080 constructor arg type=java.lang.String value=org.apache.coyote.tomcat5.CoyoteConnector / /constructor attribute name=protocolHandlerClassName value=org.apache.jk.server.JkCoyoteHandler / /mbean -- mbean code=org.apache.commons.modeler.BaseModelMBean name=Catalina:type=Connector,port=9080 constructor arg type=java.lang.String value=org.apache.coyote.tomcat5.CoyoteConnector / /constructor attribute name=port9080/attribute /mbean mbean code=org.jboss.web.catalina.Tomcat5 name=jboss.web:service=EmbeddedCatalina5 /mbean /server - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Details
Hi, Does Interceptors in 3.x and Valves in 4.x the same thing? Where do I find documents on writing an interceptor? I'm trying a simple example of getting the number of active sessions by writing a interceptor. Can anyone help me? Kind Regards Bala - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core mbeans-descriptors.xml
costin 2003/03/26 22:49:20 Modified:catalina/src/share/org/apache/catalina/core mbeans-descriptors.xml Log: Error in params. Revision ChangesPath 1.6 +5 -2 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml Index: mbeans-descriptors.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mbeans-descriptors.xml24 Mar 2003 09:18:26 - 1.5 +++ mbeans-descriptors.xml27 Mar 2003 06:49:20 - 1.6 @@ -444,8 +444,11 @@ operation name=addChild description=Add a context - impact=ACTION - returnType=org.apache.catalina.Container/ + impact=ACTION + parameter name=child + description=Context to be added + type=org.apache.catalina.Container/ +/operation operation name=removeAlias description=Remove the specified alias name from the aliases for this Host - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
