Re: svn commit: r730212 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Hi Filip,
Of course, I think most would prefer the build wasn't broken :) I may be one
of only a few people that watch and actually build the trunk. That aside, I
wrote a little test to make sure introspection traverses the graph as I
thought. NotificationBroadcasterSupport implements NotificationEmitter, where
getNotificationInfo is described, the call works the same through the
NotificationEmitter, NotificationBroadcasterSupport, implementation, and
Method.invoke - the last definition is the one that's called and any call up
the graph has to be explicit.
Since that was so straight forward, I guessed that you want getNotificationInfo
to be visible viz JMX instrumentation. But this has a straight forward solution
too - so, finally, guessed that there's something I'm missing :)
I changed ConnectionPool locally to get it to compile. I pasted the diff below.
I've made a few assumptions and won't take it personally if wrong - I'm not
committed to this solution. I think it does what you intended but I'm not sure
I've covered the introspection aspect that you are concerned about.
Index: ConnectionPool.java
===
--- ConnectionPool.java (revision 730270)
+++ ConnectionPool.java (working copy)
@@ -42,7 +42,7 @@
}
public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool,
boolean for16) {
-super(getDefaultNotificationInfo());
+super();
this.pool = pool;
}
@@ -61,10 +61,18 @@
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
-return getDefaultNotificationInfo();
-}
+ MBeanNotificationInfo[] pres = super.getNotificationInfo();
+ MBeanNotificationInfo[] loc = getDefaultNotificationInfo();
+ MBeanNotificationInfo[] aug = new MBeanNotificationInfo[
+ pres.length + loc.length
+ ];
+ System.arraycopy(pres, 0, aug, 0, pres.length);
+ System.arraycopy(loc, 0, aug, pres.length+1, loc.length);
+
+return aug;
+}
-public static MBeanNotificationInfo[] getDefaultNotificationInfo() {
+private MBeanNotificationInfo[] getDefaultNotificationInfo() {
String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT,
NOTIFY_ABANDON};
String name = Notification.class.getName();
String description = "A connection pool error condition was met.";
On Tuesday, December 30, 2008, at 02:34PM, "Filip Hanik - Dev Lists"
wrote:
>David Knox wrote:
>> Hi,
>> jdbc-pool doesn't compile using JDK5 (sun).
>>
>> [javac]
>> /home/dknox/src/tomcat-trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java:45:
>> cannot find symbol
>> [javac] symbol : constructor
>> NotificationBroadcasterSupport(javax.management.MBeanNotificationInfo[])
>> [javac] location: class javax.management.NotificationBroadcasterSupport
>> [javac] super(getDefaultNotificationInfo());
>>
>> The constructor NotificationBroadcasterSupport(MBeanNotificationInfo[])
>> doesn't exist in the JDK1.5 JMX package. The jdbc-pool module builds as one
>> would expect with JDK6
>>
>> Was this intentional? Maybe I've missed something?
>>
>yes it was, I can make it compile with 1.5 but then I will lose
>information about the notifications through introspections.
>It still runs with 1.5, I'm contemplating making it compile on 1.5, any
>preferences?
>
>Filip
>>
>> -- knoxy
>>
>>
>> On Tuesday, December 30, 2008, at 11:37AM, wrote:
>>
>>> Author: fhanik
>>> Date: Tue Dec 30 10:37:07 2008
>>> New Revision: 730212
>>>
>>> URL: http://svn.apache.org/viewvc?rev=730212&view=rev
>>> Log:
>>> Make sure that the packaged up binaries have a MD5 sum as well, to verify
>>> download size
>>>
>>> Modified:
>>>tomcat/trunk/modules/jdbc-pool/build.xml
>>>tomcat/trunk/modules/jdbc-pool/sign.sh
>>>
>>> Modified: tomcat/trunk/modules/jdbc-pool/build.xml
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=730212&r1=730211&r2=730212&view=diff
>>> ==
>>> --- tomcat/trunk/modules/jdbc-pool/build.xml (original)
>>> +++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Dec 30 10:37:07 2008
>>> @@ -23,7 +23,7 @@
>>>
>>>
>>>
>>> -
>>> +
>>>
>>> >> value="${version.major}.${version.minor}.${version.build}${version.patch}"
>>> />
>>>
>>> @@ -194,6 +194,11 @@
>>> destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
>>>
>>>
>>> +
>>> +>> forceOverwrite="yes" fileext=".md5" />
>>> +>> forceOverwrite="yes" fileext=".md5" />
>>> +
>>> +
>>>
>>>
>>>
>>>
>>> Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=730212&r1
SVN properties for tomcat trunk
AFAICT, the following SVN property settings are missing from tomcat-trunk: svn ps svn:eol-style native TOMCAT-7-RELEASE-PLAN.txt svn ps svn:eol-style native java/org/apache/catalina/tribes/group/interceptors/SimpleCoordinator.java svn ps svn:eol-style native modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java svn ps svn:eol-style native modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml svn ps svn:eol-style native modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java svn ps svn:eol-style native modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGetConnection.java svn ps svn:eol-style native modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java svn ps svn:eol-style native test/org/apache/el/parser/TestELParser.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 45222] concurrent startup of ReplicatedMap leads to inconsistent state.
https://issues.apache.org/bugzilla/show_bug.cgi?id=45222 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #2 from Mark Thomas 2008-12-30 15:59:31 PST --- I've done some testing of this and with your test code I see the same problem you see. However, if the channel is started before the map is created then I can't repeat the problem you were seeing. There is some communication between members on map creation so it seems reasonable to me that the channel should be started first. It is possible that my test case isn't quite perfect (I was using 4 VMs and the system clock to sync the starts and the clocks on the VMs were a few 10s of ms out) so if you still see this issue with the modified test code please feel free to re-open and I'll take a closer look. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Java (and other) source files without AL headers
Tomcat trunk has quite a few Java files without the correct AL headers: java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java modules/bayeux/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java modules/bayeux/test/org/apache/cometd/bayeux/samples/EchoChatClient.java modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/pool/interceptor/TestInterceptor.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/BorrowWaitTest.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StatementFinalizerTest.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGetConnection.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestInterceptorShortName.java modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java There are also some other files that should have AL headers, e.g. bin/modules/bayeux/webapps/cometd/WEB-INF/web.xml bin/modules/bayeux/webapps/cometd/examples/simplechat/cometdchat.htm modules/bayeux/webapps/cometd/WEB-INF/web.xml modules/bayeux/webapps/cometd/examples/simplechat/cometdchat.htm modules/bayeux/webapps/cometd/examples/simplechat/ticker.html modules/bayeux/webapps/cometd/index.html modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730251 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Dec 30 13:49:43 2008 New Revision: 730251 URL: http://svn.apache.org/viewvc?rev=730251&view=rev Log: Fix error in endorsed patch. I am going to assume no-one is against this fix and leave the votes as is. Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730251&r1=730250&r2=730251&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 30 13:49:43 2008 @@ -215,6 +215,7 @@ Don't override the endorsed dir if the user has set it http://svn.apache.org/viewvc?rev=723738&view=rev http://svn.apache.org/viewvc?rev=727303&view=rev + http://svn.apache.org/viewvc?rev=730250&view=rev +1: markt, fhanik, jim -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r723738 - in /tomcat/trunk/bin: setclasspath.bat setclasspath.sh
Konstantin Kolinko wrote: > The part of this patch that changes setclasspath.bat is broken. > > The if condition line should be: > > +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir > > I.e., there should be a second '%' after the env variable name. Thanks for the catch. This has been fixed. Mark > > > Note: an error in the .sh part of the patch has already been fixed as > http://svn.apache.org/viewvc?view=rev&revision=727303 > > 2008/12/5 : >> Author: markt >> Date: Fri Dec 5 06:27:57 2008 >> New Revision: 723738 >> >> URL: http://svn.apache.org/viewvc?rev=723738&view=rev >> Log: >> https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 >> Don't override the endorsed dir if the user has set it >> Based on a patch by Russ Tokuyama >> >> Modified: >>tomcat/trunk/bin/setclasspath.bat >>tomcat/trunk/bin/setclasspath.sh >> >> Modified: tomcat/trunk/bin/setclasspath.bat >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=723738&r1=723737&r2=723738&view=diff >> == >> --- tomcat/trunk/bin/setclasspath.bat (original) >> +++ tomcat/trunk/bin/setclasspath.bat Fri Dec 5 06:27:57 2008 >> @@ -61,8 +61,11 @@ >> goto exit >> :okBasedir >> >> +rem Don't override the endorsed dir if the user has set it previously >> +if not "%JAVA_ENDORSED_DIRS" == "" goto gotEndorseddir >> rem Set the default -Djava.endorsed.dirs argument >> set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed >> +:gotEndorseddir >> >> rem Set standard CLASSPATH >> rem Note that there are no quotes as we do not want to introduce random >> >> Modified: tomcat/trunk/bin/setclasspath.sh >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=723738&r1=723737&r2=723738&view=diff >> == >> --- tomcat/trunk/bin/setclasspath.sh (original) >> +++ tomcat/trunk/bin/setclasspath.sh Fri Dec 5 06:27:57 2008 >> @@ -95,8 +95,11 @@ >> fi >> fi >> >> -# Set the default -Djava.endorsed.dirs argument >> -JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed >> +# Don't override the endorsed dir if the user has set it previously >> +if [-z "$JAVA_ENDORSED_DIRS"]; then >> + # Set the default -Djava.endorsed.dirs argument >> + JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed >> +fi >> >> # Set standard CLASSPATH >> if [ "$1" = "javac" ] ; then >> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730250 - /tomcat/trunk/bin/setclasspath.bat
Author: markt Date: Tue Dec 30 13:47:58 2008 New Revision: 730250 URL: http://svn.apache.org/viewvc?rev=730250&view=rev Log: Fix porting error Modified: tomcat/trunk/bin/setclasspath.bat Modified: tomcat/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=730250&r1=730249&r2=730250&view=diff == --- tomcat/trunk/bin/setclasspath.bat (original) +++ tomcat/trunk/bin/setclasspath.bat Tue Dec 30 13:47:58 2008 @@ -62,7 +62,7 @@ :okBasedir rem Don't override the endorsed dir if the user has set it previously -if not "%JAVA_ENDORSED_DIRS" == "" goto gotEndorseddir +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir rem Set the default -Djava.endorsed.dirs argument set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed :gotEndorseddir - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 42747] Context className attribute ignored for contexts deployed from descriptors in web/META-INF/context.xml
https://issues.apache.org/bugzilla/show_bug.cgi?id=42747 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #4 from Mark Thomas 2008-12-30 13:45:57 PST --- This has been fixed in 6.0.x and will be in 6.0.19 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730249 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml
Author: markt
Date: Tue Dec 30 13:45:24 2008
New Revision: 730249
URL: http://svn.apache.org/viewvc?rev=730249&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
Ensure context.xml takes effect on first deployment. Make processing of
context.xml consistent.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730249&r1=730248&r2=730249&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 30 13:45:24 2008
@@ -131,21 +131,6 @@
Just did that for trunk (r711934; but it contains also other changes).
Caution: at the moment there's no @VERSION@ substitution for
service.bat.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
- Ensure context.xml takes effect on first deployment. Make processing of
- context.xml consistent.
- http://svn.apache.org/viewvc?rev=712464&view=rev
- +1: markt, fhanik, jim
- 0: remm (risky, would it be possible to stop backporting risky changes and
behavior modifications to 6.0.x ?)
- -1:
-
-* Make sure DIR deployment with context.xml works when configBase does no
exist.
- This is required as a result of my previous changes to HostConfig
- http://svn.apache.org/viewvc?rev=718436&view=rev
- +1: markt, fhanik, jim
- 0: remm (risky, would it be possible to stop backporting risky changes and
behavior modifications to 6.0.x ?)
- -1:
-
* Make thread pool limits dynamically configurable
http://svn.apache.org/viewvc?rev=719602&view=rev
http://svn.apache.org/viewvc?rev=719628&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=730249&r1=730248&r2=730249&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Tue
Dec 30 13:45:24 2008
@@ -21,9 +21,11 @@
import java.io.BufferedOutputStream;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -41,6 +43,7 @@
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.core.StandardHost;
+import org.apache.catalina.util.IOTools;
import org.apache.catalina.util.StringManager;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.modeler.Registry;
@@ -599,7 +602,7 @@
context.setConfigFile(contextXml.getAbsolutePath());
context.setPath(contextPath);
// Add the associated docBase to the redeployed list if it's a WAR
-boolean isWar = false;
+boolean isExternalWar = false;
boolean isExternal = false;
if (context.getDocBase() != null) {
File docBase = new File(context.getDocBase());
@@ -615,7 +618,7 @@
deployedApp.redeployResources.put(docBase.getAbsolutePath(),
new Long(docBase.lastModified()));
if
(docBase.getAbsolutePath().toLowerCase().endsWith(".war")) {
-isWar = true;
+isExternalWar = true;
}
} else {
log.warn(sm.getString("hostConfig.deployDescriptor.localDocBaseSpecified",
@@ -648,7 +651,7 @@
}
// Add the eventual unpacked WAR and all the resources which will
be
// watched inside it
-if (isWar && unpackWARs) {
+if (isExternalWar && unpackWARs) {
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
new Long(expandedDocBase.lastModified()));
deployedApp.redeployResources.put
@@ -656,10 +659,12 @@
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
// Find an existing matching war and expanded folder
- File warDocBase = new File(expandedDocBase.getAbsolutePath() +
".war");
- if (warDocBase.exists()) {
-
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
-new Long(warDocBase.lastModified()));
+if (!isExternal) {
+File warDocBase = new
File(expandedDocBase.get
Re: svn commit: r730212 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
David Knox wrote:
Hi,
jdbc-pool doesn't compile using JDK5 (sun).
[javac]
/home/dknox/src/tomcat-trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java:45:
cannot find symbol
[javac] symbol : constructor
NotificationBroadcasterSupport(javax.management.MBeanNotificationInfo[])
[javac] location: class javax.management.NotificationBroadcasterSupport
[javac] super(getDefaultNotificationInfo());
The constructor NotificationBroadcasterSupport(MBeanNotificationInfo[]) doesn't
exist in the JDK1.5 JMX package. The jdbc-pool module builds as one would
expect with JDK6
Was this intentional? Maybe I've missed something?
yes it was, I can make it compile with 1.5 but then I will lose
information about the notifications through introspections.
It still runs with 1.5, I'm contemplating making it compile on 1.5, any
preferences?
Filip
-- knoxy
On Tuesday, December 30, 2008, at 11:37AM, wrote:
Author: fhanik
Date: Tue Dec 30 10:37:07 2008
New Revision: 730212
URL: http://svn.apache.org/viewvc?rev=730212&view=rev
Log:
Make sure that the packaged up binaries have a MD5 sum as well, to verify
download size
Modified:
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/sign.sh
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=730212&r1=730211&r2=730212&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Dec 30 10:37:07 2008
@@ -23,7 +23,7 @@
-
+
@@ -194,6 +194,11 @@
destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
+
+
+
+
+
Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=730212&r1=730211&r2=730212&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Tue Dec 30 10:37:07 2008
@@ -1,4 +1,4 @@
-VERSION=v1.0.12-beta
+VERSION=v1.0.13-beta
for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
echo Signing $i
echo $1|gpg --passphrase-fd 0 -a -b $i
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r723738 - in /tomcat/trunk/bin: setclasspath.bat setclasspath.sh
The part of this patch that changes setclasspath.bat is broken. The if condition line should be: +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir I.e., there should be a second '%' after the env variable name. Note: an error in the .sh part of the patch has already been fixed as http://svn.apache.org/viewvc?view=rev&revision=727303 2008/12/5 : > Author: markt > Date: Fri Dec 5 06:27:57 2008 > New Revision: 723738 > > URL: http://svn.apache.org/viewvc?rev=723738&view=rev > Log: > https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 > Don't override the endorsed dir if the user has set it > Based on a patch by Russ Tokuyama > > Modified: >tomcat/trunk/bin/setclasspath.bat >tomcat/trunk/bin/setclasspath.sh > > Modified: tomcat/trunk/bin/setclasspath.bat > URL: > http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=723738&r1=723737&r2=723738&view=diff > == > --- tomcat/trunk/bin/setclasspath.bat (original) > +++ tomcat/trunk/bin/setclasspath.bat Fri Dec 5 06:27:57 2008 > @@ -61,8 +61,11 @@ > goto exit > :okBasedir > > +rem Don't override the endorsed dir if the user has set it previously > +if not "%JAVA_ENDORSED_DIRS" == "" goto gotEndorseddir > rem Set the default -Djava.endorsed.dirs argument > set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed > +:gotEndorseddir > > rem Set standard CLASSPATH > rem Note that there are no quotes as we do not want to introduce random > > Modified: tomcat/trunk/bin/setclasspath.sh > URL: > http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=723738&r1=723737&r2=723738&view=diff > == > --- tomcat/trunk/bin/setclasspath.sh (original) > +++ tomcat/trunk/bin/setclasspath.sh Fri Dec 5 06:27:57 2008 > @@ -95,8 +95,11 @@ > fi > fi > > -# Set the default -Djava.endorsed.dirs argument > -JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed > +# Don't override the endorsed dir if the user has set it previously > +if [-z "$JAVA_ENDORSED_DIRS"]; then > + # Set the default -Djava.endorsed.dirs argument > + JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed > +fi > > # Set standard CLASSPATH > if [ "$1" = "javac" ] ; then > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730241 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/tomcat/util/net/ java/org/apache/tomcat/util/net/res/ webapps/docs/
Author: markt
Date: Tue Dec 30 13:22:45 2008
New Revision: 730241
URL: http://svn.apache.org/viewvc?rev=730241&view=rev
Log:
Log an info message if we create max threads for one of the connector thread
pools.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730241&r1=730240&r2=730241&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 30 13:22:45 2008
@@ -60,15 +60,6 @@
+1: pero, fhanik, markt, jim
-1:
-* Fix log a warning if we create maxThreads
- http://svn.apache.org/viewvc?rev=694951&view=rev (JIO)
- http://svn.apache.org/viewvc?rev=708195&view=rev (APR, NIO)
- http://svn.apache.org/viewvc?rev=708223&view=rev (Change log level)
- +1: markt, fhanik, jim
- 0: remm (logging could pile up quickly)
- markt Because thread count only grows there will only ever be one log
message
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44382
Use HttpOnly for session cookies. This is enabled by default. Feel free to
caveat your vote with a preference for disabled by default.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=730241&r1=730240&r2=730241&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue
Dec 30 13:22:45 2008
@@ -944,6 +944,11 @@
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.info(sm.getString("endpoint.info.maxThreads",
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads < 0) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=730241&r1=730240&r2=730241&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Tue
Dec 30 13:22:45 2008
@@ -661,6 +661,11 @@
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.info(sm.getString("endpoint.info.maxThreads",
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads < 0) {
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=730241&r1=730240&r2=730241&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue
Dec 30 13:22:45 2008
@@ -1074,6 +1074,11 @@
}
if ((maxThreads > 0) && (curThreads < maxThreads)) {
curThreadsBusy++;
+if (curThreadsBusy == maxThreads) {
+log.info(sm.getString("endpoint.info.maxThreads",
+Integer.toString(maxThreads), address,
+Integer.toString(port)));
+}
return (newWorkerThread());
} else {
if (maxThreads < 0) {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties?rev=730241&r1=730240&r2=730241&view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apach
Re: svn commit: r730212 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Hi,
jdbc-pool doesn't compile using JDK5 (sun).
[javac]
/home/dknox/src/tomcat-trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java:45:
cannot find symbol
[javac] symbol : constructor
NotificationBroadcasterSupport(javax.management.MBeanNotificationInfo[])
[javac] location: class javax.management.NotificationBroadcasterSupport
[javac] super(getDefaultNotificationInfo());
The constructor NotificationBroadcasterSupport(MBeanNotificationInfo[]) doesn't
exist in the JDK1.5 JMX package. The jdbc-pool module builds as one would
expect with JDK6
Was this intentional? Maybe I've missed something?
-- knoxy
On Tuesday, December 30, 2008, at 11:37AM, wrote:
>Author: fhanik
>Date: Tue Dec 30 10:37:07 2008
>New Revision: 730212
>
>URL: http://svn.apache.org/viewvc?rev=730212&view=rev
>Log:
>Make sure that the packaged up binaries have a MD5 sum as well, to verify
>download size
>
>Modified:
>tomcat/trunk/modules/jdbc-pool/build.xml
>tomcat/trunk/modules/jdbc-pool/sign.sh
>
>Modified: tomcat/trunk/modules/jdbc-pool/build.xml
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=730212&r1=730211&r2=730212&view=diff
>==
>--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
>+++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Dec 30 10:37:07 2008
>@@ -23,7 +23,7 @@
>
>
>
>-
>+
>
>value="${version.major}.${version.minor}.${version.build}${version.patch}" />
>
>@@ -194,6 +194,11 @@
> destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
>
>
>+
>+forceOverwrite="yes" fileext=".md5" />
>+forceOverwrite="yes" fileext=".md5" />
>+
>+
>
>
>
>
>Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
>URL:
>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=730212&r1=730211&r2=730212&view=diff
>==
>--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
>+++ tomcat/trunk/modules/jdbc-pool/sign.sh Tue Dec 30 10:37:07 2008
>@@ -1,4 +1,4 @@
>-VERSION=v1.0.12-beta
>+VERSION=v1.0.13-beta
> for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
> echo Signing $i
> echo $1|gpg --passphrase-fd 0 -a -b $i
>
>
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730225 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jim Date: Tue Dec 30 12:02:27 2008 New Revision: 730225 URL: http://svn.apache.org/viewvc?rev=730225&view=rev Log: Had time to review some outstanding patches Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730225&r1=730224&r2=730225&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 30 12:02:27 2008 @@ -57,14 +57,14 @@ * Handle session suffix rewrite at JvmRouteBinderValve with parallel requests from same client http://svn.apache.org/viewvc?rev=693378&view=rev - +1: pero, fhanik, markt + +1: pero, fhanik, markt, jim -1: * Fix log a warning if we create maxThreads http://svn.apache.org/viewvc?rev=694951&view=rev (JIO) http://svn.apache.org/viewvc?rev=708195&view=rev (APR, NIO) http://svn.apache.org/viewvc?rev=708223&view=rev (Change log level) - +1: markt, fhanik + +1: markt, fhanik, jim 0: remm (logging could pile up quickly) markt Because thread count only grows there will only ever be one log message -1: @@ -86,7 +86,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026 Never use empty reason phrase. http://svn.apache.org/viewvc?rev=697183&view=rev - +1: rjung, mturk, markt + +1: rjung, mturk, markt, jim 0: remm (also affects to the two other AJP connectors) * Allow huge request body packets for AJP13. @@ -94,7 +94,7 @@ carried forward to trunk and tc6.0.x. http://svn.apache.org/viewvc?rev=697192&view=rev Original change: http://svn.apache.org/viewvc?rev=486217&view=rev - +1: rjung, mturk, markt, pero + +1: rjung, mturk, markt, pero, jim 0: remm (also affects to the two other AJP connectors) * Fix serialisation issue reported by Find Bugs @@ -144,21 +144,21 @@ Ensure context.xml takes effect on first deployment. Make processing of context.xml consistent. http://svn.apache.org/viewvc?rev=712464&view=rev - +1: markt, fhanik + +1: markt, fhanik, jim 0: remm (risky, would it be possible to stop backporting risky changes and behavior modifications to 6.0.x ?) -1: * Make sure DIR deployment with context.xml works when configBase does no exist. This is required as a result of my previous changes to HostConfig http://svn.apache.org/viewvc?rev=718436&view=rev - +1: markt, fhanik + +1: markt, fhanik, jim 0: remm (risky, would it be possible to stop backporting risky changes and behavior modifications to 6.0.x ?) -1: * Make thread pool limits dynamically configurable http://svn.apache.org/viewvc?rev=719602&view=rev http://svn.apache.org/viewvc?rev=719628&view=rev - +1: markt, fhanik + +1: markt, fhanik, jim 0: remm (risky, would it be possible to stop backporting risky changes and behavior modifications to 6.0.x ? on this particular one, if people want fancy behavior, maybe they should use an executor) -1: @@ -169,7 +169,7 @@ * [1] Fix send file bug - correctly notify the poller without having to wait for it to wake up http://svn.apache.org/viewvc?rev=719129&view=rev - +1: fhanik, pero, markt + +1: fhanik, pero, markt, jim -1: * [2] Prevent async close NPE on already closed sockets @@ -187,7 +187,7 @@ http://svn.apache.org/viewvc?rev=720724&view=rev http://svn.apache.org/viewvc?rev=720728&view=rev http://svn.apache.org/viewvc?rev=725417&view=rev - +1: fhanik + +1: fhanik, jim -1: * [5] Fix Comet interest registration bug @@ -197,7 +197,7 @@ * [6] Fix file descriptor leak during send file behavior in NIO connector http://svn.apache.org/viewvc?rev=729191&view=rev - +1: fhanik, markt + +1: fhanik, markt, jim -1: @@ -210,7 +210,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42077 Don't include nulls in iterator. Based on a patch by Mathias Broekelmann http://svn.apache.org/viewvc?rev=720069&view=rev - +1: markt, fhanik + +1: markt, fhanik, jim -1: * Use consistent (and more useful) JPDA defaults in catalina.bat @@ -232,14 +232,14 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44285 Make SSL session cache size and timeout configurable http://svn.apache.org/viewvc?rev=723404&view=rev - +1: markt, fhanik + +1: markt, fhanik, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46232 Don't override the endorsed dir if the user has set it http://svn.apache.org/viewvc?rev=723738&view=rev http://svn.apache.org/viewvc?rev=727303&view=rev - +1: markt, fhanik + +1: markt, fhanik, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46304 @@ -265,7 +265,7 @@ Build script re-factoring Patch provided by Marc Guillemot http://svn.apache.org/viewvc?rev=729681&view=rev - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?
svn commit: r730212 - in /tomcat/trunk/modules/jdbc-pool: build.xml sign.sh
Author: fhanik
Date: Tue Dec 30 10:37:07 2008
New Revision: 730212
URL: http://svn.apache.org/viewvc?rev=730212&view=rev
Log:
Make sure that the packaged up binaries have a MD5 sum as well, to verify
download size
Modified:
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/sign.sh
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=730212&r1=730211&r2=730212&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Tue Dec 30 10:37:07 2008
@@ -23,7 +23,7 @@
-
+
@@ -194,6 +194,11 @@
destfile="${destdir}/apache-tomcat-jdbc-${version}.tar.gz"/>
+
+
+
+
+
Modified: tomcat/trunk/modules/jdbc-pool/sign.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/sign.sh?rev=730212&r1=730211&r2=730212&view=diff
==
--- tomcat/trunk/modules/jdbc-pool/sign.sh (original)
+++ tomcat/trunk/modules/jdbc-pool/sign.sh Tue Dec 30 10:37:07 2008
@@ -1,4 +1,4 @@
-VERSION=v1.0.12-beta
+VERSION=v1.0.13-beta
for i in $(find output/release/$VERSION -name "*.zip" -o -name "*.tar.gz"); do
echo Signing $i
echo $1|gpg --passphrase-fd 0 -a -b $i
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 42360] Custom Tag resue specs
https://issues.apache.org/bugzilla/show_bug.cgi?id=42360 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #3 from Mark Thomas 2008-12-30 09:57:42 PST --- This works for me using the latest 6.0.x source from trunk and I don't recall any fixes since 6.0.18 so that should work for you. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730186 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: fhanik Date: Tue Dec 30 09:18:45 2008 New Revision: 730186 URL: http://svn.apache.org/viewvc?rev=730186&view=rev Log: proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730186&r1=730185&r2=730186&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 30 09:18:45 2008 @@ -293,5 +293,11 @@ Add a new SimpleCoordinator for tribes provided by Robert Newson http://svn.apache.org/viewvc?rev=729815&view=rev http://svn.apache.org/viewvc?rev=729934&view=rev - +1: markt + +1: markt, fhanik -1: + +* Print user friendly message when attempting to shutdown and shutdown port is disabled + http://svn.apache.org/viewvc?rev=730178&view=rev + +1: fhanik + -1: + \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46451] New: Configure svn:bugtraq properties
https://issues.apache.org/bugzilla/show_bug.cgi?id=46451 Summary: Configure svn:bugtraq properties Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: enhancement Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: mguille...@yahoo.fr Created an attachment (id=23064) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23064) Patch adding the missing SVN properties on project's root SVN bugtraq properties may be helpful to link commits with issue ids and are supported by different SVN clients. See: http://markphip.blogspot.com/2007/01/integrating-subversion-with-your-issue.html -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730178 - in /tomcat/trunk/java/org/apache/catalina/startup: Catalina.java LocalStrings.properties
Author: fhanik
Date: Tue Dec 30 08:51:35 2008
New Revision: 730178
URL: http://svn.apache.org/viewvc?rev=730178&view=rev
Log:
Don't attempt to shutdown when port=-1 in server.xml, instead print error
message
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=730178&r1=730177&r2=730178&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Dec 30
08:51:35 2008
@@ -417,14 +417,19 @@
// Stop the existing server
try {
-Socket socket = new Socket(server.getAddress(), server.getPort());
-OutputStream stream = socket.getOutputStream();
-String shutdown = server.getShutdown();
-for (int i = 0; i < shutdown.length(); i++)
-stream.write(shutdown.charAt(i));
-stream.flush();
-stream.close();
-socket.close();
+if (server.getPort()>0) {
+Socket socket = new Socket(server.getAddress(),
server.getPort());
+OutputStream stream = socket.getOutputStream();
+String shutdown = server.getShutdown();
+for (int i = 0; i < shutdown.length(); i++)
+stream.write(shutdown.charAt(i));
+stream.flush();
+stream.close();
+socket.close();
+} else {
+log.error(sm.getString("catalina.stopServer"));
+System.exit(1);
+}
} catch (IOException e) {
log.error("Catalina.stop: ", e);
System.exit(1);
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=730178&r1=730177&r2=730178&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Dec 30 08:51:35 2008
@@ -95,3 +95,4 @@
userConfig.error=Error deploying web application for user {0}
userConfig.start=UserConfig: Processing START
userConfig.stop=UserConfig: Processing STOP
+catalina.stopServer=No shutdown port configured. Shut down server through OS
signal. Server not shut down.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46350] Maven repository should contain source bundles
https://issues.apache.org/bugzilla/show_bug.cgi?id=46350 --- Comment #2 from Marc Guillemot 2008-12-30 08:48:15 PST --- (From update of attachment 23063) oops, patch incorrectly contains my .classpath.Sorry. Please ignore it (or better configure SVN to ignore it) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46350] Maven repository should contain source bundles
https://issues.apache.org/bugzilla/show_bug.cgi?id=46350 --- Comment #1 from Marc Guillemot 2008-12-30 08:45:44 PST --- Created an attachment (id=23063) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23063) Patch attaching source bundle to the maven bundles Patch generates jars from the sources and attach them to the generated maven bundles. I couldn't fully test the proposed patch due to the fact that some pom files are missing in the current SVN version of Tomcat. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730173 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Author: fhanik
Date: Tue Dec 30 08:40:54 2008
New Revision: 730173
URL: http://svn.apache.org/viewvc?rev=730173&view=rev
Log:
Cleanup name
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=730173&r1=730172&r2=730173&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
Tue Dec 30 08:40:54 2008
@@ -219,7 +219,7 @@
protected void registerJmx() {
try {
if (getCompositeType()!=null) {
-ObjectName oname = new
ObjectName(ConnectionPool.POOL_JMX_TYPE_PREFIX+getClass().getName()+",name=" +
poolName);
+ObjectName oname = new
ObjectName(ConnectionPool.POOL_JMX_TYPE_PREFIX+"SlowQueryReport"+",name=" +
poolName);
Registry registry = Registry.getRegistry(null, null);
registry.loadDescriptors(getClass().getPackage().getName(),getClass().getClassLoader());
ManagedBean managed =
registry.findManagedBean(this.getClass().getName());
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46354] LIMIT_BUFFER setting causes arraycopy errors
https://issues.apache.org/bugzilla/show_bug.cgi?id=46354 Ed Hill changed: What|Removed |Added Version|5.5.23 |5.5.27 -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Arrays.copyOf support?
Thanks to new interceptor and fix :-) Works for me. Peter Am 30.12.2008 um 11:11 schrieb Mark Thomas: Filip Hanik - Dev Lists wrote: I will fix, Filip Peter - thanks for catching this. Filip - thanks for fixing it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: 1.1.16 sources still fubar
Lorenz Breu wrote: hi guys i just did a quick check on the tomcat-native homepage and noticed two things haven't changed: a) link to the 1.1.15 binaries is broken The link should go to 1.1.16. I have fixed it. b) 1.1.16 sources still contain the typos in multicast.c What is the bugzilla corresponding to those? If it is closed double check and reopen it. Cheers Jean-Fredeic i also don't know if the inconsistency between the c and the java code, where the c code uses "recvfrom()" and the java code uses "recvFrom()" has been fixed... can i get an eta on the release of 1.1.16??? will the package in the maven central repo be accordingly updated??? will the typos be fixed by then??? - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: systemprop.xml and spaces
Hi Mark, OK, but you can't copy-paste those items! Well and I am big fan of big monitor's :-) Thanks to explain that Peter Am 30.12.2008 um 11:13 schrieb Mark Thomas: Peter Rossbach wrote: Hi Mark, Why some attributes at systemprop.xml has spaces? So they display on multiple lines rather than a single line. On a single line they are far too long and push the description off the right-hand side of the screen unless you have a very big monitor. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730146 - /tomcat/site/trunk/docs/download-native.html
Author: jfclere Date: Tue Dec 30 07:10:35 2008 New Revision: 730146 URL: http://svn.apache.org/viewvc?rev=730146&view=rev Log: Oops also need the html part... Modified: tomcat/site/trunk/docs/download-native.html Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=730146&r1=730145&r2=730146&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Tue Dec 30 07:10:35 2008 @@ -276,35 +276,35 @@ - -Native 1.1.15 Source Release tar.gz + +Native 1.1.16 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-src.tar.gz.md5";>MD5] - -Native 1.1.15 Source Release zip + +Native 1.1.16 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-win32-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-win32-src.zip.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-win32-src.zip.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-win32-src.zip.md5";>MD5] @@ -314,7 +314,7 @@ You can find binaries release too You may download them from - HERE + HERE @@ -353,19 +353,19 @@ % pgpk -a KEYS -% pgpv tomcat-native-1.1.15-src.tar.gz.asc +% pgpv tomcat-native-1.1.16-src.tar.gz.asc or % pgp -ka KEYS -% pgp tomcat-native-1.1.15-src.tar.gz.asc +% pgp tomcat-native-1.1.16-src.tar.gz.asc or % gpg --import KEYS -% gpg --verify tomcat-native-1.1.15-src.tar.gz.asc +% gpg --verify tomcat-native-1.1.16-src.tar.gz.asc - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730144 - /tomcat/site/trunk/xdocs/download-native.xml
Author: jfclere Date: Tue Dec 30 07:05:12 2008 New Revision: 730144 URL: http://svn.apache.org/viewvc?rev=730144&view=rev Log: Arrange links. Modified: tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=730144&r1=730143&r2=730144&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Tue Dec 30 07:05:12 2008 @@ -49,28 +49,28 @@ Source (please choose the correct format for your platform) - -Native 1.1.15 Source Release tar.gz + +Native 1.1.16 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-src.tar.gz.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-src.tar.gz.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-src.tar.gz.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-src.tar.gz.md5";>MD5] - -Native 1.1.15 Source Release zip + +Native 1.1.16 Source Release zip (e.g. Windows) -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-win32-src.zip.asc";>PGP] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-win32-src.zip.asc";>PGP] -[http://www.apache.org/dist/tomcat/tomcat-connectors/native/tomcat-native-1.1.15-win32-src.zip.md5";>MD5] +[http://www.apache.org/dist/tomcat/tomcat-connectors/native/1.1.16/source/tomcat-native-1.1.16-win32-src.zip.md5";>MD5] @@ -79,7 +79,7 @@ You can find binaries release too You may download them from - HERE + HERE @@ -98,17 +98,17 @@ % pgpk -a KEYS -% pgpv tomcat-native-1.1.15-src.tar.gz.asc +% pgpv tomcat-native-1.1.16-src.tar.gz.asc or % pgp -ka KEYS -% pgp tomcat-native-1.1.15-src.tar.gz.asc +% pgp tomcat-native-1.1.16-src.tar.gz.asc or % gpg --import KEYS -% gpg --verify tomcat-native-1.1.15-src.tar.gz.asc +% gpg --verify tomcat-native-1.1.16-src.tar.gz.asc Alternatively, you can verify the MD5 signature (hash value) on the files. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 42456] JspC fails to generate valid code with TLD java.lang.String[]
https://issues.apache.org/bugzilla/show_bug.cgi?id=42456 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Mark Thomas 2008-12-30 04:40:07 PST --- This works for me using standalone JspC from trunk. It looks like a bug that has been fixed (maybe the attribute quoting bug?) or a bug in the maven plug-in. Without a test case it is had to provide more conclusive comment. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r730105 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Dec 30 03:56:46 2008 New Revision: 730105 URL: http://svn.apache.org/viewvc?rev=730105&view=rev Log: Add Filip's Java5 fix to the proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=730105&r1=730104&r2=730105&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 30 03:56:46 2008 @@ -292,5 +292,6 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45261 Add a new SimpleCoordinator for tribes provided by Robert Newson http://svn.apache.org/viewvc?rev=729815&view=rev + http://svn.apache.org/viewvc?rev=729934&view=rev +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r729825 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11Processor.java webapps/docs/changelog.xml
billbar...@apache.org wrote: > @@ -235,6 +224,9 @@ >http://svn.apache.org/viewvc?rev=721708&view=rev >http://svn.apache.org/viewvc?rev=721886&view=rev >+1: markt, fhanik > + 0: billbarker: Haven't tried to break it yet, but the 4th patch > potentially > + offers access to static fields in ELContextImpl and ELResolverImpl > that could > + possibly be exploited by a malicious webapp. Any thoughts on how to fix this? How about testing for a security manager and if one is present creating new instances of NullFunctionMapper and DefaultResolver rather than re-using the static ones? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 41608] The log level is different at same messages.
https://issues.apache.org/bugzilla/show_bug.cgi?id=41608 Mark Thomas changed: What|Removed |Added URL|www.nintendowifi.com| -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: systemprop.xml and spaces
Peter Rossbach wrote: > Hi Mark, > > Why some attributes at systemprop.xml has spaces? > > So they display on multiple lines rather than a single line. On a single line they are far too long and push the description off the right-hand side of the screen unless you have a very big monitor. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Arrays.copyOf support?
Filip Hanik - Dev Lists wrote: > I will fix, > > Filip Peter - thanks for catching this. Filip - thanks for fixing it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
