Re: svn commit: r389946 [3/5] - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java
Hi Remy,
I saw you taking over classes from commons modeler into tc 6. Just
yesterday William Barker commited a very small and non-risky patch I
submitted two years ago to bugzilla against Registry.convertValue():
http://issues.apache.org/bugzilla/show_bug.cgi?id=31608
The method has conversions for Integer and Boolean, but not for Long. It
is used in Tomcats manager webapp (manager/jmxproxy) and many of
tomcat's internal JMX parameters are longs and can therefore not yet
been set via the manager webapp.
It would be very nice, if you could apply the patch to tc 6 copy of
Regitry.java. Four your convenience I include it here:
Index: Registry.java
===
--- Registry.java (revision 390034)
+++ Registry.java (working copy)
@@ -713,6 +713,9 @@
} else if( java.lang.Integer.equals( type ) ||
int.equals( type )) {
objValue=new Integer( value );
+} else if( java.lang.Long.equals( type ) ||
+long.equals( type )) {
+objValue=new Long( value );
} else if( java.lang.Boolean.equals( type ) ||
boolean.equals( type )) {
objValue=new Boolean( value );
Thank you!
[EMAIL PROTECTED] wrote:
Added: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=389946view=auto
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
(added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Wed
Mar 29 16:55:22 2006
...
+public Object convertValue(String type, String value)
+{
+Object objValue=value;
+
+if( type==null || java.lang.String.equals( type )) {
+// string is default
+objValue=value;
+} else if( javax.management.ObjectName.equals( type ) ||
+ObjectName.equals( type )) {
+try {
+objValue=new ObjectName( value );
+} catch (MalformedObjectNameException e) {
+return null;
+}
+} else if( java.lang.Integer.equals( type ) ||
+int.equals( type )) {
+objValue=new Integer( value );
+} else if( java.lang.Boolean.equals( type ) ||
+boolean.equals( type )) {
+objValue=new Boolean( value );
+}
+return objValue;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390055 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Author: remm
Date: Thu Mar 30 02:00:57 2006
New Revision: 390055
URL: http://svn.apache.org/viewcvs?rev=390055view=rev
Log:
- Add missing patch (I didn't update from sources before merging).
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=390055r1=390054r2=390055view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu
Mar 30 02:00:57 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
@@ -713,6 +713,9 @@
} else if( java.lang.Integer.equals( type ) ||
int.equals( type )) {
objValue=new Integer( value );
+} else if( java.lang.Long.equals( type ) ||
+long.equals( type )) {
+objValue=new Long( value );
} else if( java.lang.Boolean.equals( type ) ||
boolean.equals( type )) {
objValue=new Boolean( value );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 39149] - Missing files in Tomcat 5.5.16 distribution
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=39149. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=39149 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2006-03-30 13:49 --- This is done on purpose. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390120 - /tomcat/tc6.0.x/trunk/.classpath
Author: remm Date: Thu Mar 30 05:27:59 2006 New Revision: 390120 URL: http://svn.apache.org/viewcvs?rev=390120view=rev Log: - Remove modeler. - Fix CRLF. Modified: tomcat/tc6.0.x/trunk/.classpath Modified: tomcat/tc6.0.x/trunk/.classpath URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/.classpath?rev=390120r1=390119r2=390120view=diff == --- tomcat/tc6.0.x/trunk/.classpath (original) +++ tomcat/tc6.0.x/trunk/.classpath Thu Mar 30 05:27:59 2006 @@ -1,10 +1,9 @@ -?xml version=1.0 encoding=UTF-8? -classpath - classpathentry excluding=org/apache/tomcat/util/net/puretls/|org/apache/naming/factory/MailSessionFactory.java|org/apache/naming/factory/SendMailFactory.java kind=src path=java/ - classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/ - classpathentry kind=var path=TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar/ - classpathentry kind=var path=TOMCAT_LIBS_BASE/commons-modeler-1.1/commons-modeler.jar/ - classpathentry kind=var path=TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar/ - classpathentry kind=var path=TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar/ - classpathentry kind=output path=classes/ -/classpath +?xml version=1.0 encoding=UTF-8? +classpath + classpathentry excluding=org/apache/tomcat/util/net/puretls/|org/apache/naming/factory/MailSessionFactory.java|org/apache/naming/factory/SendMailFactory.java kind=src path=java/ + classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/ + classpathentry kind=var path=TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar/ + classpathentry kind=var path=TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar/ + classpathentry kind=var path=TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar/ + classpathentry kind=output path=classes/ +/classpath - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390124 - /tomcat/tc6.0.x/trunk/.classpath
Author: remm Date: Thu Mar 30 05:32:04 2006 New Revision: 390124 URL: http://svn.apache.org/viewcvs?rev=390124view=rev Log: - Move output so that Eclipse doesn't pollute the useful classes folder with his junk. Modified: tomcat/tc6.0.x/trunk/.classpath Modified: tomcat/tc6.0.x/trunk/.classpath URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/.classpath?rev=390124r1=390123r2=390124view=diff == --- tomcat/tc6.0.x/trunk/.classpath (original) +++ tomcat/tc6.0.x/trunk/.classpath Thu Mar 30 05:32:04 2006 @@ -5,5 +5,5 @@ classpathentry kind=var path=TOMCAT_LIBS_BASE/commons-logging-1.0.4/commons-logging.jar/ classpathentry kind=var path=TOMCAT_LIBS_BASE/apache-ant-1.6.5/lib/ant.jar/ classpathentry kind=var path=TOMCAT_LIBS_BASE/eclipse/plugins/org.eclipse.jdt.core_3.1.2.jar/ - classpathentry kind=output path=classes/ + classpathentry kind=output path=.settings/output/ /classpath - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r389421 - in /tomcat/tc6.0.x/trunk: .classpath .project
Costin Manolache wrote: You could easily remove them from your tree. Do you have any valid reason to no longer have the files ? I remember for 4.x people felt they were usefull. I'm not sure 'I can't ignore them easily' or 'I don't need them' is a real -1 reason. ( and by 'I'll remove them from the tree' I assume you meant either your own tree or a -1 ). I don't care that much about them - I have to ignore them as well if I make any change, like adding the sandbox. So if anybody else feels they should be removed, I'll do so. I am not happy: - it's an ad for a specific IDE (that I happen to use, but do not particularly like unless someone explains to me why a workspace with TC 5.5, jbossweb (more or less similar to TC 6), and TC 6 causes Eclipse to take 3 minutes to display the main window, and then think it must recompile everything and takes 8 more minutes doing that - thankfully, the coding capabilities are still unparalleled in the free IDEs, so I didn't dump it yet) - I do not see much benefit, given the only meaningful dependency is on commons-logging - you did not commit files with proper line endings, so I get annoying Unix line endings on Windows, please be more careful about that - your configuration leads to polluting the classes folder with Eclipse's class output (I will allow your file to remain if your accept that I change this) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 39149] - Missing files in Tomcat 5.5.16 distribution
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=39149. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=39149 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WONTFIX | --- Additional Comments From [EMAIL PROTECTED] 2006-03-30 14:51 --- (In reply to comment #1) This is done on purpose. Well, service.bat need to be changed, if it was on purpose to remove the two .exe files from the zip and tar.gz packages. And I am sorry to hear that 5.5.16.exe was broken on purpose. I got the following message from Charles R Caldarale the 5.5.16 .exe is broken. The .zip download (the one I normally use) is fine. Looks like someone tried an ASCII mode FTP of some of the .class files, resulting in a linefeed byte being added at the end. This was not a problem in 5.5.15. - Chuck And the following message from Yoav Shapira-2 Hey, Sorry for the late response on this, I've been swamped. What's the consensus of the committers, are we in decent shape to do a 5.5.17 release? I have time for it this weekend. I will test the .exe in 5.5.17 prior to uploading to make sure it's alright. Yoav -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390144 - /tomcat/connectors/trunk/jni/native/src/network.c
Author: mturk Date: Thu Mar 30 06:25:42 2006 New Revision: 390144 URL: http://svn.apache.org/viewcvs?rev=390144view=rev Log: Fix sprintf formating warnings. Modified: tomcat/connectors/trunk/jni/native/src/network.c Modified: tomcat/connectors/trunk/jni/native/src/network.c URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/network.c?rev=390144r1=390143r2=390144view=diff == --- tomcat/connectors/trunk/jni/native/src/network.c (original) +++ tomcat/connectors/trunk/jni/native/src/network.c Thu Mar 30 06:25:42 2006 @@ -85,8 +85,8 @@ fprintf(stderr, Last receive error : %d\n, sp_erl_recv); fprintf(stderr, Total sendfile calls: %d\n, sf_num_send); -fprintf(stderr, Minimum sendfile lenght : %d\n, sf_min_send); -fprintf(stderr, Maximum sendfile lenght : %d\n, sf_max_send); +fprintf(stderr, Minimum sendfile lenght : %d APR_SIZE_T_FMT \n, sf_min_send); +fprintf(stderr, Maximum sendfile lenght : %d APR_SIZE_T_FMT \n, sf_max_send); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390147 - /tomcat/connectors/trunk/jni/native/src/network.c
Author: mturk Date: Thu Mar 30 06:32:04 2006 New Revision: 390147 URL: http://svn.apache.org/viewcvs?rev=390147view=rev Log: Copy/paste error. Remove extra format. Modified: tomcat/connectors/trunk/jni/native/src/network.c Modified: tomcat/connectors/trunk/jni/native/src/network.c URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/network.c?rev=390147r1=390146r2=390147view=diff == --- tomcat/connectors/trunk/jni/native/src/network.c (original) +++ tomcat/connectors/trunk/jni/native/src/network.c Thu Mar 30 06:32:04 2006 @@ -85,8 +85,8 @@ fprintf(stderr, Last receive error : %d\n, sp_erl_recv); fprintf(stderr, Total sendfile calls: %d\n, sf_num_send); -fprintf(stderr, Minimum sendfile lenght : %d APR_SIZE_T_FMT \n, sf_min_send); -fprintf(stderr, Maximum sendfile lenght : %d APR_SIZE_T_FMT \n, sf_max_send); +fprintf(stderr, Minimum sendfile lenght : % APR_SIZE_T_FMT \n, sf_min_send); +fprintf(stderr, Maximum sendfile lenght : % APR_SIZE_T_FMT \n, sf_max_send); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390155 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
Author: remm
Date: Thu Mar 30 07:08:31 2006
New Revision: 390155
URL: http://svn.apache.org/viewcvs?rev=390155view=rev
Log:
- Clean up a bit.
- For some reason, trying to recycle a static digester doesn't improve
performance.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?rev=390155r1=390154r2=390155view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
Thu Mar 30 07:08:31 2006
@@ -37,192 +37,199 @@
String type;
Object source;
List mbeans=new ArrayList();
-
-public void setRegistry(Registry reg) {
-this.registry=reg;
-}
-
-public void setLocation( String loc ) {
-this.location=loc;
-}
-
-/** Used if a single component is loaded
- *
- * @param type
- */
-public void setType( String type ) {
- this.type=type;
-}
-
-public void setSource( Object source ) {
-this.source=source;
-}
-
-public List loadDescriptors( Registry registry, String location,
- String type, Object source)
-throws Exception
-{
-setRegistry(registry);
-setLocation(location);
-setType(type);
-setSource(source);
-execute();
-return mbeans;
-}
-
-public void execute() throws Exception {
-if( registry==null ) registry=Registry.getRegistry();
-
-InputStream stream=(InputStream)source;
-
-long t1=System.currentTimeMillis();
+
+protected static Digester createDigester(Registry registry) {
Digester digester = new Digester();
digester.setNamespaceAware(false);
digester.setValidating(false);
-URL url = registry.getClass().getResource
-(/org/apache/commons/modeler/mbeans-descriptors.dtd);
+URL url = Registry.getRegistry(null, null).getClass().getResource
+(/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd);
digester.register
-(-//Apache Software Foundation//DTD Model MBeans
Configuration File,
-url.toString());
-
-// Push our registry object onto the stack
-digester.push(mbeans);
-
+(-//Apache Software Foundation//DTD Model MBeans Configuration
File,
+url.toString());
+
// Configure the parsing rules
digester.addObjectCreate
-(mbeans-descriptors/mbean,
-org.apache.tomcat.util.modeler.ManagedBean);
+(mbeans-descriptors/mbean,
+org.apache.tomcat.util.modeler.ManagedBean);
digester.addSetProperties
-(mbeans-descriptors/mbean);
+(mbeans-descriptors/mbean);
digester.addSetNext
-(mbeans-descriptors/mbean,
-add,
-java.lang.Object);
-
+(mbeans-descriptors/mbean,
+add,
+java.lang.Object);
+
digester.addObjectCreate
-(mbeans-descriptors/mbean/attribute,
-org.apache.tomcat.util.modeler.AttributeInfo);
+(mbeans-descriptors/mbean/attribute,
+org.apache.tomcat.util.modeler.AttributeInfo);
digester.addSetProperties
-(mbeans-descriptors/mbean/attribute);
+(mbeans-descriptors/mbean/attribute);
digester.addSetNext
-(mbeans-descriptors/mbean/attribute,
-addAttribute,
-org.apache.tomcat.util.modeler.AttributeInfo);
-
+(mbeans-descriptors/mbean/attribute,
+addAttribute,
+org.apache.tomcat.util.modeler.AttributeInfo);
+
digester.addObjectCreate
(mbeans-descriptors/mbean/attribute/descriptor/field,
- org.apache.tomcat.util.modeler.FieldInfo);
+org.apache.tomcat.util.modeler.FieldInfo);
digester.addSetProperties
(mbeans-descriptors/mbean/attribute/descriptor/field);
digester.addSetNext
(mbeans-descriptors/mbean/attribute/descriptor/field,
- addField,
- org.apache.tomcat.util.modeler.FieldInfo);
-
-digester.addObjectCreate
-(mbeans-descriptors/mbean/constructor,
-org.apache.tomcat.util.modeler.ConstructorInfo);
-digester.addSetProperties
-
svn commit: r390157 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Author: remm
Date: Thu Mar 30 07:10:13 2006
New Revision: 390157
URL: http://svn.apache.org/viewcvs?rev=390157view=rev
Log:
- Standardize on the digester (which is apparently a bit faster than using
DOM). This way, digester
now handles all XML parsing in Catalina.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=390157r1=390156r2=390157view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu
Mar 30 07:10:13 2006
@@ -773,7 +773,7 @@
}
if( sourceType==null ) {
-sourceType=MbeansDescriptorsDOMSource;
+sourceType=MbeansDescriptorsDigesterSource;
}
ModelerSource ds=getModelerSource(sourceType);
List mbeans=ds.loadDescriptors(this, location, type, inputsource);
@@ -786,7 +786,7 @@
return MbeansDescriptorsSerSource;
}
else if( s.endsWith(.xml)) {
-return MbeansDescriptorsDOMSource;
+return MbeansDescriptorsDigesterSource;
}
return null;
}
@@ -866,7 +866,7 @@
searchedPaths.put( packageName, dURL );
try {
if( descriptors.endsWith(.xml ))
-loadDescriptors(MbeansDescriptorsDOMSource, dURL, null);
+loadDescriptors(MbeansDescriptorsDigesterSource, dURL, null);
else
loadDescriptors(MbeansDescriptorsSerSource, dURL, null);
return;
@@ -912,7 +912,7 @@
URL url=(URL)en.nextElement();
InputStream is=url.openStream();
if( log.isDebugEnabled()) log.debug(Loading + url);
-loadDescriptors(MBeansDescriptorDOMSource, is, null );
+loadDescriptors(MbeansDescriptorsDigesterSource, is, null );
}
} catch( Exception ex ) {
ex.printStackTrace();
@@ -957,7 +957,7 @@
private ModelerSource getModelerSource( String type )
throws Exception
{
-if( type==null ) type=MbeansDescriptorsDOMSource;
+if( type==null ) type=MbeansDescriptorsDigesterSource;
if( type.indexOf( .) 0 ) {
type=org.apache.tomcat.util.modeler.modules. + type;
}
@@ -1031,7 +1031,7 @@
public void loadDescriptors( Object source )
throws Exception
{
-loadDescriptors(MbeansDescriptorsDOMSource, source, null );
+loadDescriptors(MbeansDescriptorsDigesterSource, source, null );
}
/** @deprecated - may still be used in code using pre-1.1 builds
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 39149] - Missing files in Tomcat 5.5.16 distribution
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=39149. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=39149 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||WONTFIX -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r389421 - in /tomcat/tc6.0.x/trunk: .classpath .project
On 3/30/06, Remy Maucherat [EMAIL PROTECTED] wrote: Costin Manolache wrote: You could easily remove them from your tree. Do you have any valid reason to no longer have the files ? I remember for 4.x people felt they were usefull. I'm not sure 'I can't ignore them easily' or 'I don't need them' is a real -1 reason. ( and by 'I'll remove them from the tree' I assume you meant either your own tree or a -1 ). I don't care that much about them - I have to ignore them as well if I make any change, like adding the sandbox. So if anybody else feels they should be removed, I'll do so. I am not happy: - it's an ad for a specific IDE (that I happen to use, but do not particularly like unless someone explains to me why a workspace with TC 5.5, jbossweb (more or less similar to TC 6), and TC 6 causes Eclipse to take 3 minutes to display the main window, and then think it must recompile everything and takes 8 more minutes doing that - thankfully, the coding capabilities are still unparalleled in the free IDEs, so I didn't dump it yet) I would be happy to commit the idea config as well ( I use it from time to time, it's a bit faster actually ). And I'm sure we can find someone to add netbeans conf as well. - I do not see much benefit, given the only meaningful dependency is on commons-logging That's a good point - it's probably less usefull than in tc5. But still, doesn't hurt. - you did not commit files with proper line endings, so I get annoying Unix line endings on Windows, please be more careful about that I was going to ask - when did our policy changed to use windows line endings ??? I was a bit annoyed to see windows ending as well, it looks bad on unix and mac. - your configuration leads to polluting the classes folder with Eclipse's class output (I will allow your file to remain if your accept that I change this) Of course you can change this, it's an excelent idea. Not sure about the windows line endings, I'm tempted to say -1, but since it's only used by eclipse, I'll live with it :-) Could we at least use unix lines in build.xml ? Costin
Re: svn commit: r389421 - in /tomcat/tc6.0.x/trunk: .classpath .project
Costin Manolache wrote: I was going to ask - when did our policy changed to use windows line endings ??? I was a bit annoyed to see windows ending as well, it looks bad on unix and mac. There's a config in svn for that, I think, and for some reason it's not the default. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r389421 - in /tomcat/tc6.0.x/trunk: .classpath .project
I don't know about svn - but the repository itself should be in unix format, or at least that used to be the convention. I'm not the tab and line ending police - but it would be good to be consistent, it's really ugly to have files with both windows and unix line ending. Costin On 3/30/06, Remy Maucherat [EMAIL PROTECTED] wrote: Costin Manolache wrote: I was going to ask - when did our policy changed to use windows line endings ??? I was a bit annoyed to see windows ending as well, it looks bad on unix and mac. There's a config in svn for that, I think, and for some reason it's not the default. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r389421 - in /tomcat/tc6.0.x/trunk: .classpath .project
On 3/30/06, Remy Maucherat [EMAIL PROTECTED] wrote: Costin Manolache wrote: I was going to ask - when did our policy changed to use windows line endings ??? I was a bit annoyed to see windows ending as well, it looks bad on unix and mac. There's a config in svn for that, I think, and for some reason it's not the default. snip/ svn:eol-style can be set to native (usually the case for most files in the ASF repo -then svn will do the line-ending conversions as needed). You can also set autoprops in your svn config so when you add new files svn properties get tacked on (based on file extension). -Rahul Rémy snap/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: svn commit: r389421 - in /tomcat/tc6.0.x/trunk: .classpath .project
On 3/30/06, Rahul Akolkar [EMAIL PROTECTED] wrote: On 3/30/06, Remy Maucherat [EMAIL PROTECTED] wrote: Costin Manolache wrote: I was going to ask - when did our policy changed to use windows line endings ??? I was a bit annoyed to see windows ending as well, it looks bad on unix and mac. There's a config in svn for that, I think, and for some reason it's not the default. snip/ svn:eol-style can be set to native (usually the case for most files in the ASF repo -then svn will do the line-ending conversions as needed). You can also set autoprops in your svn config so when you add new files svn properties get tacked on (based on file extension). snip/ Related details are here (See paragraph starting Committers will need to ...): http://www.apache.org/dev/version-control.html#https-svn Here are the eol-style settings that we recommend folks use for their svn client configs: http://www.apache.org/dev/svn-eol-style.txt -Rahul -Rahul Rémy snap/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390187 - /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
Author: remm
Date: Thu Mar 30 09:40:57 2006
New Revision: 390187
URL: http://svn.apache.org/viewcvs?rev=390187view=rev
Log:
- Revert fix for 38113, which doesn't seem to be a bug, and appears to be
causing regressions.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java?rev=390187r1=390186r2=390187view=diff
==
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/connector/Request.java
Thu Mar 30 09:40:57 2006
@@ -1893,7 +1893,11 @@
*/
public String getQueryString() {
String queryString = coyoteRequest.queryString().toString();
- return queryString;
+if (queryString == null || queryString.equals()) {
+return (null);
+} else {
+return queryString;
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390188 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
Author: remm
Date: Thu Mar 30 09:41:19 2006
New Revision: 390188
URL: http://svn.apache.org/viewcvs?rev=390188view=rev
Log:
- Revert fix for 38113, which doesn't seem to be a bug, and appears to be
causing regressions.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=390188r1=390187r2=390188view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Request.java Thu
Mar 30 09:41:19 2006
@@ -1893,7 +1893,11 @@
*/
public String getQueryString() {
String queryString = coyoteRequest.queryString().toString();
- return queryString;
+if (queryString == null || queryString.equals()) {
+return (null);
+} else {
+return queryString;
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r390189 - /tomcat/tc6.0.x/trunk/build.xml
Author: remm Date: Thu Mar 30 09:42:06 2006 New Revision: 390189 URL: http://svn.apache.org/viewcvs?rev=390189view=rev Log: - Copy the XML descriptors. Modified: tomcat/tc6.0.x/trunk/build.xml Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.xml?rev=390189r1=390188r2=390189view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Thu Mar 30 09:42:06 2006 @@ -91,6 +91,7 @@ include name=**/*.properties/ include name=**/*.dtd/ include name=**/*.xsd/ +include name=**/*.xml/ /fileset /copy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 39130] - Hostname contains ? even if no query string exists
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=39130. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=39130 Bug 39130 depends on bug 38113, which changed state. Bug 38113 Summary: getQueryString returns null instead of empty-string http://issues.apache.org/bugzilla/show_bug.cgi?id=38113 What|Old Value |New Value Status|REOPENED|RESOLVED Resolution||WONTFIX -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
